summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Ying <ying.huang@intel.com>2009-07-31 09:41:41 +0800
committerH. Peter Anvin <hpa@zytor.com>2009-08-10 13:58:41 -0700
commit0dcc66851f1091af421416c28a9458836885f522 (patch)
tree7dd11e406c501068a50d5e3f1fc272262445c519
parent5b7e88edc6193f36941bccbfd5ed9ed5fe27d2e1 (diff)
x86, mce: Support specifying raise mode for software MCE injection
Raise mode include raising as exception or raising as poll, it is specified via the mce.inject_flags field. This can be used to specify raise mode of UCNA, which is UC error but raised not as exception. And this can be used to test the filter code of poll handler or exception handler too. For example, enforce a poll raise mode for a fatal MCE. ChangeLog: v2: - Re-base on latest x86-tip.git/mce3 Signed-off-by: Huang Ying <ying.huang@intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/include/asm/mce.h1
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce-inject.c16
2 files changed, 9 insertions, 8 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 8945be9ad2b..b608a64c581 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -44,6 +44,7 @@
#define MCJ_CTX_PROCESS 1 /* inject context: process */
#define MCJ_CTX_IRQ 2 /* inject context: IRQ */
#define MCJ_NMI_BROADCAST 4 /* do NMI broadcasting */
+#define MCJ_EXCEPTION 8 /* raise as exception */
/* Fields are zero when not available */
struct mce {
diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
index ad5d92790eb..7029f0e2aca 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
@@ -44,7 +44,7 @@ static void inject_mce(struct mce *m)
i->finished = 1;
}
-static void raise_corrected(struct mce *m)
+static void raise_poll(struct mce *m)
{
unsigned long flags;
mce_banks_t b;
@@ -56,7 +56,7 @@ static void raise_corrected(struct mce *m)
m->finished = 0;
}
-static void raise_uncorrected(struct mce *m, struct pt_regs *pregs)
+static void raise_exception(struct mce *m, struct pt_regs *pregs)
{
struct pt_regs regs;
unsigned long flags;
@@ -85,10 +85,10 @@ static int mce_raise_notify(struct notifier_block *self,
if (val != DIE_NMI_IPI || !cpu_isset(cpu, mce_inject_cpumask))
return NOTIFY_DONE;
cpu_clear(cpu, mce_inject_cpumask);
- if (m->status & MCI_STATUS_UC)
- raise_uncorrected(m, args->regs);
+ if (m->inject_flags & MCJ_EXCEPTION)
+ raise_exception(m, args->regs);
else if (m->status)
- raise_corrected(m);
+ raise_poll(m);
return NOTIFY_STOP;
}
@@ -104,7 +104,7 @@ static int raise_local(struct mce *m)
int ret = 0;
int cpu = m->extcpu;
- if (m->status & MCI_STATUS_UC) {
+ if (m->inject_flags & MCJ_EXCEPTION) {
printk(KERN_INFO "Triggering MCE exception on CPU %d\n", cpu);
switch (context) {
case MCJ_CTX_IRQ:
@@ -115,7 +115,7 @@ static int raise_local(struct mce *m)
*/
/*FALL THROUGH*/
case MCJ_CTX_PROCESS:
- raise_uncorrected(m, NULL);
+ raise_exception(m, NULL);
break;
default:
printk(KERN_INFO "Invalid MCE context\n");
@@ -124,7 +124,7 @@ static int raise_local(struct mce *m)
printk(KERN_INFO "MCE exception done on CPU %d\n", cpu);
} else if (m->status) {
printk(KERN_INFO "Starting machine check poll CPU %d\n", cpu);
- raise_corrected(m);
+ raise_poll(m);
mce_notify_irq();
printk(KERN_INFO "Machine check poll done on CPU %d\n", cpu);
} else