mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-11-08 18:43:21 +01:00
mm/debug.c: always print flags in dump_page()
Commit76a1850e45("mm/debug.c: __dump_page() prints an extra line") inadvertently removed printing of page flags for pages that are neither anon nor ksm nor have a mapping. Fix that. Using pr_cont() again would be a solution, but the commit explicitly removed its use. Avoiding the danger of mixing up split lines from multiple CPUs might be beneficial for near-panic dumps like this, so fix this without reintroducing pr_cont(). Link: http://lkml.kernel.org/r/[email protected] Fixes:76a1850e45("mm/debug.c: __dump_page() prints an extra line") Signed-off-by: Vlastimil Babka <[email protected]> Reported-by: Anshuman Khandual <[email protected]> Reported-by: Michal Hocko <[email protected]> Acked-by: Michal Hocko <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Qian Cai <[email protected]> Cc: Oscar Salvador <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Dan Williams <[email protected]> Cc: Pavel Tatashin <[email protected]> Cc: Ralph Campbell <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
1 parent
8c96f1bc6f
commit
5b57b8f227
1 file changed
+5
-3
+5
-3
@@ -47,6 +47,7 @@ void __dump_page(struct page *page, const char *reason)
|
||||
struct address_space *mapping;
|
||||
bool page_poisoned = PagePoisoned(page);
|
||||
int mapcount;
|
||||
char *type = "";
|
||||
|
||||
/*
|
||||
* If struct page is poisoned don't access Page*() functions as that
|
||||
@@ -78,9 +79,9 @@ void __dump_page(struct page *page, const char *reason)
|
||||
page, page_ref_count(page), mapcount,
|
||||
page->mapping, page_to_pgoff(page));
|
||||
if (PageKsm(page))
|
||||
pr_warn("ksm flags: %#lx(%pGp)\n", page->flags, &page->flags);
|
||||
type = "ksm ";
|
||||
else if (PageAnon(page))
|
||||
pr_warn("anon flags: %#lx(%pGp)\n", page->flags, &page->flags);
|
||||
type = "anon ";
|
||||
else if (mapping) {
|
||||
if (mapping->host && mapping->host->i_dentry.first) {
|
||||
struct dentry *dentry;
|
||||
@@ -88,10 +89,11 @@ void __dump_page(struct page *page, const char *reason)
|
||||
pr_warn("%ps name:\"%pd\"\n", mapping->a_ops, dentry);
|
||||
} else
|
||||
pr_warn("%ps\n", mapping->a_ops);
|
||||
pr_warn("flags: %#lx(%pGp)\n", page->flags, &page->flags);
|
||||
}
|
||||
BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) != __NR_PAGEFLAGS + 1);
|
||||
|
||||
pr_warn("%sflags: %#lx(%pGp)\n", type, page->flags, &page->flags);
|
||||
|
||||
hex_only:
|
||||
print_hex_dump(KERN_WARNING, "raw: ", DUMP_PREFIX_NONE, 32,
|
||||
sizeof(unsigned long), page,
|
||||
|
||||
Reference in new issue
Block a user