Skip to content

Commit

Permalink
HWPOISON: return ENXIO on invalid page number
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wu Fengguang authored and Andi Kleen committed Dec 16, 2009
1 parent 9b9a29e commit a7560fc
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions mm/memory-failure.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a7560fc

Please sign in to comment.