Linux 6.9-rc1

[linux-2.6-microblaze.git] / mm / page_poison.c

diff --git a/mm/page_poison.c b/mm/page_poison.c
index 655dc58..3e90373 100644 (file)
--- a/mm/page_poison.c
+++ b/mm/page_poison.c
@@ -2,8 +2,8 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/mm.h>
+#include <linux/mmdebug.h>
 #include <linux/highmem.h>
-#include <linux/page_ext.h>
 #include <linux/poison.h>
 #include <linux/ratelimit.h>
 #include <linux/kasan.h>
@@ -21,13 +21,13 @@ early_param("page_poison", early_page_poison_param);
 
 static void poison_page(struct page *page)
 {
-       void *addr = kmap_atomic(page);
+       void *addr = kmap_local_page(page);
 
        /* KASAN still think the page is in-use, so skip it. */
        kasan_disable_current();
        memset(kasan_reset_tag(addr), PAGE_POISON, PAGE_SIZE);
        kasan_enable_current();
-       kunmap_atomic(addr);
+       kunmap_local(addr);
 }
 
 void __kernel_poison_pages(struct page *page, int n)
@@ -45,7 +45,7 @@ static bool single_bit_flip(unsigned char a, unsigned char b)
        return error && !(error & (error - 1));
 }
 
-static void check_poison_mem(unsigned char *mem, size_t bytes)
+static void check_poison_mem(struct page *page, unsigned char *mem, size_t bytes)
 {
        static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 10);
        unsigned char *start;
@@ -70,22 +70,23 @@ static void check_poison_mem(unsigned char *mem, size_t bytes)
        print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1, start,
                        end - start + 1, 1);
        dump_stack();
+       dump_page(page, "pagealloc: corrupted page details");
 }
 
 static void unpoison_page(struct page *page)
 {
        void *addr;
 
-       addr = kmap_atomic(page);
+       addr = kmap_local_page(page);
        kasan_disable_current();
        /*
         * Page poisoning when enabled poisons each and every page
         * that is freed to buddy. Thus no extra check is done to
         * see if a page was poisoned.
         */
-       check_poison_mem(kasan_reset_tag(addr), PAGE_SIZE);
+       check_poison_mem(page, kasan_reset_tag(addr), PAGE_SIZE);
        kasan_enable_current();
-       kunmap_atomic(addr);
+       kunmap_local(addr);
 }
 
 void __kernel_unpoison_pages(struct page *page, int n)