浏览代码

powerpc/watchdog: Do not panic from locked CPU's IPI handler

The SMP watchdog will detect locked CPUs and IPI them to print a
backtrace and registers. If panic on hard lockup is enabled, do not
panic from this handler, because that can cause recursion into the IPI
layer during the panic.

The caller already panics in this case.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Nicholas Piggin 8 年之前
父节点
当前提交
842dc1dbab
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      arch/powerpc/kernel/watchdog.c

+ 1 - 2
arch/powerpc/kernel/watchdog.c

@@ -97,8 +97,7 @@ static void wd_lockup_ipi(struct pt_regs *regs)
 	else
 	else
 		dump_stack();
 		dump_stack();
 
 
-	if (hardlockup_panic)
-		nmi_panic(regs, "Hard LOCKUP");
+	/* Do not panic from here because that can recurse into NMI IPI layer */
 }
 }
 
 
 static void set_cpumask_stuck(const struct cpumask *cpumask, u64 tb)
 static void set_cpumask_stuck(const struct cpumask *cpumask, u64 tb)