From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
The -rt kernel doesn't panic immediately when NMI lockup detected.
Because the kernel waits show_regs on all cpus, but NMI is not come so
frequently.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
---
arch/x86/kernel/nmi_32.c | 7 +++++++
arch/x86/kernel/nmi_64.c | 8 +++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c
index f55f05b..da9deb3 100644
--- a/arch/x86/kernel/nmi_32.c
+++ b/arch/x86/kernel/nmi_32.c
@@ -428,6 +428,13 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
if (i == cpu)
continue;
nmi_show_regs[i] = 1;
+ }
+
+ smp_send_nmi_allbutself();
+
+ for_each_online_cpu(i) {
+ if (i == cpu)
+ continue;
while (nmi_show_regs[i] == 1)
cpu_relax();
}
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c
index 69cc737..5d3073c 100644
--- a/arch/x86/kernel/nmi_64.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -412,10 +412,16 @@ nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
if (i == cpu)
continue;
nmi_show_regs[i] = 1;
+ }
+
+ smp_send_nmi_allbutself();
+
+ for_each_online_cpu(i) {
+ if (i == cpu)
+ continue;
while (nmi_show_regs[i] == 1)
cpu_relax();
}
-
die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs,
panic_on_timeout);
}
--
1.5.4.1
--
