3 files changed, 28 insertions, 0 deletions

diff --git a/mm/debug.c b/mm/debug.c
index 78dc54877075..61b1f1bb328e 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -11,6 +11,7 @@
 #include <linux/memcontrol.h>
 #include <trace/events/mmflags.h>
 #include <linux/migrate.h>
+#include <linux/page_owner.h>
 
 #include "internal.h"
 
@@ -67,6 +68,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_owner(page);
 }
 EXPORT_SYMBOL(dump_page);
 
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 030fafccaa6b..d98672d33752 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -443,6 +443,7 @@ static void bad_page(struct page *page, const char *reason,
         printk(KERN_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_owner(page);
 
         print_modules();
         dump_stack();
diff --git a/mm/page_owner.c b/mm/page_owner.c
index a57068cfe52f..44ad1f00c4e1 100644
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -183,6 +183,31 @@ err:
         return -ENOMEM;
 }
 
+void __dump_page_owner(struct page *page)
+{
+        struct page_ext *page_ext = lookup_page_ext(page);
+        struct stack_trace trace = {
+                .nr_entries = page_ext->nr_entries,
+                .entries = &page_ext->trace_entries[0],
+        };
+        gfp_t gfp_mask = page_ext->gfp_mask;
+        int mt = gfpflags_to_migratetype(gfp_mask);
+
+        if (!test_bit(PAGE_EXT_OWNER, &page_ext->flags)) {
+                pr_alert("page_owner info is not active (free page?)\n");
+                return;
+        }
+
+        pr_alert("page allocated via order %u, migratetype %s, "
+                        "gfp_mask %#x(%pGg)\n", page_ext->order,
+                        migratetype_names[mt], gfp_mask, &gfp_mask);
+        print_stack_trace(&trace, 0);
+
+        if (page_ext->last_migrate_reason != -1)
+                pr_alert("page has been migrated, last migrate reason: %s\n",
+                        migrate_reason_names[page_ext->last_migrate_reason]);
+}
+
 static ssize_t
 read_page_owner(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {