diff options
author | Sasha Levin <sasha.levin@oracle.com> | 2014-01-23 18:52:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 19:36:50 -0500 |
commit | 309381feaee564281c3d9e90fbca8963bb7428ad (patch) | |
tree | 7e9f990c0cffcb8c5fc90deb1c7eac445c5ada0e /mm/swapfile.c | |
parent | e3bba3c3c90cd434c1ccb9e5dc704a96baf9541c (diff) |
mm: dump page when hitting a VM_BUG_ON using VM_BUG_ON_PAGE
Most of the VM_BUG_ON assertions are performed on a page. Usually, when
one of these assertions fails we'll get a BUG_ON with a call stack and
the registers.
I've recently noticed based on the requests to add a small piece of code
that dumps the page to various VM_BUG_ON sites that the page dump is
quite useful to people debugging issues in mm.
This patch adds a VM_BUG_ON_PAGE(cond, page) which beyond doing what
VM_BUG_ON() does, also dumps the page before executing the actual
BUG_ON.
[akpm@linux-foundation.org: fix up includes]
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/swapfile.c')
-rw-r--r-- | mm/swapfile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index 612a7c9795f6..d443dea95c27 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
@@ -906,7 +906,7 @@ int reuse_swap_page(struct page *page) | |||
906 | { | 906 | { |
907 | int count; | 907 | int count; |
908 | 908 | ||
909 | VM_BUG_ON(!PageLocked(page)); | 909 | VM_BUG_ON_PAGE(!PageLocked(page), page); |
910 | if (unlikely(PageKsm(page))) | 910 | if (unlikely(PageKsm(page))) |
911 | return 0; | 911 | return 0; |
912 | count = page_mapcount(page); | 912 | count = page_mapcount(page); |
@@ -926,7 +926,7 @@ int reuse_swap_page(struct page *page) | |||
926 | */ | 926 | */ |
927 | int try_to_free_swap(struct page *page) | 927 | int try_to_free_swap(struct page *page) |
928 | { | 928 | { |
929 | VM_BUG_ON(!PageLocked(page)); | 929 | VM_BUG_ON_PAGE(!PageLocked(page), page); |
930 | 930 | ||
931 | if (!PageSwapCache(page)) | 931 | if (!PageSwapCache(page)) |
932 | return 0; | 932 | return 0; |
@@ -2714,7 +2714,7 @@ struct swap_info_struct *page_swap_info(struct page *page) | |||
2714 | */ | 2714 | */ |
2715 | struct address_space *__page_file_mapping(struct page *page) | 2715 | struct address_space *__page_file_mapping(struct page *page) |
2716 | { | 2716 | { |
2717 | VM_BUG_ON(!PageSwapCache(page)); | 2717 | VM_BUG_ON_PAGE(!PageSwapCache(page), page); |
2718 | return page_swap_info(page)->swap_file->f_mapping; | 2718 | return page_swap_info(page)->swap_file->f_mapping; |
2719 | } | 2719 | } |
2720 | EXPORT_SYMBOL_GPL(__page_file_mapping); | 2720 | EXPORT_SYMBOL_GPL(__page_file_mapping); |
@@ -2722,7 +2722,7 @@ EXPORT_SYMBOL_GPL(__page_file_mapping); | |||
2722 | pgoff_t __page_file_index(struct page *page) | 2722 | pgoff_t __page_file_index(struct page *page) |
2723 | { | 2723 | { |
2724 | swp_entry_t swap = { .val = page_private(page) }; | 2724 | swp_entry_t swap = { .val = page_private(page) }; |
2725 | VM_BUG_ON(!PageSwapCache(page)); | 2725 | VM_BUG_ON_PAGE(!PageSwapCache(page), page); |
2726 | return swp_offset(swap); | 2726 | return swp_offset(swap); |
2727 | } | 2727 | } |
2728 | EXPORT_SYMBOL_GPL(__page_file_index); | 2728 | EXPORT_SYMBOL_GPL(__page_file_index); |