summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2009-09-16 11:50:08 +0200
committerAndi Kleen <ak@linux.intel.com>2009-09-16 11:50:08 +0200
commita3b947eacfe783df4ca0fe53ef8a764eebc2d0d6 (patch)
treeabd4d972730838708cc9e81ccd8a24b99c0db2f3
parentd1737fdbec7f90edc52dd0c5c3767457f28e78d8 (diff)
downloadop-kernel-dev-a3b947eacfe783df4ca0fe53ef8a764eebc2d0d6.zip
op-kernel-dev-a3b947eacfe783df4ca0fe53ef8a764eebc2d0d6.tar.gz
HWPOISON: Add poison check to page fault handling
Bail out early when hardware poisoned pages are found in page fault handling. Since they are poisoned they should not be mapped freshly into processes, because that would cause another (potentially deadly) machine check This is generally handled in the same way as OOM, just a different error code is returned to the architecture code. v2: Do a page unlock if needed (Fengguang Wu) Signed-off-by: Andi Kleen <ak@linux.intel.com>
-rw-r--r--mm/memory.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 02bae2d..44ea411 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2711,6 +2711,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))
return ret;
+ if (unlikely(PageHWPoison(vmf.page))) {
+ if (ret & VM_FAULT_LOCKED)
+ unlock_page(vmf.page);
+ return VM_FAULT_HWPOISON;
+ }
+
/*
* For consistency in subsequent calls, make the faulted page always
* locked.
OpenPOWER on IntegriCloud