Merge "debug-pagealloc: print physical address for detected corruption" into msm-4.9 (26ee6abd) · Commits · e / devices / android_kernel_fairphone_FP3

mm/page_poison.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -106,7 +106,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;
		@@ -127,9 +128,11 @@ 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))
		pr_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
		pr_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);
		@@ -145,7 +148,7 @@ 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);
		clear_page_poison(page);
		kunmap_atomic(addr);
		}