Skip to contentSkip to conversation

prevent nested panic from soft lockup detection

PATCH In review Jan Beulich 2 participants 2 messages Jan 30, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 prevent nested panic from soft lockup detection

From: Jan Beulich <[email protected]>

Suppress triggering a nested panic due to soft lockup detection.

From: Jan Beulich <[email protected]>

Suppress triggering a nested panic due to soft lockup detection.

kernel/panic.c renamed from home/jbeulich/tmp/linux-2.6.16-rc1/kernel/panic.c +2 -0
diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc1/kernel/panic.c 2.6.16-rc1-panic-softlockup/kernel/panic.c
@@ -107,6 +107,7 @@ NORET_TYPE void panic(const char * fmt, 
 		printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
 		for (i = 0; i < panic_timeout*1000; ) {
 			touch_nmi_watchdog();
+			touch_softlockup_watchdog();
 			i += panic_blink(i);
 			mdelay(1);
 			i++;
@@ -130,6 +131,7 @@ NORET_TYPE void panic(const char * fmt, 
 #endif
 	local_irq_enable();
 	for (i = 0;;) {
+		touch_softlockup_watchdog();
 		i += panic_blink(i);
 		mdelay(1);
 		i++;
#1 lore raw
Quoted 18 lines · Jan Beulich

From: Jan Beulich <[email protected]>

Suppress triggering a nested panic due to soft lockup detection.

diff -Npru /home/jbeulich/tmp/linux-2.6.16-rc1/kernel/panic.c 2.6.16-rc1-panic-softlockup/kernel/panic.c

kernel/panic.c renamed from home/jbeulich/tmp/linux-2.6.16-rc1/kernel/panic.c +1 -0
@@ -107,6 +107,7 @@ NORET_TYPE void panic(const char * fmt, 
 		printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
 		for (i = 0; i < panic_timeout*1000; ) {
 			touch_nmi_watchdog();
+			touch_softlockup_watchdog();
 			i += panic_blink(i);
 			mdelay(1);
 			i++;

kernel/panic.c NORET_TYPE void panic(const char * fmt, · line 137

Quoted 7 lines
kernel/panic.c renamed from home/jbeulich/tmp/linux-2.6.16-rc1/kernel/panic.c +1 -0
@@ -130,6 +131,7 @@ NORET_TYPE void panic(const char * fmt, 
 #endif
 	local_irq_enable();
 	for (i = 0;;) {
+		touch_softlockup_watchdog();
 		i += panic_blink(i);
 		mdelay(1);
 		i++;

I've been wondering for a while why we don't just make touch_nmi_watchdog do an implicit call to touch_softlockup_watchdog. I can't think of a situation where we'd want to do one but not the other, and adding patches like this seems to be an uphill battle (I know at least two other places that need this off the top of my head).

Dave