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] [7/15] HWPOISON: x86: Add VM_FAULT_HWPOISON handling to x86 page fault handler v2
Date: Thu, 4 Jun 2009 23:28:18 +0200 (CEST) [thread overview]
Message-ID: <20090604212818.C4F2B1D0291@basil.firstfloor.org> (raw)
In-Reply-To: <200906041128.112757038@firstfloor.org>
Add VM_FAULT_HWPOISON handling to the x86 page fault handler. This is
very similar to VM_FAULT_OOM, the only difference is that a different
si_code is passed to user space and the new addr_lsb field is initialized.
v2: Make the printk more verbose/unique
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
arch/x86/mm/fault.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
Index: linux/arch/x86/mm/fault.c
===================================================================
--- linux.orig/arch/x86/mm/fault.c
+++ linux/arch/x86/mm/fault.c
@@ -166,6 +166,7 @@ force_sig_info_fault(int si_signo, int s
info.si_errno = 0;
info.si_code = si_code;
info.si_addr = (void __user *)address;
+ info.si_addr_lsb = si_code == BUS_MCEERR_AR ? PAGE_SHIFT : 0;
force_sig_info(si_signo, &info, tsk);
}
@@ -797,10 +798,12 @@ out_of_memory(struct pt_regs *regs, unsi
}
static void
-do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address)
+do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
+ unsigned int fault)
{
struct task_struct *tsk = current;
struct mm_struct *mm = tsk->mm;
+ int code = BUS_ADRERR;
up_read(&mm->mmap_sem);
@@ -816,7 +819,15 @@ do_sigbus(struct pt_regs *regs, unsigned
tsk->thread.error_code = error_code;
tsk->thread.trap_no = 14;
- force_sig_info_fault(SIGBUS, BUS_ADRERR, address, tsk);
+#ifdef CONFIG_MEMORY_FAILURE
+ if (fault & VM_FAULT_HWPOISON) {
+ printk(KERN_ERR
+ "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
+ tsk->comm, tsk->pid, address);
+ code = BUS_MCEERR_AR;
+ }
+#endif
+ force_sig_info_fault(SIGBUS, code, address, tsk);
}
static noinline void
@@ -826,8 +837,8 @@ mm_fault_error(struct pt_regs *regs, uns
if (fault & VM_FAULT_OOM) {
out_of_memory(regs, error_code, address);
} else {
- if (fault & VM_FAULT_SIGBUS)
- do_sigbus(regs, error_code, address);
+ if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON))
+ do_sigbus(regs, error_code, address, fault);
else
BUG();
}
--
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 ` [PATCH] [5/15] HWPOISON: Add basic support for poisoned pages in fault handler v3 Andi Kleen
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 ` Andi Kleen [this message]
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=20090604212818.C4F2B1D0291@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