Allow users to force a panic on NMI
PATCH 1/1 Allow users to force a panic on NMI
To quote Alan Cox:
The default Linux behaviour on an NMI of either memory or unknown is to continue operation. For many environments such as scientific computing it is preferable that the box is taken out and the error dealt with than an uncorrected parity/ECC error get propogated.
A small number of systems do generate NMI's for bizarre random reasons such as power management so the default is unchanged. In other respects the new proc/sys entry works like the existing panic controls already in that directory.
This is separate to the edac support - EDAC allows supported chipsets to handle ECC errors well, this change allows unsupported cases to at least panic rather than cause problems further down the line.
---
This is just a refreshed post of Alan's original patch
<http://www.ussg.iu.edu/hypermail/linux/kernel/0510.2/1208.html>, with hopes this time it sticks. :)
It applies cleanly on top of my other nmi patches.
Cheers,
Don
arch/i386/kernel/traps.c +6 -0
@@ -602,6 +602,8 @@ static void mem_parity_error(unsigned ch "to continue\n");printk (KERN_EMERG "You probably have a hardware problem with your RAM " "chips\n" ); +if (panic_on_unrecovered_nmi) +panic ("NMI: Not continuing" );/* Clear and disable the memory parity error line. */ clear_mem_error (reason);
@@ -637,6 +639,10 @@ static void unknown_nmi_error(unsigned c reason, smp_processor_id());printk ("Dazed and confused, but trying to continue\n" );printk ("Do you have a strange power saving mode enabled?\n" ); + +if (panic_on_unrecovered_nmi) +panic ("NMI: Not continuing" ); + }static DEFINE_SPINLOCK (nmi_print_lock);
arch/x86_64/kernel/traps.c +6 -0
@@ -608,6 +608,8 @@ mem_parity_error(unsigned char reason, s {printk ("Uhhuh. NMI received. Dazed and confused, but trying to continue\n" );printk ("You probably have a hardware problem with your RAM chips\n" ); +if (panic_on_unrecovered_nmi) +panic ("NMI: Not continuing" );/* Clear and disable the memory parity error line. */ reason = (reason &0xf ) |4 ;
@@ -633,6 +635,10 @@ unknown_nmi_error(unsigned char reason, {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" ); + +if (panic_on_unrecovered_nmi) +panic ("NMI: Not continuing" ); + }/* Runs on IST stack. This code must keep interrupts off all the time.
include/linux/kernel.h +1 -0
@@ -178,6 +178,7 @@ extern void bust_spinlocks(int yes);extern int oops_in_progress;/* If set, an oops, panic(), BUG() or die() is in progress */ extern int panic_timeout;extern int panic_on_oops; +extern int panic_on_unrecovered_nmi;extern int tainted;extern const char *print_tainted (void );extern void add_taint (unsigned );
kernel/sysctl.c +8 -0
@@ -644,6 +644,14 @@ static ctl_table kern_table[] = {#endif #if defined(CONFIG_X86) { + .ctl_name = KERN_PANIC_ON_NMI, + .procname = "panic_on_unrecovered_nmi", + .data = &panic_on_unrecovered_nmi, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, + { .ctl_name = KERN_BOOTLOADER_TYPE, .procname = "bootloader_type", .data = &bootloader_type,
include/linux/sysctl.h +1 -0
@@ -149,6 +149,7 @@ enumKERN_ACPI_VIDEO_FLAGS =71 ,/* int: flags for setting up video after ACPI sleep */ KERN_IA64_UNALIGNED =72 ,/* int: ia64 unaligned userland trap enable */ KERN_NMI_ENABLED =73 ,/* int: enable/disable nmi watchdog */ + KERN_PANIC_ON_NMI=74, /* int: whether we will panic on an unrecovered */ };
kernel/panic.c +1 -0
@@ -21,6 +21,7 @@#include <linux/kexec.h> int panic_on_oops; +int panic_on_unrecovered_nmi;int tainted;static int pause_on_oops;static int pause_on_oops_flag;
Hi!
Quoted 27 lines
To quote Alan Cox:
The default Linux behaviour on an NMI of either memory or unknown is to continue operation. For many environments such as scientific computing it is preferable that the box is taken out and the error dealt with than an uncorrected parity/ECC error get propogated.
This is just a refreshed post of Alan's original patch
<http://www.ussg.iu.edu/hypermail/linux/kernel/0510.2/1208.html>, with hopes this time it sticks. :)It applies cleanly on top of my other nmi patches.
Index:
linux-don/arch/i386/kernel/traps.c
===================================================================arch/i386/kernel/traps.c +2
-0@@ -602,6 +602,8 @@ static void mem_parity_error(unsigned ch "to continue\n");printk (KERN_EMERG "You probably have a hardware problem with your RAM " "chips\n" ); +if (panic_on_unrecovered_nmi) +panic ("NMI: Not continuing" );/* Clear and disable the memory parity error line. */ clear_mem_error (reason);
arch/i386/kernel/traps.c static void unknown_nmi_error(unsigned c · line 640
Quoted 2 lines
arch/i386/kernel/traps.c +0
-0@@ -637,6 +639,10 @@ static void unknown_nmi_error(unsigned c reason, smp_processor_id());printk ("Dazed and confused, but trying to continue\n" );
'Trying to contninue'
arch/i386/kernel/traps.c static void unknown_nmi_error(unsigned c · line 645
Quoted 5 lines
arch/i386/kernel/traps.c +4
-0printk ("Do you have a strange power saving mode enabled?\n" ); + +if (panic_on_unrecovered_nmi) +panic ("NMI: Not continuing" ); +
'not really'. Move printks around so it makes sense...
arch/x86_64/kernel/traps.c mem_parity_error(unsigned char reason, s · line 614
Quoted 12 lines
Index:
linux-don/arch/x86_64/kernel/traps.c
===================================================================arch/x86_64/kernel/traps.c +2
-0@@ -608,6 +608,8 @@ mem_parity_error(unsigned char reason, s {printk ("Uhhuh. NMI received. Dazed and confused, but trying to continue\n" );printk ("You probably have a hardware problem with your RAM chips\n" ); +if (panic_on_unrecovered_nmi) +panic ("NMI: Not continuing" );/* Clear and disable the memory parity error line. */
same here.
arch/x86_64/kernel/traps.c unknown_nmi_error(unsigned char reason, · line 643
Quoted 10 lines
arch/x86_64/kernel/traps.c +4
-0@@ -633,6 +635,10 @@ unknown_nmi_error(unsigned char reason, {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" ); + +if (panic_on_unrecovered_nmi) +panic ("NMI: Not continuing" ); + }
and here.
Signature · 1 line
Thanks for all the (sleeping) penguins.
Quoted 3 lines
Quoted 1 line
printk("Dazed and confused, but trying to continue\n");'Trying to contninue'
I'm pretty sure that the correct spelling is "continue", not "contninue". Are you suggesting otherwise?
Signature · 3 lines
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <[email protected]> 1.925.600.0401Quoted 6 lines · Paul Jackson
Quoted 3 lines
Quoted 1 line
printk("Dazed and confused, but trying to continue\n");'Trying to contninue'
I'm pretty sure that the correct spelling is "continue", not "contninue". Are you suggesting otherwise?
No, that was a typo. But it is wrong to print "...trying to continue" message, when machine is going to be halted next milisecond.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 1/1 x86 clean up nmi panic messages
In reply to Pavel MachekClean up some of the output messages on the nmi error paths to make more sense when they are displayed. This is mainly a cosmetic fix and shouldn't impact any normal code path.
---
Pavel,
I hope this patch addresses your concerns. This will apply on top of my other patch.
Cheers,
Don
Quoted 19 lines
Quoted 14 lines
Index:
linux-don/arch/i386/kernel/traps.c
===================================================================arch/i386/kernel/traps.c +2
-0@@ -602,6 +602,8 @@ static void mem_parity_error(unsigned ch "to continue\n");printk (KERN_EMERG "You probably have a hardware problem with your RAM " "chips\n" ); +if (panic_on_unrecovered_nmi) +panic ("NMI: Not continuing" );/* Clear and disable the memory parity error line. */ clear_mem_error (reason);arch/i386/kernel/traps.c static void unknown_nmi_error(unsigned c · line 640
Quoted 2 lines
arch/i386/kernel/traps.c +0
-0@@ -637,6 +639,10 @@ static void unknown_nmi_error(unsigned c reason, smp_processor_id());printk ("Dazed and confused, but trying to continue\n" );'Trying to contninue'
Quoted 7 lines
arch/i386/kernel/traps.c static void unknown_nmi_error(unsigned c · line 645
Quoted 5 lines
arch/i386/kernel/traps.c +4
-0printk ("Do you have a strange power saving mode enabled?\n" ); + +if (panic_on_unrecovered_nmi) +panic ("NMI: Not continuing" ); +'not really'. Move printks around so it makes sense...
arch/i386/kernel/traps.c +8 -7
@@ -598,13 +598,15 @@ gp_in_kernel:static void mem_parity_error (unsigned char reason,struct pt_regs * regs) { -printk (KERN_EMERG "Uhhuh. NMI received. Dazed and confused, but trying " -"to continue\n" ); +printk (KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on " +"CPU %d.\n" , reason,smp_processor_id ());printk (KERN_EMERG "You probably have a hardware problem with your RAM " "chips\n" );if (panic_on_unrecovered_nmi)panic ("NMI: Not continuing" ); +printk (KERN_EMERG "Dazed and confused, but trying to continue\n" ); +/* Clear and disable the memory parity error line. */ clear_mem_error (reason); }
@@ -635,14 +637,13 @@ static void unknown_nmi_error(unsigned c return; }#endif -printk ("Uhhuh. NMI received for unknown reason %02x on CPU %d.\n" , - reason,smp_processor_id ()); -printk ("Dazed and confused, but trying to continue\n" ); -printk ("Do you have a strange power saving mode enabled?\n" ); - +printk (KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on " +"CPU %d.\n" , reason,smp_processor_id ()); +printk (KERN_EMERG "Do you have a strange power saving mode enabled?\n" );if (panic_on_unrecovered_nmi)panic ("NMI: Not continuing" ); +printk (KERN_EMERG "Dazed and confused, but trying to continue\n" ); }static DEFINE_SPINLOCK (nmi_print_lock);
arch/x86_64/kernel/traps.c +14 -7
@@ -606,10 +606,15 @@ asmlinkage void __kprobes do_general_prostatic __kprobes void mem_parity_error (unsigned char reason,struct pt_regs * regs) { -printk ("Uhhuh. NMI received. Dazed and confused, but trying to continue\n" ); -printk ("You probably have a hardware problem with your RAM chips\n" ); +printk (KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n" , + reason); +printk (KERN_EMERG "You probably have a hardware problem with your " +"RAM chips\n" ); +if (panic_on_unrecovered_nmi) -panic ("NMI: Not continuing" ); +panic ("NMI: Not continuing" ); + +printk (KERN_EMERG "Dazed and confused, but trying to continue\n" );/* Clear and disable the memory parity error line. */ reason = (reason &0xf ) |4 ;
@@ -632,13 +637,15 @@ io_check_error(unsigned char reason, strstatic __kprobes void unknown_nmi_error (unsigned char reason,struct pt_regs * regs) -{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" ); +{ +printk (KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n" , + reason); +printk (KERN_EMERG "Do you have a strange power saving mode enabled?\n" );if (panic_on_unrecovered_nmi) -panic ("NMI: Not continuing" ); +panic ("NMI: Not continuing" ); +printk (KERN_EMERG "Dazed and confused, but trying to continue\n" ); }/* Runs on IST stack. This code must keep interrupts off all the time.
Re: [PATCH] x86 clean up nmi panic messages
Hi!
Quoted 5 lines
Clean up some of the output messages on the nmi error paths to make more sense when they are displayed. This is mainly a cosmetic fix and shouldn't impact any normal code path.
Signed-off-by Don Zickus <[email protected]>
ACK.
Quoted 4 lines
Pavel,
I hope this patch addresses your concerns. This will apply on top of my other patch.
Yes, thanks.
Signature · 1 line
Thanks for all the (sleeping) penguins.