Skip to contentSkip to conversation

panic: keep blinking in spite of long spin timer mode

PATCH In review TAMUKI Shoichi 3 participants 4 messages Jun 20, 2010 – Jun 23, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 panic: keep blinking in spite of long spin timer mode

To keep panic_timeout accuracy when running under a hypervisor, the current implementation only spins on long time (1 second) calls to mdelay. That brings a good effect, but the problem is the keyboard LEDs don't blink at all on that situation.

This patch changes to call to panic_blink_enter() between every mdelay and keeps blinking in spite of long spin timer mode.

The time to call to mdelay is now 100ms. Even this change will keep panic_timeout accuracy enough when running under a hypervisor.

---
Changes since v3:
- get rid of CONFIG_PANIC_LONGSPIN_TIMER kernel config option

 Documentation/kernel-parameters.txt |    3 -
 arch/arm/mach-s3c2440/mach-gta02.c  |   17 ++-----
 drivers/input/serio/i8042.c         |   25 ++---------
 include/linux/kernel.h              |    2 
 kernel/panic.c                      |   58 +++++++++++---------------
 5 files changed, 37 insertions(+), 68 deletions(-)
Documentation/kernel-parameters.txt +0 -3
index fa2f098..fd8a873 100644
@@ -911,9 +911,6 @@ and is between 256 and 4096 characters. It is defined in the file
 			     controller
 	i8042.nopnp	[HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
 			     controllers
-	i8042.panicblink=
-			[HW] Frequency with which keyboard LEDs should blink
-			     when kernel panics (default is 0.5 sec)
 	i8042.reset	[HW] Reset the controller during init and cleanup
 	i8042.unlock	[HW] Unlock (ignore) the keylock
 
arch/arm/mach-s3c2440/mach-gta02.c +5 -12
index 9e39faa..deaabe8 100644
@@ -90,24 +90,17 @@
 static struct pcf50633 *gta02_pcf;
 
 /*
- * This gets called every 1ms when we paniced.
+ * This gets called frequently when we paniced.
  */
 
-static long gta02_panic_blink(long count)
+static long gta02_panic_blink(int state)
 {
 	long delay = 0;
-	static long last_blink;
-	static char led;
+	char led;
 
-	/* Fast blink: 200ms period. */
-	if (count - last_blink < 100)
-		return 0;
-
-	led ^= 1;
+	led = (state) ? 1 : 0;
 	gpio_direction_output(GTA02_GPIO_AUX_LED, led);
 
-	last_blink = count;
-
 	return delay;
 }
 
@@ -556,7 +549,7 @@ static void gta02_poweroff(void)
 
 static void __init gta02_machine_init(void)
 {
-	/* Set the panic callback to make AUX LED blink at ~5Hz. */
+	/* Set the panic callback to turn AUX LED on or off. */
 	panic_blink = gta02_panic_blink;
 
 	s3c_pm_init();
drivers/input/serio/i8042.c +5 -20
index 6440a8f..c32d9b3 100644
@@ -61,10 +61,6 @@ static bool i8042_noloop;
 module_param_named(noloop, i8042_noloop, bool, 0);
 MODULE_PARM_DESC(noloop, "Disable the AUX Loopback command while probing for the AUX port");
 
-static unsigned int i8042_blink_frequency = 500;
-module_param_named(panicblink, i8042_blink_frequency, uint, 0600);
-MODULE_PARM_DESC(panicblink, "Frequency with which keyboard LEDs should blink when kernel panics");
-
 #ifdef CONFIG_X86
 static bool i8042_dritek;
 module_param_named(dritek, i8042_dritek, bool, 0);
@@ -1032,8 +1028,8 @@ static void i8042_controller_reset(void)
 
 
 /*
- * i8042_panic_blink() will flash the keyboard LEDs and is called when
- * kernel panics. Flashing LEDs is useful for users running X who may
+ * i8042_panic_blink() will turn the keyboard LEDs on or off and is called
+ * when kernel panics. Flashing LEDs is useful for users running X who may
  * not see the console and will help distingushing panics from "real"
  * lockups.
  *
@@ -1043,22 +1039,12 @@ static void i8042_controller_reset(void)
 
 #define DELAY do { mdelay(1); if (++delay > 10) return delay; } while(0)
 
-static long i8042_panic_blink(long count)
+static long i8042_panic_blink(int state)
 {
 	long delay = 0;
-	static long last_blink;
-	static char led;
-
-	/*
-	 * We expect frequency to be about 1/2s. KDB uses about 1s.
-	 * Make sure they are different.
-	 */
-	if (!i8042_blink_frequency)
-		return 0;
-	if (count - last_blink < i8042_blink_frequency)
-		return 0;
+	char led;
 
-	led ^= 0x01 | 0x04;
+	led = (state) ? 0x01 | 0x04 : 0;
 	while (i8042_read_status() & I8042_STR_IBF)
 		DELAY;
 	dbg("%02x -> i8042 (panic blink)", 0xed);
@@ -1071,7 +1057,6 @@ static long i8042_panic_blink(long count)
 	dbg("%02x -> i8042 (panic blink)", led);
 	i8042_write_data(led);
 	DELAY;
-	last_blink = count;
 	return delay;
 }
 
include/linux/kernel.h +1 -1
index 8317ec4..7d4552a 100644
@@ -172,7 +172,7 @@ static inline void might_fault(void)
 #endif
 
 extern struct atomic_notifier_head panic_notifier_list;
-extern long (*panic_blink)(long time);
+extern long (*panic_blink)(int state);
 NORET_TYPE void panic(const char * fmt, ...)
 	__attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
 extern void oops_enter(void);
kernel/panic.c +26 -32

99 lines not on this page · raw message

#1 lore raw
Quoted 11 lines · On Mon, 21 Jun 2010 07:52:24 +0900 TAMUKI Shoichi <[email protected]> wrote:

To keep panic_timeout accuracy when running under a hypervisor, the current implementation only spins on long time (1 second) calls to mdelay. That brings a good effect, but the problem is the keyboard LEDs don't blink at all on that situation.

This patch changes to call to panic_blink_enter() between every mdelay and keeps blinking in spite of long spin timer mode.

The time to call to mdelay is now 100ms. Even this change will keep panic_timeout accuracy enough when running under a hypervisor.

Thaks for sticking with it - I think the code's a lot better now. Are you happy with it?

Quoted 10 lines

---
Changes since v3:
- get rid of CONFIG_PANIC_LONGSPIN_TIMER kernel config option

 Documentation/kernel-parameters.txt |    3 -
 arch/arm/mach-s3c2440/mach-gta02.c  |   17 ++-----
 drivers/input/serio/i8042.c         |   25 ++---------
 include/linux/kernel.h              |    2 
 kernel/panic.c                      |   58 +++++++++++---------------
 5 files changed, 37 insertions(+), 68 deletions(-)

And isn't that a nice sight.

drivers/input/serio/i8042.c

Quoted 2 lines
drivers/input/serio/i8042.c +0 -0

Dmitry, I think drivers/input/serio/i8042.c is buggy. It does

	panic_blink = NULL;

as the very last thing on module exit. However it surely should do this at least at the _start_ of i8042_exit() and I suspect it really should be doing this at the start of i8042_shutdown()?

As things stand, a well-timed panic will end up trying to flash LEDs via hardware which has been "shut down".

maintainer Acked-by
#2 lore raw
Quoted 36 lines · Andrew Morton
Quoted 11 lines · On Mon, 21 Jun 2010 07:52:24 +0900 TAMUKI Shoichi <[email protected]> wrote:

To keep panic_timeout accuracy when running under a hypervisor, the current implementation only spins on long time (1 second) calls to mdelay. That brings a good effect, but the problem is the keyboard LEDs don't blink at all on that situation.

This patch changes to call to panic_blink_enter() between every mdelay and keeps blinking in spite of long spin timer mode.

The time to call to mdelay is now 100ms. Even this change will keep panic_timeout accuracy enough when running under a hypervisor.

Thaks for sticking with it - I think the code's a lot better now. Are you happy with it?

Quoted 10 lines

---
Changes since v3:
- get rid of CONFIG_PANIC_LONGSPIN_TIMER kernel config option

 Documentation/kernel-parameters.txt |    3 -
 arch/arm/mach-s3c2440/mach-gta02.c  |   17 ++-----
 drivers/input/serio/i8042.c         |   25 ++---------
 include/linux/kernel.h              |    2 
 kernel/panic.c                      |   58 +++++++++++---------------
 5 files changed, 37 insertions(+), 68 deletions(-)

And isn't that a nice sight.

drivers/input/serio/i8042.c

Quoted 2 lines
drivers/input/serio/i8042.c +0 -0

Dmitry, I think drivers/input/serio/i8042.c is buggy. It does

Quoted 9 lines
	panic_blink = NULL;

as the very last thing on module exit. However it surely should do this at least at the _start_ of i8042_exit() and I suspect it really should be doing this at the start of i8042_shutdown()?

As things stand, a well-timed panic will end up trying to flash LEDs via hardware which has been "shut down".

Andrew,

i8042_panic_blink() is designed to work standalone, without any support from the rest of i8042 infrastructure - becase it is called during panic it does not rely on interrupt handlers, locks or anything else so it really does not matter at what point during driver removal we would replace the handler. That said, if we were to move it upward so it is symmetrical with the order in i8042_init() that'd be fine too.

BTW, changes to i8042 looks good, so:

Thanks.

Signature · 1 line
Dmitry
#3 lore raw
In reply to Andrew Morton

Hello,

Quoted 5 lines · On Tue, 22 Jun 2010 13:16:54 -0700 Andrew Morton wrote:
Quoted 5 lines

To keep panic_timeout accuracy when running under a hypervisor, the current implementation only spins on long time (1 second) calls to mdelay. That brings a good effect, but the problem is the keyboard LEDs don't blink at all on that situation.

Quoted 8 lines
Quoted 5 lines

This patch changes to call to panic_blink_enter() between every mdelay and keeps blinking in spite of long spin timer mode.

The time to call to mdelay is now 100ms. Even this change will keep panic_timeout accuracy enough when running under a hypervisor.

Thaks for sticking with it - I think the code's a lot better now. Are you happy with it?

Oh, yes. That's very thoughtful of you.

Regards,
TAMUKI Shoichi