Skip to content

Commit

Permalink
mm: teach dump_page() to correctly output poisoned struct pages
Browse files Browse the repository at this point in the history
If struct page is poisoned, and uninitialized access is detected via
PF_POISONED_CHECK(page) dump_page() is called to output the page.  But,
the dump_page() itself accesses struct page to determine how to print
it, and therefore gets into a recursive loop.

For example:

  dump_page()
   __dump_page()
    PageSlab(page)
     PF_POISONED_CHECK(page)
      VM_BUG_ON_PGFLAGS(PagePoisoned(page), page)
       dump_page() recursion loop.

Link: http://lkml.kernel.org/r/[email protected]
Fixes: f165b37 ("mm: uninitialized struct page poisoning sanity checking")
Signed-off-by: Pavel Tatashin <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Pavel Tatashin authored and torvalds committed Jul 4, 2018
1 parent 5e4e290 commit fc36def
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions mm/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,25 @@ const struct trace_print_flags vmaflag_names[] = {

void __dump_page(struct page *page, const char *reason)
{
bool page_poisoned = PagePoisoned(page);
int mapcount;

/*
* If struct page is poisoned don't access Page*() functions as that
* leads to recursive loop. Page*() check for poisoned pages, and calls
* dump_page() when detected.
*/
if (page_poisoned) {
pr_emerg("page:%px is uninitialized and poisoned", page);
goto hex_only;
}

/*
* Avoid VM_BUG_ON() in page_mapcount().
* page->_mapcount space in struct page is used by sl[aou]b pages to
* encode own info.
*/
int mapcount = PageSlab(page) ? 0 : page_mapcount(page);
mapcount = PageSlab(page) ? 0 : page_mapcount(page);

pr_emerg("page:%px count:%d mapcount:%d mapping:%px index:%#lx",
page, page_ref_count(page), mapcount,
Expand All @@ -60,6 +73,7 @@ void __dump_page(struct page *page, const char *reason)

pr_emerg("flags: %#lx(%pGp)\n", page->flags, &page->flags);

hex_only:
print_hex_dump(KERN_ALERT, "raw: ", DUMP_PREFIX_NONE, 32,
sizeof(unsigned long), page,
sizeof(struct page), false);
Expand All @@ -68,7 +82,7 @@ void __dump_page(struct page *page, const char *reason)
pr_alert("page dumped because: %s\n", reason);

#ifdef CONFIG_MEMCG
if (page->mem_cgroup)
if (!page_poisoned && page->mem_cgroup)
pr_alert("page->mem_cgroup:%px\n", page->mem_cgroup);
#endif
}
Expand Down

0 comments on commit fc36def

Please sign in to comment.