Commit d3597524 authored by Jason Wessel's avatar Jason Wessel Committed by Ingo Molnar
Browse files

kgdb: fix NMI hangs 



This patch fixes the hang regression with kgdb when the NMI interrupt
comes in while the master core is returning from an exception.

Adjust the NMI logic such that KGDB will not stop NMI exceptions from
occurring by in general returning NOTIFY_DONE.  It is not possible to
distinguish the debug NMI sync vs the normal NMI apic interrupt so
kgdb needs to catch the unknown NMI if it the debugger was previously
active on one of the cpus.

Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c191e5ad

arch/x86/kernel/kgdb.c

+15 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/kgdb.h>

#include <linux/init.h>

#include <linux/smp.h>

#include <linux/nmi.h>



#include <asm/apicdef.h>

#include <asm/system.h>
@@ -290,6 +291,8 @@ single_step_cont(struct pt_regs *regs, struct die_args *args) 
	return NOTIFY_STOP;

}



static int was_in_debug_nmi[NR_CPUS];



static int __kgdb_notify(struct die_args *args, unsigned long cmd)

{

	struct pt_regs *regs = args->regs;
@@ -299,15 +302,24 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd) 
		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();

			return NOTIFY_STOP;

		}

		return NOTIFY_DONE;



	case DIE_NMI_IPI:

		if (atomic_read(&kgdb_active) != -1) {

			/* KGDB CPU roundup: */

			if (kgdb_nmicallback(raw_smp_processor_id(), regs))

			/* KGDB CPU roundup */

			kgdb_nmicallback(raw_smp_processor_id(), regs);

			was_in_debug_nmi[raw_smp_processor_id()] = 1;

			touch_nmi_watchdog();

		}

		return NOTIFY_DONE;



	case DIE_NMIUNKNOWN:

		if (was_in_debug_nmi[raw_smp_processor_id()]) {

			was_in_debug_nmi[raw_smp_processor_id()] = 0;

			return NOTIFY_STOP;

		}

		return NOTIFY_DONE;

arch/x86/kernel/traps_32.c

+2 −0
Original line number Diff line number Diff line
@@ -708,6 +708,8 @@ io_check_error(unsigned char reason, struct pt_regs * regs) 
static __kprobes void

unknown_nmi_error(unsigned char reason, struct pt_regs * regs)

{

	if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP)

		return;

#ifdef CONFIG_MCA

	/* Might actually be able to figure out what the guilty party

	* is. */

arch/x86/kernel/traps_64.c

+2 −0
Original line number Diff line number Diff line
@@ -806,6 +806,8 @@ io_check_error(unsigned char reason, struct pt_regs * regs) 
static __kprobes void

unknown_nmi_error(unsigned char reason, struct pt_regs * regs)

{

	if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP)

		return;

	printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n",

		reason);

	printk(KERN_EMERG "Do you have a strange power saving mode enabled?\n");

include/asm-x86/kdebug.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ enum die_val { 
	DIE_CALL,

	DIE_NMI_IPI,

	DIE_PAGE_FAULT,

	DIE_NMIUNKNOWN,

};



extern void printk_address(unsigned long address, int reliable);

CRA Git | Maintained and supported by SUSTech CRA and CCSE