Commit ff8e8116 authored by Vlastimil Babka's avatar Vlastimil Babka Committed by Linus Torvalds
Browse files

mm, debug: move bad flags printing to bad_page() 



Since bad_page() is the only user of the badflags parameter of
dump_page_badflags(), we can move the code to bad_page() and simplify a
bit.

The dump_page_badflags() function is renamed to __dump_page() and can
still be called separately from dump_page() for temporary debug prints
where page_owner info is not desired.

The only user-visible change is that page->mem_cgroup is printed before
the bad flags.

Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4e462112

include/linux/mmdebug.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -9,8 +9,7 @@ struct vm_area_struct; 
struct mm_struct;

struct mm_struct;





extern void dump_page(struct page *page, const char *reason);

extern void dump_page(struct page *page, const char *reason);

extern void dump_page_badflags(struct page *page, const char *reason,

extern void __dump_page(struct page *page, const char *reason);

			       unsigned long badflags);

void dump_vma(const struct vm_area_struct *vma);

void dump_vma(const struct vm_area_struct *vma);

void dump_mm(const struct mm_struct *mm);

void dump_mm(const struct mm_struct *mm);

mm/debug.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -40,8 +40,7 @@ const struct trace_print_flags vmaflag_names[] = { 
	{0, NULL}

	{0, NULL}

};

};





void dump_page_badflags(struct page *page, const char *reason,

void __dump_page(struct page *page, const char *reason)

		unsigned long badflags)

{

{

	pr_emerg("page:%p count:%d mapcount:%d mapping:%p index:%#lx",

	pr_emerg("page:%p count:%d mapcount:%d mapping:%p index:%#lx",

		  page, atomic_read(&page->_count), page_mapcount(page),

		  page, atomic_read(&page->_count), page_mapcount(page),
@@ -50,15 +49,12 @@ void dump_page_badflags(struct page *page, const char *reason, 
		pr_cont(" compound_mapcount: %d", compound_mapcount(page));

		pr_cont(" compound_mapcount: %d", compound_mapcount(page));

	pr_cont("\n");

	pr_cont("\n");

	BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) != __NR_PAGEFLAGS + 1);

	BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) != __NR_PAGEFLAGS + 1);



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

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





	if (reason)

	if (reason)

		pr_alert("page dumped because: %s\n", reason);

		pr_alert("page dumped because: %s\n", reason);





	badflags &= page->flags;

	if (badflags)

		pr_alert("bad because of flags: %#lx(%pGp)\n", badflags,

								&badflags);

#ifdef CONFIG_MEMCG

#ifdef CONFIG_MEMCG

	if (page->mem_cgroup)

	if (page->mem_cgroup)

		pr_alert("page->mem_cgroup:%p\n", page->mem_cgroup);

		pr_alert("page->mem_cgroup:%p\n", page->mem_cgroup);
@@ -67,7 +63,7 @@ void dump_page_badflags(struct page *page, const char *reason, 




void dump_page(struct page *page, const char *reason)

void dump_page(struct page *page, const char *reason)

{

{

	dump_page_badflags(page, reason, 0);

	__dump_page(page, reason);

	dump_page_owner(page);

	dump_page_owner(page);

}

}

EXPORT_SYMBOL(dump_page);

EXPORT_SYMBOL(dump_page);

mm/page_alloc.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -430,7 +430,7 @@ static void bad_page(struct page *page, const char *reason, 
			goto out;

			goto out;

		}

		}

		if (nr_unshown) {

		if (nr_unshown) {

			printk(KERN_ALERT

			pr_alert(

			      "BUG: Bad page state: %lu messages suppressed\n",

			      "BUG: Bad page state: %lu messages suppressed\n",

				nr_unshown);

				nr_unshown);

			nr_unshown = 0;

			nr_unshown = 0;
@@ -440,9 +440,13 @@ static void bad_page(struct page *page, const char *reason, 
	if (nr_shown++ == 0)

	if (nr_shown++ == 0)

		resume = jiffies + 60 * HZ;

		resume = jiffies + 60 * HZ;





	printk(KERN_ALERT "BUG: Bad page state in process %s  pfn:%05lx\n",

	pr_alert("BUG: Bad page state in process %s  pfn:%05lx\n",

		current->comm, page_to_pfn(page));

		current->comm, page_to_pfn(page));

	dump_page_badflags(page, reason, bad_flags);

	__dump_page(page, reason);

	bad_flags &= page->flags;

	if (bad_flags)

		pr_alert("bad because of flags: %#lx(%pGp)\n",

						bad_flags, &bad_flags);

	dump_page_owner(page);

	dump_page_owner(page);





	print_modules();

	print_modules();

CRA Git | Maintained and supported by SUSTech CRA and CCSE