Skip to contentSkip to conversation

KGDB: x86: Avoid invoking kgdb_nmicallback twice per NMI

PATCH Jan Kiszka 1 participant 1 message Oct 6, 2008 x86

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

Stress-testing KVM's latest NMI support with kgdbts inside an SMP guest, I came across spurious unhandled NMIs while running the singlestep test. Looking closer at the code path each NMI takes when KGDB is enabled, I noticed that kgdb_nmicallback is called twice per event: One time via DIE_NMI_IPI notification, the second time on DIE_NMI. Removing the first invocation cures the unhandled NMIs here.

---
 arch/x86/kernel/kgdb.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
arch/x86/kernel/kgdb.c +1 -6
Index: b/arch/x86/kernel/kgdb.c
===================================================================
@@ -455,12 +455,7 @@ static int __kgdb_notify(struct die_args
 		return NOTIFY_DONE;
 
 	case DIE_NMI_IPI:
-		if (atomic_read(&kgdb_active) != -1) {
-			/* KGDB CPU roundup */
-			kgdb_nmicallback(raw_smp_processor_id(), regs);
-			was_in_debug_nmi[raw_smp_processor_id()] = 1;
-			touch_nmi_watchdog();
-		}
+		/* Just ignore, we will handle the roundup on DIE_NMI. */
 		return NOTIFY_DONE;
 
 	case DIE_NMIUNKNOWN:
Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux