diff options
Diffstat (limited to 'mm/debug-pagealloc.c')
| -rw-r--r-- | mm/debug-pagealloc.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/mm/debug-pagealloc.c b/mm/debug-pagealloc.c index 5bf5906ce13b..100963091cc6 100644 --- a/mm/debug-pagealloc.c +++ b/mm/debug-pagealloc.c @@ -6,6 +6,14 @@ #include <linux/poison.h> #include <linux/ratelimit.h> +#ifndef mark_addr_rdonly +#define mark_addr_rdonly(a) +#endif + +#ifndef mark_addr_rdwrite +#define mark_addr_rdwrite(a) +#endif + static bool page_poisoning_enabled __read_mostly; static bool need_page_poisoning(void) @@ -59,6 +67,7 @@ static void poison_page(struct page *page) set_page_poison(page); memset(addr, PAGE_POISON, PAGE_SIZE); + mark_addr_rdonly(addr); kunmap_atomic(addr); } @@ -77,7 +86,8 @@ 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; @@ -95,12 +105,15 @@ static void check_poison_mem(unsigned char *mem, size_t bytes) if (!__ratelimit(&ratelimit)) return; else if (start == end && single_bit_flip(*start, PAGE_POISON)) - printk(KERN_ERR "pagealloc: single bit error\n"); + pr_err("pagealloc: single bit error on page with phys start 0x%lx\n", + (unsigned long)page_to_phys(page)); else - printk(KERN_ERR "pagealloc: memory corruption\n"); + pr_err("pagealloc: memory corruption on page with phys start 0x%lx\n", + (unsigned long)page_to_phys(page)); print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1, start, end - start + 1, 1); + BUG_ON(PANIC_CORRUPTION); dump_stack(); } @@ -112,7 +125,8 @@ static void unpoison_page(struct page *page) return; addr = kmap_atomic(page); - check_poison_mem(addr, PAGE_SIZE); + check_poison_mem(page, addr, PAGE_SIZE); + mark_addr_rdwrite(addr); clear_page_poison(page); kunmap_atomic(addr); } |