Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7560fc8 authored by Wu Fengguang's avatar Wu Fengguang Committed by Andi Kleen
Browse files

HWPOISON: return ENXIO on invalid page number 



Use a different errno than the usual EIO for invalid page numbers.
This is mainly for better reporting for the injector.

This also avoids calling action_result() with invalid pfn.

Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent 9b9a29ec

mm/memory-failure.c

+6 −6
Original line number Diff line number Diff line
@@ -618,13 +618,11 @@ static struct page_state { 


static void action_result(unsigned long pfn, char *msg, int result)

{

	struct page *page = NULL;

	if (pfn_valid(pfn))

		page = pfn_to_page(pfn);

	struct page *page = pfn_to_page(pfn);



	printk(KERN_ERR "MCE %#lx: %s%s page recovery: %s\n",

		pfn,

		page && PageDirty(page) ? "dirty " : "",

		PageDirty(page) ? "dirty " : "",

		msg, action_name[result]);

}
@@ -750,8 +748,10 @@ int __memory_failure(unsigned long pfn, int trapno, int ref) 
		panic("Memory failure from trap %d on page %lx", trapno, pfn);



	if (!pfn_valid(pfn)) {

		action_result(pfn, "memory outside kernel control", IGNORED);

		return -EIO;

		printk(KERN_ERR

		       "MCE %#lx: memory outside kernel control\n",

		       pfn);

		return -ENXIO;

	}



	p = pfn_to_page(pfn);