From: Vlastimil Babka <vbabka@suse.cz> To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Minchan Kim <minchan@kernel.org>, Sasha Levin <sasha.levin@oracle.com>, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Mel Gorman <mgorman@suse.de>, Michal Hocko <mhocko@suse.cz>, Vlastimil Babka <vbabka@suse.cz>, Rasmus Villemoes <linux@rasmusvillemoes.dk> Subject: [PATCH v2 3/3] mm, debug: move bad flags printing to bad_page() Date: Fri, 4 Dec 2015 16:16:35 +0100 [thread overview] Message-ID: <1449242195-16374-3-git-send-email-vbabka@suse.cz> (raw) In-Reply-To: <1449242195-16374-1-git-send-email-vbabka@suse.cz> 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: Vlastimil Babka <vbabka@suse.cz> 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> Cc: Michal Hocko <mhocko@suse.cz> --- include/linux/mmdebug.h | 3 +-- mm/debug.c | 14 +++----------- mm/page_alloc.c | 10 +++++++--- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h index 2c8286cf162e..9b0dc2161f7a 100644 --- a/include/linux/mmdebug.h +++ b/include/linux/mmdebug.h @@ -14,8 +14,7 @@ extern const struct trace_print_flags vmaflag_names[]; extern const struct trace_print_flags gfpflag_names[]; extern void dump_page(struct page *page, const char *reason); -extern void dump_page_badflags(struct page *page, const char *reason, - unsigned long badflags); +extern void __dump_page(struct page *page, const char *reason); void dump_vma(const struct vm_area_struct *vma); void dump_mm(const struct mm_struct *mm); diff --git a/mm/debug.c b/mm/debug.c index c42bb4c13c2d..d36aa66e9779 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -109,25 +109,17 @@ const struct trace_print_flags gfpflag_names[] = { {0, NULL}, }; -void dump_page_badflags(struct page *page, const char *reason, - unsigned long badflags) +void __dump_page(struct page *page, const char *reason) { - unsigned long printflags = page->flags; - pr_emerg("page:%p count:%d mapcount:%d mapping:%p index:%#lx\n", page, atomic_read(&page->_count), page_mapcount(page), page->mapping, page->index); BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) != __NR_PAGEFLAGS + 1); - pr_emerg("flags: %#lx(%pgp)\n", printflags, &printflags); + pr_emerg("flags: %#lx(%pgp)\n", page->flags, &page->flags); if (reason) pr_alert("page dumped because: %s\n", reason); - if (page->flags & badflags) { - printflags = page->flags & badflags; - pr_alert("bad because of flags: %#lx(%pgp)\n", printflags, - &printflags); - } #ifdef CONFIG_MEMCG if (page->mem_cgroup) pr_alert("page->mem_cgroup:%p\n", page->mem_cgroup); @@ -136,7 +128,7 @@ void dump_page_badflags(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); } EXPORT_SYMBOL(dump_page); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index bd94c7465dea..2388496a7c6c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -435,7 +435,7 @@ static void bad_page(struct page *page, const char *reason, goto out; } if (nr_unshown) { - printk(KERN_ALERT + pr_alert( "BUG: Bad page state: %lu messages suppressed\n", nr_unshown); nr_unshown = 0; @@ -445,9 +445,13 @@ static void bad_page(struct page *page, const char *reason, if (nr_shown++ == 0) 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)); - 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); print_modules(); -- 2.6.3
WARNING: multiple messages have this Message-ID (diff)
From: Vlastimil Babka <vbabka@suse.cz> To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, Joonsoo Kim <iamjoonsoo.kim@lge.com>, Minchan Kim <minchan@kernel.org>, Sasha Levin <sasha.levin@oracle.com>, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Mel Gorman <mgorman@suse.de>, Michal Hocko <mhocko@suse.cz>, Vlastimil Babka <vbabka@suse.cz>, Rasmus Villemoes <linux@rasmusvillemoes.dk> Subject: [PATCH v2 3/3] mm, debug: move bad flags printing to bad_page() Date: Fri, 4 Dec 2015 16:16:35 +0100 [thread overview] Message-ID: <1449242195-16374-3-git-send-email-vbabka@suse.cz> (raw) In-Reply-To: <1449242195-16374-1-git-send-email-vbabka@suse.cz> 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: Vlastimil Babka <vbabka@suse.cz> 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> Cc: Michal Hocko <mhocko@suse.cz> --- include/linux/mmdebug.h | 3 +-- mm/debug.c | 14 +++----------- mm/page_alloc.c | 10 +++++++--- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h index 2c8286cf162e..9b0dc2161f7a 100644 --- a/include/linux/mmdebug.h +++ b/include/linux/mmdebug.h @@ -14,8 +14,7 @@ extern const struct trace_print_flags vmaflag_names[]; extern const struct trace_print_flags gfpflag_names[]; extern void dump_page(struct page *page, const char *reason); -extern void dump_page_badflags(struct page *page, const char *reason, - unsigned long badflags); +extern void __dump_page(struct page *page, const char *reason); void dump_vma(const struct vm_area_struct *vma); void dump_mm(const struct mm_struct *mm); diff --git a/mm/debug.c b/mm/debug.c index c42bb4c13c2d..d36aa66e9779 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -109,25 +109,17 @@ const struct trace_print_flags gfpflag_names[] = { {0, NULL}, }; -void dump_page_badflags(struct page *page, const char *reason, - unsigned long badflags) +void __dump_page(struct page *page, const char *reason) { - unsigned long printflags = page->flags; - pr_emerg("page:%p count:%d mapcount:%d mapping:%p index:%#lx\n", page, atomic_read(&page->_count), page_mapcount(page), page->mapping, page->index); BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) != __NR_PAGEFLAGS + 1); - pr_emerg("flags: %#lx(%pgp)\n", printflags, &printflags); + pr_emerg("flags: %#lx(%pgp)\n", page->flags, &page->flags); if (reason) pr_alert("page dumped because: %s\n", reason); - if (page->flags & badflags) { - printflags = page->flags & badflags; - pr_alert("bad because of flags: %#lx(%pgp)\n", printflags, - &printflags); - } #ifdef CONFIG_MEMCG if (page->mem_cgroup) pr_alert("page->mem_cgroup:%p\n", page->mem_cgroup); @@ -136,7 +128,7 @@ void dump_page_badflags(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); } EXPORT_SYMBOL(dump_page); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index bd94c7465dea..2388496a7c6c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -435,7 +435,7 @@ static void bad_page(struct page *page, const char *reason, goto out; } if (nr_unshown) { - printk(KERN_ALERT + pr_alert( "BUG: Bad page state: %lu messages suppressed\n", nr_unshown); nr_unshown = 0; @@ -445,9 +445,13 @@ static void bad_page(struct page *page, const char *reason, if (nr_shown++ == 0) 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)); - 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); print_modules(); -- 2.6.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-12-04 15:17 UTC|newest] Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-24 12:36 [PATCH v2 0/9] page_owner improvements for debugging Vlastimil Babka 2015-11-24 12:36 ` Vlastimil Babka 2015-11-24 12:36 ` [PATCH v2 1/9] mm, debug: fix wrongly filtered flags in dump_vma() Vlastimil Babka 2015-11-24 12:36 ` Vlastimil Babka 2015-11-27 9:52 ` Vlastimil Babka 2015-11-27 9:52 ` Vlastimil Babka 2015-11-24 12:36 ` [PATCH v2 2/9] mm, page_owner: print symbolic migratetype of both page and pageblock Vlastimil Babka 2015-11-24 12:36 ` Vlastimil Babka 2015-11-25 8:11 ` Joonsoo Kim 2015-11-25 8:11 ` Joonsoo Kim 2015-11-24 12:36 ` [PATCH v2 3/9] mm, page_owner: convert page_owner_inited to static key Vlastimil Babka 2015-11-24 12:36 ` Vlastimil Babka 2015-11-25 14:52 ` Michal Hocko 2015-11-25 14:52 ` Michal Hocko 2015-11-25 15:08 ` Vlastimil Babka 2015-11-25 15:08 ` Vlastimil Babka 2015-11-25 15:25 ` Peter Zijlstra 2015-11-25 15:25 ` Peter Zijlstra 2015-11-25 15:46 ` Michal Hocko 2015-11-25 15:46 ` Michal Hocko 2015-11-24 12:36 ` [PATCH v2 4/9] mm, page_owner: copy page owner info during migration Vlastimil Babka 2015-11-24 12:36 ` Vlastimil Babka 2015-11-24 12:36 ` [PATCH v2 5/9] mm, page_owner: track and print last migrate reason Vlastimil Babka 2015-11-24 12:36 ` Vlastimil Babka 2015-11-25 8:13 ` Joonsoo Kim 2015-11-25 8:13 ` Joonsoo Kim 2015-11-26 10:39 ` Vlastimil Babka 2015-11-26 10:39 ` Vlastimil Babka 2015-11-24 12:36 ` [PATCH v2 6/9] mm, debug: introduce dump_gfpflag_names() for symbolic printing of gfp_flags Vlastimil Babka 2015-11-24 12:36 ` Vlastimil Babka 2015-11-25 8:16 ` Joonsoo Kim 2015-11-25 8:16 ` Joonsoo Kim 2015-11-25 10:28 ` Vlastimil Babka 2015-11-25 10:28 ` Vlastimil Babka 2015-11-27 3:40 ` yalin wang 2015-11-27 3:40 ` yalin wang 2015-11-24 12:36 ` [PATCH v2 7/9] mm, page_owner: dump page owner info from dump_page() Vlastimil Babka 2015-11-24 12:36 ` Vlastimil Babka 2015-11-25 14:58 ` Michal Hocko 2015-11-25 14:58 ` Michal Hocko 2015-11-26 10:43 ` Vlastimil Babka 2015-11-26 10:43 ` Vlastimil Babka 2015-11-24 12:36 ` [PATCH v2 8/9] mm, page_alloc: print symbolic gfp_flags on allocation failure Vlastimil Babka 2015-11-24 12:36 ` Vlastimil Babka 2015-11-25 14:33 ` Michal Hocko 2015-11-25 14:33 ` Michal Hocko 2015-11-24 12:36 ` [PATCH v2 9/9] mm, oom: print symbolic gfp_flags in oom warning Vlastimil Babka 2015-11-24 12:36 ` Vlastimil Babka 2015-11-25 14:31 ` Michal Hocko 2015-11-25 14:31 ` Michal Hocko 2016-01-07 21:29 ` David Rientjes 2016-01-07 21:29 ` David Rientjes 2016-01-08 11:34 ` Vlastimil Babka 2016-01-08 11:34 ` Vlastimil Babka 2015-11-25 14:30 ` [PATCH v2 0/9] page_owner improvements for debugging Michal Hocko 2015-11-25 14:30 ` Michal Hocko 2015-11-30 16:10 ` [PATCH 1/2] mm, printk: introduce new format string for flags Vlastimil Babka 2015-11-30 16:10 ` Vlastimil Babka 2015-11-30 16:10 ` [PATCH 2/2] mm, page_owner: provide symbolic page flags and gfp_flags Vlastimil Babka 2015-11-30 16:10 ` Vlastimil Babka 2015-12-02 11:01 ` [PATCH 1/2] mm, printk: introduce new format string for flags Rasmus Villemoes 2015-12-02 11:01 ` Rasmus Villemoes 2015-12-02 20:34 ` Vlastimil Babka 2015-12-02 20:34 ` Vlastimil Babka 2015-12-03 12:37 ` Rasmus Villemoes 2015-12-03 12:37 ` Rasmus Villemoes 2015-12-03 13:46 ` Vlastimil Babka 2015-12-03 13:46 ` Vlastimil Babka 2015-12-04 15:16 ` [PATCH v2 1/3] " Vlastimil Babka 2015-12-04 15:16 ` Vlastimil Babka 2015-12-04 15:16 ` [PATCH v2 2/3] mm, page_owner: provide symbolic page flags and gfp_flags Vlastimil Babka 2015-12-04 15:16 ` Vlastimil Babka 2015-12-04 15:16 ` Vlastimil Babka [this message] 2015-12-04 15:16 ` [PATCH v2 3/3] mm, debug: move bad flags printing to bad_page() Vlastimil Babka 2015-12-05 20:00 ` [PATCH v2 1/3] mm, printk: introduce new format string for flags Rasmus Villemoes 2015-12-05 20:00 ` Rasmus Villemoes 2015-12-09 11:29 ` Arnd Bergmann 2015-12-09 11:29 ` Arnd Bergmann 2015-12-09 20:48 ` Vlastimil Babka 2015-12-09 20:48 ` Vlastimil Babka 2015-12-10 12:26 ` James Hogan 2015-12-10 12:26 ` James Hogan 2015-12-10 12:26 ` James Hogan 2015-12-10 2:59 ` Joonsoo Kim 2015-12-10 2:59 ` Joonsoo Kim 2015-12-10 4:04 ` Steven Rostedt 2015-12-10 4:04 ` Steven Rostedt 2015-12-10 4:12 ` Joonsoo Kim 2015-12-10 4:12 ` Joonsoo Kim 2015-12-10 8:41 ` Rasmus Villemoes 2015-12-10 8:41 ` Rasmus Villemoes 2015-12-10 10:03 ` Vlastimil Babka 2015-12-10 10:03 ` Vlastimil Babka 2015-12-14 3:03 ` Joonsoo Kim 2015-12-14 3:03 ` Joonsoo Kim 2015-12-10 3:51 ` Steven Rostedt 2015-12-10 3:51 ` Steven Rostedt 2015-12-10 9:51 ` Vlastimil Babka 2015-12-10 9:51 ` Vlastimil Babka 2015-12-02 17:40 ` [PATCH 1/2] " yalin wang 2015-12-02 17:40 ` yalin wang 2015-12-02 21:04 ` Vlastimil Babka 2015-12-02 21:04 ` Vlastimil Babka 2015-12-03 0:11 ` yalin wang 2015-12-03 0:11 ` yalin wang 2015-12-03 8:03 ` Rasmus Villemoes 2015-12-03 8:03 ` Rasmus Villemoes 2015-12-03 18:38 ` yalin wang 2015-12-03 18:38 ` yalin wang 2015-12-04 1:04 ` yalin wang 2015-12-04 1:04 ` yalin wang 2015-12-04 14:15 ` Vlastimil Babka 2015-12-04 14:15 ` Vlastimil Babka 2015-12-10 4:03 ` Steven Rostedt 2015-12-10 4:03 ` Steven Rostedt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1449242195-16374-3-git-send-email-vbabka@suse.cz \ --to=vbabka@suse.cz \ --cc=akpm@linux-foundation.org \ --cc=iamjoonsoo.kim@lge.com \ --cc=kirill.shutemov@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux@rasmusvillemoes.dk \ --cc=mgorman@suse.de \ --cc=mhocko@suse.cz \ --cc=minchan@kernel.org \ --cc=sasha.levin@oracle.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.