softlockup changes for v2.6.27
Subsystems (5)
Linus,
Please pull the latest core/softlockup git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core/softlockup
Thanks,
Ingo
------------------>
Arjan van de Ven (1):
softlockup: print a module list on being stuck
Dimitri Sivanich (1):
softlockup: fix softlockup_thresh unaligned access and disable detection at runtime
Ingo Molnar (3):
softlockup: allow panic on lockup
softlockup: fix softlockup_thresh fix
softlockup: fix false positives on nohz if CPU is 100% idle for more than 60 seconds
Jason Wessel (1):
softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
Johannes Weiner (2):
softlockup: fix watchdog task wakeup frequency
softlockup: fix watchdog task wakeup frequency
Vegard Nossum (1):
softlockup: show irqtrace
Documentation/kernel-parameters.txt | 3 ++ include/linux/sched.h | 3 +- kernel/softlockup.c | 45 +++++++++++++++++++++++++++++----- kernel/sysctl.c | 20 ++++++++++++--- kernel/time/tick-sched.c | 4 +- lib/Kconfig.debug | 26 +++++++++++++++++++- 6 files changed, 86 insertions(+), 15 deletions(-)
Documentation/kernel-parameters.txt +3 -0
@@ -2017,6 +2017,9 @@ and is between 256 and 4096 characters. It is defined in the file snd-ymfpci= [HW,ALSA] + softlockup_panic= + [KNL] Should the soft-lockup detector generate panics. + sonypi.*= [HW] Sony Programmable I/O Control Device driver See Documentation/sonypi.txt
include/linux/sched.h +2 -1
@@ -295,10 +295,11 @@ extern void softlockup_tick(void);extern void spawn_softlockup_task (void );extern void touch_softlockup_watchdog (void );extern void touch_all_softlockup_watchdogs (void ); -extern unsigned long softlockup_thresh; +extern unsigned int softlockup_panic;extern unsigned long sysctl_hung_task_check_count;extern unsigned long sysctl_hung_task_timeout_secs;extern unsigned long sysctl_hung_task_warnings; +extern int softlockup_thresh;#else static inline void softlockup_tick (void ) {
kernel/softlockup.c +38 -7
93 lines not on this page · raw message
kernel/sysctl.c +16 -4
@@ -85,12 +85,13 @@ extern int latencytop_enabled;extern int sysctl_nr_open_min, sysctl_nr_open_max;/* Constants used for minimum and maximum */ -#if defined(CONFIG_DETECT_SOFTLOCKUP ) || defined(CONFIG_HIGHMEM ) +#if defined(CONFIG_HIGHMEM ) || defined(CONFIG_DETECT_SOFTLOCKUP )static int one =1 ;#endif #ifdef CONFIG_DETECT_SOFTLOCKUP static int sixty =60 ; +static int neg_one =-1 ;#endif #ifdef CONFIG_MMU
@@ -736,13 +737,24 @@ static struct ctl_table kern_table[] = {#ifdef CONFIG_DETECT_SOFTLOCKUP { .ctl_name = CTL_UNNUMBERED, + .procname = "softlockup_panic", + .data = &softlockup_panic, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_doulongvec_minmax, + .strategy = &sysctl_intvec, + .extra1 = &zero, + .extra2 = &one, + }, + { + .ctl_name = CTL_UNNUMBERED, .procname = "softlockup_thresh", .data = &softlockup_thresh, - .maxlen = sizeof(unsigned long), + .maxlen = sizeof(int), .mode = 0644, - .proc_handler = &proc_doulongvec_minmax, + .proc_handler = &proc_dointvec_minmax, .strategy = &sysctl_intvec, - .extra1 = &one, + .extra1 = &neg_one, .extra2 = &sixty, }, {
kernel/time/tick-sched.c +2 -2
@@ -140,8 +140,6 @@ void tick_nohz_update_jiffies(void)if (!ts->tick_stopped)return ; -touch_softlockup_watchdog (); -cpu_clear (cpu, nohz_cpu_mask); now =ktime_get (); ts->idle_waketime = now;
@@ -149,6 +147,8 @@ void tick_nohz_update_jiffies(void)local_irq_save (flags);tick_do_update_jiffies64 (now);local_irq_restore (flags); + +touch_softlockup_watchdog (); }void tick_nohz_stop_idle (int cpu)
lib/Kconfig.debug +25 -1
@@ -147,7 +147,7 @@ config DETECT_SOFTLOCKUP help Say Y here to enable the kernel to detect "soft lockups", which are bugs that cause the kernel to loop in kernel - mode for more than 10 seconds, without giving other tasks a + mode for more than 60 seconds, without giving other tasks a chance to run. When a soft-lockup is detected, the kernel will print the
@@ -159,6 +159,30 @@ config DETECT_SOFTLOCKUP can be detected via the NMI-watchdog, on platforms that support it.) +config BOOTPARAM_SOFTLOCKUP_PANIC + bool "Panic (Reboot) On Soft Lockups" + depends on DETECT_SOFTLOCKUP + help + Say Y here to enable the kernel to panic on "soft lockups", + which are bugs that cause the kernel to loop in kernel + mode for more than 60 seconds, without giving other tasks a + chance to run. + + The panic can be used in combination with panic_timeout, + to cause the system to reboot automatically after a + lockup has been detected. This feature is useful for + high-availability systems that have uptime guarantees and + where a lockup must be resolved ASAP. + + Say N if unsure. + +config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE + int + depends on DETECT_SOFTLOCKUP + range 0 1 + default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC + default 1 if BOOTPARAM_SOFTLOCKUP_PANIC + config SCHED_DEBUG bool "Collect scheduler debugging info" depends on DEBUG_KERNEL && PROC_FS