Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c48f1c6 authored by Don Zickus's avatar Don Zickus Committed by Ingo Molnar
Browse files

x86, nmi: Wire up NMI handlers to new routines 

Just convert all the files that have an nmi handler to the new routines.
Most of it is straight forward conversion.  A couple of places needed some
tweaking like kgdb which separates the debug notifier from the nmi handler
and mce removes a call to notify_die.

[Thanks to Ying for finding out the history behind that mce call

https://lkml.org/lkml/2010/5/27/114

And Boris responding that he would like to remove that call because of it

https://lkml.org/lkml/2011/9/21/163

]

The things that get converted are the registeration/unregistration routines
and the nmi handler itself has its args changed along with code removal
to check which list it is on (most are on one NMI list except for kgdb
which has both an NMI routine and an NMI Unknown routine).

Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: default avatarCorey Minyard <minyard@acm.org>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Corey Minyard <minyard@acm.org>
Cc: Jack Steiner <steiner@sgi.com>
Link: http://lkml.kernel.org/r/1317409584-23662-4-git-send-email-dzickus@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c9126b2e

arch/x86/include/asm/nmi.h

+0 −20
Original line number Diff line number Diff line
@@ -22,26 +22,6 @@ void arch_trigger_all_cpu_backtrace(void); 
#define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace

#endif



/*

 * Define some priorities for the nmi notifier call chain.

 *

 * Create a local nmi bit that has a higher priority than

 * external nmis, because the local ones are more frequent.

 *

 * Also setup some default high/normal/low settings for

 * subsystems to registers with.  Using 4 bits to separate

 * the priorities.  This can go a lot higher if needed be.

 */



#define NMI_LOCAL_SHIFT		16	/* randomly picked */

#define NMI_LOCAL_BIT		(1ULL << NMI_LOCAL_SHIFT)

#define NMI_HIGH_PRIOR		(1ULL << 8)

#define NMI_NORMAL_PRIOR	(1ULL << 4)

#define NMI_LOW_PRIOR		(1ULL << 0)

#define NMI_LOCAL_HIGH_PRIOR	(NMI_LOCAL_BIT | NMI_HIGH_PRIOR)

#define NMI_LOCAL_NORMAL_PRIOR	(NMI_LOCAL_BIT | NMI_NORMAL_PRIOR)

#define NMI_LOCAL_LOW_PRIOR	(NMI_LOCAL_BIT | NMI_LOW_PRIOR)



#define NMI_FLAG_FIRST	1



enum {

arch/x86/include/asm/reboot.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ void machine_real_restart(unsigned int type); 
#define MRR_BIOS	0

#define MRR_APM		1



typedef void (*nmi_shootdown_cb)(int, struct die_args*);

typedef void (*nmi_shootdown_cb)(int, struct pt_regs*);

void nmi_shootdown_cpus(nmi_shootdown_cb callback);



#endif /* _ASM_X86_REBOOT_H */

arch/x86/kernel/apic/hw_nmi.c

+5 −22
Original line number Diff line number Diff line
@@ -60,22 +60,10 @@ void arch_trigger_all_cpu_backtrace(void) 
}



static int __kprobes

arch_trigger_all_cpu_backtrace_handler(struct notifier_block *self,

			 unsigned long cmd, void *__args)

arch_trigger_all_cpu_backtrace_handler(unsigned int cmd, struct pt_regs *regs)

