|
@@ -57,8 +57,10 @@ int __read_mostly watchdog_thresh = 10;
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
int __read_mostly sysctl_softlockup_all_cpu_backtrace;
|
|
|
+int __read_mostly sysctl_hardlockup_all_cpu_backtrace;
|
|
|
#else
|
|
|
#define sysctl_softlockup_all_cpu_backtrace 0
|
|
|
+#define sysctl_hardlockup_all_cpu_backtrace 0
|
|
|
#endif
|
|
|
static struct cpumask watchdog_cpumask __read_mostly;
|
|
|
unsigned long *watchdog_cpumask_bits = cpumask_bits(&watchdog_cpumask);
|
|
@@ -112,6 +114,7 @@ static unsigned long soft_lockup_nmi_warn;
|
|
|
#ifdef CONFIG_HARDLOCKUP_DETECTOR
|
|
|
static int hardlockup_panic =
|
|
|
CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE;
|
|
|
+static unsigned long hardlockup_allcpu_dumped;
|
|
|
/*
|
|
|
* We may not want to enable hard lockup detection by default in all cases,
|
|
|
* for example when running the kernel as a guest on a hypervisor. In these
|
|
@@ -173,6 +176,13 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str)
|
|
|
return 1;
|
|
|
}
|
|
|
__setup("softlockup_all_cpu_backtrace=", softlockup_all_cpu_backtrace_setup);
|
|
|
+static int __init hardlockup_all_cpu_backtrace_setup(char *str)
|
|
|
+{
|
|
|
+ sysctl_hardlockup_all_cpu_backtrace =
|
|
|
+ !!simple_strtol(str, NULL, 0);
|
|
|
+ return 1;
|
|
|
+}
|
|
|
+__setup("hardlockup_all_cpu_backtrace=", hardlockup_all_cpu_backtrace_setup);
|
|
|
#endif
|
|
|
|
|
|
/*
|
|
@@ -318,17 +328,30 @@ static void watchdog_overflow_callback(struct perf_event *event,
|
|
|
*/
|
|
|
if (is_hardlockup()) {
|
|
|
int this_cpu = smp_processor_id();
|
|
|
+ struct pt_regs *regs = get_irq_regs();
|
|
|
|
|
|
/* only print hardlockups once */
|
|
|
if (__this_cpu_read(hard_watchdog_warn) == true)
|
|
|
return;
|
|
|
|
|
|
- if (hardlockup_panic)
|
|
|
- panic("Watchdog detected hard LOCKUP on cpu %d",
|
|
|
- this_cpu);
|
|
|
+ pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu);
|
|
|
+ print_modules();
|
|
|
+ print_irqtrace_events(current);
|
|
|
+ if (regs)
|
|
|
+ show_regs(regs);
|
|
|
else
|
|
|
- WARN(1, "Watchdog detected hard LOCKUP on cpu %d",
|
|
|
- this_cpu);
|
|
|
+ dump_stack();
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Perform all-CPU dump only once to avoid multiple hardlockups
|
|
|
+ * generating interleaving traces
|
|
|
+ */
|
|
|
+ if (sysctl_hardlockup_all_cpu_backtrace &&
|
|
|
+ !test_and_set_bit(0, &hardlockup_allcpu_dumped))
|
|
|
+ trigger_allbutself_cpu_backtrace();
|
|
|
+
|
|
|
+ if (hardlockup_panic)
|
|
|
+ panic("Hard LOCKUP");
|
|
|
|
|
|
__this_cpu_write(hard_watchdog_warn, true);
|
|
|
return;
|