Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HWPOISON: return ENXIO on invalid page number

Browse source 
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: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
This commit is contained in:
Wu Fengguang 2009-12-16 12:19:57 +01:00 committed by Andi Kleen
parent 9b9a29ecd7
commit a7560fc80f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mm/memory-failure.c
View file

@ -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);