{

	struct die_args *args = __args;

	struct pt_regs *regs;

	int cpu;



	switch (cmd) {

	case DIE_NMI:

		break;



	default:

		return NOTIFY_DONE;

	}



	regs = args->regs;

	cpu = smp_processor_id();



	if (cpumask_test_cpu(cpu, to_cpumask(backtrace_mask))) {
@@ -86,21 +74,16 @@ arch_trigger_all_cpu_backtrace_handler(struct notifier_block *self, 
		show_regs(regs);

		arch_spin_unlock(&lock);

		cpumask_clear_cpu(cpu, to_cpumask(backtrace_mask));

		return NOTIFY_STOP;

		return NMI_HANDLED;

	}



	return NOTIFY_DONE;

	return NMI_DONE;

}



static __read_mostly struct notifier_block backtrace_notifier = {

	.notifier_call          = arch_trigger_all_cpu_backtrace_handler,

	.next                   = NULL,

	.priority               = NMI_LOCAL_LOW_PRIOR,

};



static int __init register_trigger_all_cpu_backtrace(void)

{

	register_die_notifier(&backtrace_notifier);

	register_nmi_handler(NMI_LOCAL, arch_trigger_all_cpu_backtrace_handler,

				0, "arch_bt");

	return 0;

}

early_initcall(register_trigger_all_cpu_backtrace);

arch/x86/kernel/apic/x2apic_uv_x.c

+4 −16
Original line number Diff line number Diff line
@@ -672,18 +672,11 @@ void __cpuinit uv_cpu_init(void) 
/*

 * When NMI is received, print a stack trace.

 */

int uv_handle_nmi(struct notifier_block *self, unsigned long reason, void *data)

int uv_handle_nmi(unsigned int reason, struct pt_regs *regs)

{

	unsigned long real_uv_nmi;

	int bid;



	if (reason != DIE_NMIUNKNOWN)

		return NOTIFY_OK;



	if (in_crash_kexec)

		/* do nothing if entering the crash kernel */

		return NOTIFY_OK;



	/*

	 * Each blade has an MMR that indicates when an NMI has been sent

	 * to cpus on the blade. If an NMI is detected, atomically
@@ -704,7 +697,7 @@ int uv_handle_nmi(struct notifier_block *self, unsigned long reason, void *data) 
	}



	if (likely(__get_cpu_var(cpu_last_nmi_count) == uv_blade_info[bid].nmi_count))

		return NOTIFY_DONE;

		return NMI_DONE;



	__get_cpu_var(cpu_last_nmi_count) = uv_blade_info[bid].nmi_count;
@@ -717,17 +710,12 @@ int uv_handle_nmi(struct notifier_block *self, unsigned long reason, void *data) 
	dump_stack();

	spin_unlock(&uv_nmi_lock);



	return NOTIFY_STOP;

	return NMI_HANDLED;

}



static struct notifier_block uv_dump_stack_nmi_nb = {

	.notifier_call	= uv_handle_nmi,

	.priority = NMI_LOCAL_LOW_PRIOR - 1,

};



void uv_register_nmi_notifier(void)

{

	if (register_die_notifier(&uv_dump_stack_nmi_nb))

	if (register_nmi_handler(NMI_UNKNOWN, uv_handle_nmi, 0, "uv"))

		printk(KERN_WARNING "UV NMI handler failed to register\n");

}

arch/x86/kernel/cpu/mcheck/mce-inject.c

+7 −13
Original line number Diff line number Diff line
@@ -78,27 +78,20 @@ static void raise_exception(struct mce *m, struct pt_regs *pregs) 


static cpumask_var_t mce_inject_cpumask;



static int mce_raise_notify(struct notifier_block *self,

			    unsigned long val, void *data)

static int mce_raise_notify(unsigned int cmd, struct pt_regs *regs)

{

	struct die_args *args = (struct die_args *)data;

	int cpu = smp_processor_id();

	struct mce *m = &__get_cpu_var(injectm);

	if (val != DIE_NMI || !cpumask_test_cpu(cpu, mce_inject_cpumask))

		return NOTIFY_DONE;

	if (!cpumask_test_cpu(cpu, mce_inject_cpumask))

		return NMI_DONE;

	cpumask_clear_cpu(cpu, mce_inject_cpumask);

	if (m->inject_flags & MCJ_EXCEPTION)

		raise_exception(m, args->regs);

		raise_exception(m, regs);

	else if (m->status)

		raise_poll(m);

	return NOTIFY_STOP;

	return NMI_HANDLED;

}



static struct notifier_block mce_raise_nb = {

	.notifier_call = mce_raise_notify,

	.priority = NMI_LOCAL_NORMAL_PRIOR,

};



/* Inject mce on current CPU */

static int raise_local(void)

{
@@ -216,7 +209,8 @@ static int inject_init(void) 
		return -ENOMEM;

	printk(KERN_INFO "Machine check injector initialized\n");

	mce_chrdev_ops.write = mce_write;

	register_die_notifier(&mce_raise_nb);

	register_nmi_handler(NMI_LOCAL, mce_raise_notify, 0,

				"mce_notify");

	return 0;

}