@@ -516,14 +516,25 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
xmon_owner = cpu;
mb();
if (ncpus > 1) {
+ /*
+ * system resets can be triggered on all CPUs, so
+ * wait for others to come in and avoid the IPI. This
+ * is similar to crash_kexec_secondary()
+ */
+ for (timeout = 100000000; timeout != 0; --timeout) {
+ if (cpumask_weight(&cpus_in_xmon) >= ncpus)
+ goto got_cpus;
+ barrier();
+ }
smp_send_debugger_break();
/* wait for other cpus to come in */
for (timeout = 100000000; timeout != 0; --timeout) {
if (cpumask_weight(&cpus_in_xmon) >= ncpus)
- break;
+ goto got_cpus;
barrier();
}
}
+got_cpus:
remove_bpts();
disable_surveillance();
/* for breakpoint or single step, print the current instr. */
An externally triggered system reset (e.g., via QEMU nmi command, or pseries reset button) can cause system reset interrupts on all CPUs. In case this causes xmon to be entered, it is undesirable for the primary (first) CPU into xmon to trigger an NMI IPI to others, because this may cause a nested system reset interrupt. So spin for a time waiting for secondaries to join xmon before performing the NMI IPI, similarly to what the crash dump code does. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/xmon/xmon.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)