Commit d58fdd9d authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman

powerpc/watchdog: Do not backtrace locked CPUs twice if allcpus backtrace is enabled

If sysctl_hardlockup_all_cpu_backtrace is enabled, there is no need to
IPI stuck CPUs for backtrace before trigger_allbutself_cpu_backtrace(),
which does the same thing again.
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 842dc1db
...@@ -133,15 +133,18 @@ static void watchdog_smp_panic(int cpu, u64 tb) ...@@ -133,15 +133,18 @@ static void watchdog_smp_panic(int cpu, u64 tb)
pr_emerg("Watchdog CPU:%d detected Hard LOCKUP other CPUS:%*pbl\n", pr_emerg("Watchdog CPU:%d detected Hard LOCKUP other CPUS:%*pbl\n",
cpu, cpumask_pr_args(&wd_smp_cpus_pending)); cpu, cpumask_pr_args(&wd_smp_cpus_pending));
/* if (!sysctl_hardlockup_all_cpu_backtrace) {
* Try to trigger the stuck CPUs. /*
*/ * Try to trigger the stuck CPUs, unless we are going to
for_each_cpu(c, &wd_smp_cpus_pending) { * get a backtrace on all of them anyway.
if (c == cpu) */
continue; for_each_cpu(c, &wd_smp_cpus_pending) {
smp_send_nmi_ipi(c, wd_lockup_ipi, 1000000); if (c == cpu)
continue;
smp_send_nmi_ipi(c, wd_lockup_ipi, 1000000);
}
smp_flush_nmi_ipi(1000000);
} }
smp_flush_nmi_ipi(1000000);
/* Take the stuck CPUs out of the watch group */ /* Take the stuck CPUs out of the watch group */
set_cpumask_stuck(&wd_smp_cpus_pending, tb); set_cpumask_stuck(&wd_smp_cpus_pending, tb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment