diff options
author | Andrew Cooper <andrew.cooper3@citrix.com> | 2012-07-03 13:49:32 +0100 |
---|---|---|
committer | Andrew Cooper <andrew.cooper3@citrix.com> | 2012-07-03 13:49:32 +0100 |
commit | 34bf8242c649a7a69a371f4d8e418460f9bb1e97 (patch) | |
tree | e192845c8546668fb68af50548cdf5dfa89cc02f | |
parent | f3a503ddc84ca62c3aec657a82a57adf5668ad52 (diff) | |
download | xen-34bf8242c649a7a69a371f4d8e418460f9bb1e97.tar.gz xen-34bf8242c649a7a69a371f4d8e418460f9bb1e97.tar.bz2 xen-34bf8242c649a7a69a371f4d8e418460f9bb1e97.zip |
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 <andrew.cooper3@citrix.com>
Committed-by: Keir Fraser <keir@xen.org>
xen-unstable changeset: 25478:6d1a30dc47e8
xen-unstable date: Mon Jun 11 15:12:50 2012 +0100
-rw-r--r-- | xen/arch/x86/traps.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 5dd38fc3ef..9ad1b34303 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3225,7 +3225,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] ) { @@ -3234,10 +3234,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); } } @@ -3270,7 +3270,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)); } } |