From: Andi Kleen <andi@firstfloor.org>
To: akpm@linux-foundation.org, npiggin@suse.de,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
fengguang.wu@intel.com
Subject: [PATCH] [5/15] HWPOISON: Add basic support for poisoned pages in fault handler v3
Date: Thu, 4 Jun 2009 23:28:16 +0200 (CEST) [thread overview]
Message-ID: <20090604212816.895961D028F@basil.firstfloor.org> (raw)
In-Reply-To: <200906041128.112757038@firstfloor.org>
- Add a new VM_FAULT_HWPOISON error code to handle_mm_fault. Right now
architectures have to explicitely enable poison page support, so
this is forward compatible to all architectures. They only need
to add it when they enable poison page support.
- Add poison page handling in swap in fault code
v2: Add missing delayacct_clear_flag (Hidehiro Kawai)
v3: Really use delayacct_clear_flag (Hidehiro Kawai)
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
include/linux/mm.h | 3 ++-
mm/memory.c | 18 +++++++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
Index: linux/mm/memory.c
===================================================================
--- linux.orig/mm/memory.c
+++ linux/mm/memory.c
@@ -1315,7 +1315,8 @@ int __get_user_pages(struct task_struct
if (ret & VM_FAULT_ERROR) {
if (ret & VM_FAULT_OOM)
return i ? i : -ENOMEM;
- else if (ret & VM_FAULT_SIGBUS)
+ if (ret &
+ (VM_FAULT_HWPOISON|VM_FAULT_SIGBUS))
return i ? i : -EFAULT;
BUG();
}
@@ -2597,8 +2598,15 @@ static int do_swap_page(struct mm_struct
goto out;
entry = pte_to_swp_entry(orig_pte);
- if (is_migration_entry(entry)) {
- migration_entry_wait(mm, pmd, address);
+ if (unlikely(non_swap_entry(entry))) {
+ if (is_migration_entry(entry)) {
+ migration_entry_wait(mm, pmd, address);
+ } else if (is_hwpoison_entry(entry)) {
+ ret = VM_FAULT_HWPOISON;
+ } else {
+ print_bad_pte(vma, address, pte, NULL);
+ ret = VM_FAULT_OOM;
+ }
goto out;
}
delayacct_set_flag(DELAYACCT_PF_SWAPIN);
@@ -2622,6 +2630,10 @@ static int do_swap_page(struct mm_struct
/* Had to read the page from swap area: Major fault */
ret = VM_FAULT_MAJOR;
count_vm_event(PGMAJFAULT);
+ } else if (PageHWPoison(page)) {
+ ret = VM_FAULT_HWPOISON;
+ delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
+ goto out;
}
lock_page(page);
Index: linux/include/linux/mm.h
===================================================================
--- linux.orig/include/linux/mm.h
+++ linux/include/linux/mm.h
@@ -702,11 +702,12 @@ static inline int page_mapped(struct pag
#define VM_FAULT_SIGBUS 0x0002
#define VM_FAULT_MAJOR 0x0004
#define VM_FAULT_WRITE 0x0008 /* Special case for get_user_pages */
+#define VM_FAULT_HWPOISON 0x0010 /* Hit poisoned page */
#define VM_FAULT_NOPAGE 0x0100 /* ->fault installed the pte, not return page */
#define VM_FAULT_LOCKED 0x0200 /* ->fault locked the returned page */
-#define VM_FAULT_ERROR (VM_FAULT_OOM | VM_FAULT_SIGBUS)
+#define VM_FAULT_ERROR (VM_FAULT_OOM | VM_FAULT_SIGBUS | VM_FAULT_HWPOISON)
/*
* Can be called by the pagefault handler when it gets a VM_FAULT_OOM.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2009-06-04 21:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-04 21:28 [PATCH] [0/15] HWPOISON: Intro Andi Kleen
2009-06-04 21:28 ` [PATCH] [1/15] HWPOISON: Add page flag for poisoned pages Andi Kleen
2009-06-04 21:28 ` [PATCH] [2/15] HWPOISON: Export some rmap vma locking to outside world Andi Kleen
2009-06-04 21:28 ` [PATCH] [3/15] HWPOISON: Add support for poison swap entries v2 Andi Kleen
2009-06-04 21:28 ` [PATCH] [4/15] HWPOISON: Add new SIGBUS error codes for hardware poison signals Andi Kleen
2009-06-04 21:28 ` Andi Kleen [this message]
2009-06-04 21:28 ` [PATCH] [6/15] HWPOISON: Add various poison checks in mm/memory.c v2 Andi Kleen
2009-06-04 21:28 ` [PATCH] [7/15] HWPOISON: x86: Add VM_FAULT_HWPOISON handling to x86 page fault handler v2 Andi Kleen
2009-06-04 21:28 ` [PATCH] [8/15] HWPOISON: Use bitmask/action code for try_to_unmap behaviour Andi Kleen
2009-06-04 21:28 ` [PATCH] [9/15] HWPOISON: Handle hardware poisoned pages in try_to_unmap Andi Kleen
2009-06-04 21:28 ` [PATCH] [10/15] HWPOISON: check and isolate corrupted free pages v2 Andi Kleen
2009-06-04 21:28 ` [PATCH] [11/15] HWPOISON: Refactor truncate to allow direct truncating of page v2 Andi Kleen
2009-06-09 9:18 ` Nick Piggin
2009-06-09 9:31 ` [PATCH] [11/15] HWPOISON: Refactor truncate to allow direct truncating of page v3 Wu Fengguang
2009-06-04 21:28 ` [PATCH] [12/15] HWPOISON: The high level memory error handler in the VM v6 Andi Kleen
2009-06-04 21:28 ` [PATCH] [13/15] HWPOISON: FOR TESTING: Enable memory failure code unconditionally Andi Kleen
2009-06-04 21:28 ` [PATCH] [14/15] HWPOISON: Add madvise() based injector for hardware poisoned pages v3 Andi Kleen
2009-06-04 21:28 ` [PATCH] [15/15] HWPOISON: Add simple debugfs interface to inject hwpoison on arbitary PFNs Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090604212816.895961D028F@basil.firstfloor.org \
--to=andi@firstfloor.org \
--cc=akpm@linux-foundation.org \
--cc=fengguang.wu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=npiggin@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox