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

Commit 166d7514 authored by Don Zickus's avatar Don Zickus Committed by Ingo Molnar
Browse files

x86, NMI: Add priorities to handlers 



In order to consolidate the NMI die_chain events, we need to setup the priorities
for the die notifiers.

I started by defining a bunch of common priorities that can be used by the
notifier blocks.  Then I modified the notifier blocks to use the newly created
priorities.

Now that the priorities are straightened out, it should be easier to remove the
event DIE_NMI_IPI.

Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1294348732-15030-4-git-send-email-dzickus@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 673a6092

arch/x86/include/asm/nmi.h

+20 −0
Original line number Diff line number Diff line
@@ -23,6 +23,26 @@ 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 seperate

 * the priorities.  This can go alot 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)



void stop_nmi(void);

void restart_nmi(void);

arch/x86/kernel/apic/hw_nmi.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ arch_trigger_all_cpu_backtrace_handler(struct notifier_block *self, 
static __read_mostly struct notifier_block backtrace_notifier = {

	.notifier_call          = arch_trigger_all_cpu_backtrace_handler,

	.next                   = NULL,

	.priority               = 1

	.priority               = NMI_LOCAL_LOW_PRIOR,

};



static int __init register_trigger_all_cpu_backtrace(void)

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

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int mce_raise_notify(struct notifier_block *self, 


static struct notifier_block mce_raise_nb = {

	.notifier_call = mce_raise_notify,

	.priority = 1000,

	.priority = NMI_LOCAL_NORMAL_PRIOR,

};



/* Inject mce on current CPU */

arch/x86/kernel/cpu/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ perf_event_nmi_handler(struct notifier_block *self, 
static __read_mostly struct notifier_block perf_event_nmi_notifier = {

	.notifier_call		= perf_event_nmi_handler,

	.next			= NULL,

	.priority		= 1

	.priority		= NMI_LOCAL_LOW_PRIOR,

};



static struct event_constraint unconstrained;

arch/x86/kernel/kgdb.c

+2 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <asm/apicdef.h>

#include <asm/system.h>

#include <asm/apic.h>

#include <asm/nmi.h>



struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] =

{
@@ -606,7 +607,7 @@ static struct notifier_block kgdb_notifier = { 
	/*

	 * Lowest-prio notifier priority, we want to be notified last:

	 */

	.priority	= -INT_MAX,

	.priority	= NMI_LOCAL_LOW_PRIOR,

};



/**