From 6f51d98fe6d1df70ebbfa5d37b3505c48d69e569 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 3 Jul 2012 13:51:04 +0100 Subject: x86/nmi: Fix deadlock in unknown_nmi_error() Additionally, correct the text description to reflect what is being done, and make use of fatal_trap() in preference to kexec_crash() in case an unknown NMI occurs before a kdump kernel has been loaded. Signed-off-by: Andrew Cooper Committed-by: Keir Fraser xen-unstable changeset: 25478:6d1a30dc47e8 xen-unstable date: Mon Jun 11 15:12:50 2012 +0100 --- xen/arch/x86/traps.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index b1540d2f4c..cfc09edf7f 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3064,7 +3064,7 @@ static void io_check_error(struct cpu_user_regs *regs) outb((inb(0x61) & 0x07) | 0x00, 0x61); /* enable IOCK */ } -static void unknown_nmi_error(unsigned char reason) +static void unknown_nmi_error(struct cpu_user_regs *regs, unsigned char reason) { switch ( opt_nmi[0] ) { @@ -3073,10 +3073,10 @@ static void unknown_nmi_error(unsigned char reason) case 'i': /* 'ignore' */ break; default: /* 'fatal' */ + console_force_unlock(); printk("Uhhuh. NMI received for unknown reason %02x.\n", reason); - printk("Dazed and confused, but trying to continue\n"); printk("Do you have a strange power saving mode enabled?\n"); - kexec_crash(); + fatal_trap(TRAP_nmi, regs); } } @@ -3109,7 +3109,7 @@ void do_nmi(struct cpu_user_regs *regs) else if ( reason & 0x40 ) io_check_error(regs); else if ( !nmi_watchdog ) - unknown_nmi_error((unsigned char)(reason&0xff)); + unknown_nmi_error(regs, (unsigned char)(reason&0xff)); } } -- cgit v1.2.3