x86, nmi: new NMI handling routines
Subsystems (8)
v4 cover x86, nmi: new NMI handling routines
I had the pleasure of hosting Robert Richter this week at Red Hat. One of the issues he wanted to talk with me about was having the NMI handling routines execute all the NMI handlers for each NMI mainly for his AMD IBS work. But he also brought up another good point that because of the way NMIs work, it is possible to lose them if multiple NMIs happen at the same time.
As a result, we sat around and discussed how we could go about executing all the nmi handlers for each NMI to ensure that we would not lose any events.
We decided the best way to do this would be to have the NMI handlers break away from the notifier routines and create our own. This would allow us to execute all the handlers without hacking up the notifier stuff and easily track the number of events processed at a higher level to deal with the new problemm of extra NMIs.
I spent some time hacking and came up with this patch. I tested it on my core2quad machine trying to enable all the NMI handler I could, mainly perf and kgdb (and oprofile too when perf was disabled). Everything seems to work correctly. If people are ok with this approach, I'll try and test this on more machines.
More details about the patch are in the individual changelogs.
Don Zickus (6):
x86, nmi: split out nmi from traps.c
x86, nmi: create new NMI handler routines
x86, nmi: wire up NMI handlers to new routines
x86, nmi: add in logic to handle multiple events and unknown NMIs x86, nmi: track NMI usage stats
x86, nmi: print out NMI stats in /proc/interrupts
arch/x86/include/asm/nmi.h | 39 ++-- arch/x86/include/asm/reboot.h | 2 +- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/apic/hw_nmi.c | 27 +-- arch/x86/kernel/apic/x2apic_uv_x.c | 20 +- arch/x86/kernel/cpu/mcheck/mce-inject.c | 20 +- arch/x86/kernel/cpu/mcheck/mce.c | 3 - arch/x86/kernel/cpu/perf_event.c | 60 +---- arch/x86/kernel/crash.c | 5 +- arch/x86/kernel/irq.c | 2 + arch/x86/kernel/kgdb.c | 60 +++- arch/x86/kernel/nmi.c | 473 +++++++++++++++++++++++++++++++ arch/x86/kernel/reboot.c | 23 +- arch/x86/kernel/traps.c | 155 ---------- arch/x86/oprofile/nmi_int.c | 40 +-- arch/x86/oprofile/nmi_timer_int.c | 28 +-- drivers/acpi/apei/ghes.c | 22 +- drivers/char/ipmi/ipmi_watchdog.c | 32 +-- drivers/watchdog/hpwdt.c | 23 +-- 19 files changed, 613 insertions(+), 423 deletions(-) create mode 100644 arch/x86/kernel/nmi.c
Signature · 1 line
1.7.6
PATCH v4 1/6 x86, nmi: split out nmi from traps.c
The nmi stuff is changing a lot and adding more functionality. Split it out from the traps.c file so it doesn't continue to pollute that file.
This makes it easier to find and expand all the future nmi related work.
No real functional changes here.
--- arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/nmi.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/traps.c | 155 ---------------------------------------- 3 files changed, 179 insertions(+), 156 deletions(-) create mode 100644 arch/x86/kernel/nmi.c
arch/x86/kernel/Makefile +1 -1
@@ -19,7 +19,7 @@ endif obj-y := process_$(BITS).o signal.o entry_$(BITS).o obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o -obj-y += time.o ioport.o ldt.o dumpstack.o +obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o obj-y += probe_roms.o
arch/x86/kernel/nmi.c new file +178 -0
178 lines not on this page · raw message
arch/x86/kernel/traps.c +0 -155
167 lines not on this page · raw message
Signature · 1 line
1.7.6
PATCH v4 2/6 x86, nmi: create new NMI handler routines
In reply to Don ZickusThe NMI handlers used to rely on the notifier infrastructure. This worked great until we wanted to support handling multiple events better.
One of the key ideas to the nmi handling is to process _all_ the handlers for each NMI. The reason behind this switch is because NMIs are edge triggered. If enough NMIs are triggered, then they could be lost because the cpu can only latch at most one NMI (besides the one currently being processed).
In order to deal with this we have decided to process all the NMI handlers for each NMI. This allows the handlers to determine if they recieved an event or not (the ones that can not determine this will be left to fend for themselves on the unknown NMI list).
As a result of this change it is now possible to have an extra NMI that was destined to be received for an already processed event. Because the event was processed in the previous NMI, this NMI gets dropped and becomes an 'unknown' NMI. This of course will cause printks that scare people.
However, we prefer to have extra NMIs as opposed to losing NMIs and as such are have developed a basic mechanism to catch most of them. That will be a later patch.
To accomplish this idea, I unhooked the nmi handlers from the notifier routines and created a new mechanism loosely based on doIRQ. The reason for this is the notifier routines have a couple of shortcomings. One we could't guarantee all future NMI handlers used NOTIFY_OK instead of NOTIFY_STOP. Second, we couldn't keep track of the number of events being handled in each routine (most only handle one, perf can handle more than one). Third, I wanted to eventually display which nmi handlers are registered in the system in /proc/interrupts to help see who is generating NMIs.
The patch below just implements the new infrastructure but doesn't wire it up yet (that is the next patch). Its design is based on doIRQ structs and the atomic notifier routines. So the rcu stuff in the patch isn't entirely untested (as the notifier routines have soaked it) but it should be double checked in case I copied the code wrong.
V2:
- use kstrdup to copy/allocate device name
- fix-up _GPL oops
V3:
- fix leak in register_nmi_handler error path
- removed _raw annotations from rcu_dereference
V4:
- handle kstrndup failure
--- arch/x86/include/asm/nmi.h | 19 +++++ arch/x86/kernel/nmi.c | 157 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 0 deletions(-)
arch/x86/include/asm/nmi.h +19 -0
@@ -42,6 +42,25 @@ void arch_trigger_all_cpu_backtrace(void);#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 { +NMI_LOCAL =0 , +NMI_UNKNOWN , +NMI_EXTERNAL , +NMI_MAX +}; + +#define NMI_DONE 0 +#define NMI_HANDLED 1 + +typedef int (*nmi_handler_t )(unsigned int ,struct pt_regs *); + +int register_nmi_handler (unsigned int ,nmi_handler_t ,unsigned long , +const char *); + +void unregister_nmi_handler (unsigned int ,const char *); +void stop_nmi (void );void restart_nmi (void );
arch/x86/kernel/nmi.c +157 -0
175 lines not on this page · raw message
Signature · 1 line
1.7.6
PATCH v4 3/6 x86, nmi: wire up NMI handlers to new routines
In reply to Don ZickusJust 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 (as I couldn't figure out why it was there).
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).
--- arch/x86/include/asm/nmi.h | 20 ---------- arch/x86/include/asm/reboot.h | 2 +- arch/x86/kernel/apic/hw_nmi.c | 27 +++----------- arch/x86/kernel/apic/x2apic_uv_x.c | 20 ++-------- arch/x86/kernel/cpu/mcheck/mce-inject.c | 20 ++++------- arch/x86/kernel/cpu/mcheck/mce.c | 3 -- arch/x86/kernel/cpu/perf_event.c | 60 +++---------------------------- arch/x86/kernel/crash.c | 5 +-- arch/x86/kernel/kgdb.c | 60 +++++++++++++++++++++++-------- arch/x86/kernel/nmi.c | 11 ++++-- arch/x86/kernel/reboot.c | 23 ++++-------- arch/x86/oprofile/nmi_int.c | 40 ++++++-------------- arch/x86/oprofile/nmi_timer_int.c | 28 +++----------- drivers/acpi/apei/ghes.c | 22 ++++------- drivers/char/ipmi/ipmi_watchdog.c | 32 +++++----------- drivers/watchdog/hpwdt.c | 23 +++--------- 16 files changed, 125 insertions(+), 271 deletions(-)
arch/x86/include/asm/nmi.h +0 -20
@@ -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 1enum {
arch/x86/include/asm/reboot.h +1 -1
@@ -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
@@ -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
@@ -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
@@ -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 ; }
arch/x86/kernel/cpu/mcheck/mce.c +0 -3
@@ -908,9 +908,6 @@ void do_machine_check(struct pt_regs *regs, long error_code)percpu_inc (mce_exception_count); -if (notify_die (DIE_NMI ,"machine check" , regs, error_code, -18 ,SIGKILL ) ==NOTIFY_STOP ) - goto out;if (!banks) goto out;
arch/x86/kernel/cpu/perf_event.c +5 -55
80 lines not on this page · raw message
arch/x86/kernel/crash.c +1 -4
@@ -32,15 +32,12 @@ int in_crash_kexec;#if defined(CONFIG_SMP ) && defined(CONFIG_X86_LOCAL_APIC ) -static void kdump_nmi_callback (int cpu,struct die_args *args) +static void kdump_nmi_callback (int cpu,struct pt_regs *regs) { -struct pt_regs *regs;#ifdef CONFIG_X86_32 struct pt_regs fixed_regs;#endif - regs = args->regs; -#ifdef CONFIG_X86_32 if (!user_mode_vm (regs)) {crash_fixup_ss_esp (&fixed_regs, regs);
arch/x86/kernel/kgdb.c +45 -15
97 lines not on this page · raw message
arch/x86/kernel/nmi.c +8 -3
@@ -1,6 +1,7 @@/* * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs +* Copyright (C) 2011 Don Zickus Red Hat, Inc. * * Pentium III FXSR, SSE support * Gareth Hughes <[email protected]>, May 2000
@@ -252,8 +253,10 @@ io_check_error(unsigned char reason, struct pt_regs *regs) static notrace __kprobes voidunknown_nmi_error (unsigned char reason,struct pt_regs *regs) { -if (notify_die (DIE_NMIUNKNOWN ,"nmi" , regs, reason,2 ,SIGINT ) == -NOTIFY_STOP ) +int handled; + + handled =nmi_handle (NMI_UNKNOWN , regs); +if (handled)return ;#ifdef CONFIG_MCA /*
@@ -278,13 +281,15 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs) static notrace __kprobes void default_do_nmi(struct pt_regs *regs) {unsigned char reason =0 ; +int handled;/* * CPU-specific NMI must be processed before non-CPU-specific * NMI, otherwise we may lose it, because the CPU-specific * NMI can not be detected/processed on other CPUs. */ -if (notify_die (DIE_NMI ,"nmi" , regs,0 ,2 ,SIGINT ) ==NOTIFY_STOP ) + handled =nmi_handle (NMI_LOCAL , regs); +if (handled)return ;/* Non-CPU-specific NMI: NMI sources can be processed on any CPU */
arch/x86/kernel/reboot.c +7 -16
@@ -464,7 +464,7 @@ static inline void kb_wait(void) } } -static void vmxoff_nmi (int cpu,struct die_args *args) +static void vmxoff_nmi (int cpu,struct pt_regs *regs) {cpu_emergency_vmxoff (); }
@@ -736,14 +736,10 @@ static nmi_shootdown_cb shootdown_callback;static atomic_t waiting_for_crash_ipi; -static int crash_nmi_callback (struct notifier_block *self, -unsigned long val,void *data) +static int crash_nmi_callback (unsigned int val,struct pt_regs *regs) {int cpu; -if (val !=DIE_NMI ) -return NOTIFY_OK ; - cpu =raw_smp_processor_id ();/* Don't do anything if this handler is invoked on crashing cpu.
@@ -751,10 +747,10 @@ static int crash_nmi_callback(struct notifier_block *self,* an NMI if system was initially booted with nmi_watchdog parameter. */ if (cpu == crashing_cpu) -return NOTIFY_STOP ; +return NMI_HANDLED ;local_irq_disable (); -shootdown_callback (cpu, (struct die_args *)data); +shootdown_callback (cpu, regs);atomic_dec (&waiting_for_crash_ipi);/* Assume hlt works */
@@ -762,7 +758,7 @@ static int crash_nmi_callback(struct notifier_block *self,for (;;)cpu_relax (); -return 1 ; +return NMI_HANDLED ; }static void smp_send_nmi_allbutself (void )
@@ -770,12 +766,6 @@ static void smp_send_nmi_allbutself(void) apic->send_IPI_allbutself (NMI_VECTOR ); } -static struct notifier_block crash_nmi_nb = { - .notifier_call = crash_nmi_callback, -/* we want to be the first one called */ - .priority =NMI_LOCAL_HIGH_PRIOR +1 , -}; -/* Halt all other CPUs, calling the specified function on each of them * * This function can be used to halt all other CPUs on crash
@@ -794,7 +784,8 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback)atomic_set (&waiting_for_crash_ipi,num_online_cpus () -1 );/* Would it be better to replace the trap vector here? */ -if (register_die_notifier (&crash_nmi_nb)) +if (register_nmi_handler (NMI_LOCAL , crash_nmi_callback, +NMI_FLAG_FIRST ,"crash" ))return ;/* return what? */ /* Ensure the new callback function is set before sending * out the NMI
arch/x86/oprofile/nmi_int.c +11 -27
@@ -61,26 +61,15 @@ u64 op_x86_get_ctrl(struct op_x86_model_spec const *model, } -static int profile_exceptions_notify (struct notifier_block *self, -unsigned long val,void *data) +static int profile_exceptions_notify (unsigned int val,struct pt_regs *regs) { -struct die_args *args = (struct die_args *)data; -int ret =NOTIFY_DONE ; - -switch (val) { -case DIE_NMI : -if (ctr_running) - model->check_ctrs (args->regs, &__get_cpu_var (cpu_msrs)); -else if (!nmi_enabled) -break ; -else - model->stop (&__get_cpu_var (cpu_msrs)); - ret =NOTIFY_STOP ; -break ; -default : -break ; - } -return ret; +if (ctr_running) + model->check_ctrs (regs, &__get_cpu_var (cpu_msrs)); +else if (!nmi_enabled) +return NMI_DONE ; +else + model->stop (&__get_cpu_var (cpu_msrs)); +return NMI_HANDLED ; }static void nmi_cpu_save_registers (struct op_msrs *msrs)
@@ -363,12 +352,6 @@ static void nmi_cpu_setup(void *dummy)apic_write (APIC_LVTPC ,APIC_DM_NMI ); } -static struct notifier_block profile_exceptions_nb = { - .notifier_call = profile_exceptions_notify, - .next =NULL , - .priority =NMI_LOCAL_LOW_PRIOR , -}; -static void nmi_cpu_restore_registers (struct op_msrs *msrs) {struct op_msr *counters = msrs->counters;
@@ -508,7 +491,8 @@ static int nmi_setup(void) ctr_running =0 ;/* make variables visible to the nmi handler: */ smp_mb (); - err =register_die_notifier (&profile_exceptions_nb); + err =register_nmi_handler (NMI_LOCAL , profile_exceptions_notify, +0 ,"oprofile" );if (err) goto fail;
@@ -538,7 +522,7 @@ static void nmi_shutdown(void)put_online_cpus ();/* make variables visible to the nmi handler: */ smp_mb (); -unregister_die_notifier (&profile_exceptions_nb); +unregister_nmi_handler (NMI_LOCAL ,"oprofile" ); msrs = &get_cpu_var (cpu_msrs); model->shutdown (msrs);free_msrs ();
arch/x86/oprofile/nmi_timer_int.c +6 -22
@@ -18,32 +18,16 @@#include <asm/apic.h> #include <asm/ptrace.h> -static int profile_timer_exceptions_notify (struct notifier_block *self, -unsigned long val,void *data) +static int profile_timer_exceptions_notify (unsigned int val,struct pt_regs *regs) { -struct die_args *args = (struct die_args *)data; -int ret =NOTIFY_DONE ; - -switch (val) { -case DIE_NMI : -oprofile_add_sample (args->regs,0 ); - ret =NOTIFY_STOP ; -break ; -default : -break ; - } -return ret; +oprofile_add_sample (regs,0 ); +return NMI_HANDLED ; } -static struct notifier_block profile_timer_exceptions_nb = { - .notifier_call = profile_timer_exceptions_notify, - .next =NULL , - .priority =NMI_LOW_PRIOR , -}; -static int timer_start (void ) { -if (register_die_notifier (&profile_timer_exceptions_nb)) +if (register_nmi_handler (NMI_LOCAL , profile_timer_exceptions_notify, +0 ,"oprofile-timer" ))return 1 ;return 0 ; }
@@ -51,7 +35,7 @@ static int timer_start(void)static void timer_stop (void ) { -unregister_die_notifier (&profile_timer_exceptions_nb); +unregister_nmi_handler (NMI_LOCAL ,"oprofile-timer" );synchronize_sched ();/* Allow already-started NMIs to complete. */ }
drivers/acpi/apei/ghes.c +8 -14
@@ -50,6 +50,7 @@#include <acpi/hed.h> #include <asm/mce.h> #include <asm/tlbflush.h> +#include <asm/nmi.h> #include "apei-internal.h"
@@ -749,15 +750,11 @@ static void ghes_proc_in_irq(struct irq_work *irq_work) } } -static int ghes_notify_nmi (struct notifier_block *this, -unsigned long cmd,void *data) +static int ghes_notify_nmi (unsigned int cmd,struct pt_regs *regs) {struct ghes *ghes, *ghes_global =NULL ;int sev, sev_global =-1 ; -int ret =NOTIFY_DONE ; - -if (cmd !=DIE_NMI ) -return ret; +int ret =NMI_DONE ;raw_spin_lock (&ghes_nmi_lock);list_for_each_entry_rcu (ghes, &ghes_nmi, list) {
@@ -770,10 +767,10 @@ static int ghes_notify_nmi(struct notifier_block *this, sev_global = sev; ghes_global = ghes; } - ret =NOTIFY_STOP ; + ret =NMI_HANDLED ; } -if (ret ==NOTIFY_DONE ) +if (ret ==NMI_DONE ) goto out;if (sev_global >=GHES_SEV_PANIC ) {
@@ -825,10 +822,6 @@ static struct notifier_block ghes_notifier_sci = { .notifier_call = ghes_notify_sci, }; -static struct notifier_block ghes_notifier_nmi = { - .notifier_call = ghes_notify_nmi, -}; -static unsigned long ghes_esource_prealloc_size (const struct acpi_hest_generic *generic) {
@@ -918,7 +911,8 @@ static int __devinit ghes_probe(struct platform_device *ghes_dev)ghes_estatus_pool_expand (len);mutex_lock (&ghes_list_mutex);if (list_empty (&ghes_nmi)) -register_die_notifier (&ghes_notifier_nmi); +register_nmi_handler (NMI_LOCAL , ghes_notify_nmi,0 , +"ghes" );list_add_rcu (&ghes->list, &ghes_nmi);mutex_unlock (&ghes_list_mutex);break ;
@@ -964,7 +958,7 @@ static int __devexit ghes_remove(struct platform_device *ghes_dev)mutex_lock (&ghes_list_mutex);list_del_rcu (&ghes->list);if (list_empty (&ghes_nmi)) -unregister_die_notifier (&ghes_notifier_nmi); +unregister_nmi_handler (NMI_LOCAL ,"ghes" );mutex_unlock (&ghes_list_mutex);/* * To synchronize with NMI handler, ghes can only be
drivers/char/ipmi/ipmi_watchdog.c +10 -22
@@ -1077,17 +1077,8 @@ static void ipmi_unregister_watchdog(int ipmi_intf)#ifdef HAVE_DIE_NMI static int -ipmi_nmi (struct notifier_block *self,unsigned long val,void *data) +ipmi_nmi (unsigned int val,struct pt_regs *regs) { -struct die_args *args = data; - -if (val !=DIE_NMIUNKNOWN ) -return NOTIFY_OK ; - -/* Hack, if it's a memory or I/O error, ignore it. */ -if (args->err &0xc0 ) -return NOTIFY_OK ; -/* * If we get here, it's an NMI that's not a memory or I/O * error. We can't truly tell if it's from IPMI or not
@@ -1097,15 +1088,15 @@ ipmi_nmi(struct notifier_block *self, unsigned long val, void *data)if (testing_nmi) { testing_nmi =2 ; -return NOTIFY_STOP ; +return NMI_HANDLED ; }/* If we are not expecting a timeout, ignore it. */ if (ipmi_watchdog_state ==WDOG_TIMEOUT_NONE ) -return NOTIFY_OK ; +return NMI_DONE ;if (preaction_val !=WDOG_PRETIMEOUT_NMI ) -return NOTIFY_OK ; +return NMI_DONE ;/* * If no one else handled the NMI, we assume it was the IPMI
@@ -1120,12 +1111,8 @@ ipmi_nmi(struct notifier_block *self, unsigned long val, void *data) panic(PFX "pre-timeout"); } -return NOTIFY_STOP ; +return NMI_HANDLED ; } - -static struct notifier_block ipmi_nmi_handler = { - .notifier_call = ipmi_nmi -};#endif static int wdog_reboot_handler(struct notifier_block *this,
@@ -1290,7 +1277,8 @@ static void check_parms(void) } }if (do_nmi && !nmi_handler_registered) { - rv =register_die_notifier (&ipmi_nmi_handler); + rv =register_nmi_handler (NMI_UNKNOWN , ipmi_nmi,0 , +"ipmi" );if (rv) { printk(KERN_WARNING PFX "Can't register nmi handler\n");
@@ -1298,7 +1286,7 @@ static void check_parms(void) } else nmi_handler_registered =1 ; }else if (!do_nmi && nmi_handler_registered) { -unregister_die_notifier (&ipmi_nmi_handler); +unregister_nmi_handler (NMI_UNKNOWN ,"ipmi" ); nmi_handler_registered =0 ; }#endif
@@ -1336,7 +1324,7 @@ static int __init ipmi_wdog_init(void)if (rv) {#ifdef HAVE_DIE_NMI if (nmi_handler_registered) -unregister_die_notifier (&ipmi_nmi_handler); +unregister_nmi_handler (NMI_UNKNOWN ,"ipmi" );#endif atomic_notifier_chain_unregister (&panic_notifier_list, &wdog_panic_notifier);
@@ -1357,7 +1345,7 @@ static void __exit ipmi_wdog_exit(void)#ifdef HAVE_DIE_NMI if (nmi_handler_registered) -unregister_die_notifier (&ipmi_nmi_handler); +unregister_nmi_handler (NMI_UNKNOWN ,"ipmi" );#endif atomic_notifier_chain_unregister(&panic_notifier_list,
drivers/watchdog/hpwdt.c +6 -17
@@ -477,15 +477,12 @@ static int hpwdt_time_left(void)/* * NMI Handler */ -static int hpwdt_pretimeout (struct notifier_block *nb,unsigned long ulReason, +static int hpwdt_pretimeout (unsigned int ulReason,struct pt_regs *regs,void *data) {unsigned long rom_pl;static int die_nmi_called; -if (ulReason !=DIE_NMIUNKNOWN ) - goto out; -if (!hpwdt_nmi_decoding) goto out;
@@ -507,7 +504,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, "Management Log for details.\n"); out: - return NOTIFY_OK; + return NMI_DONE; }#endif /* CONFIG_HPWDT_NMI_DECODING */
@@ -647,13 +644,6 @@ static struct miscdevice hpwdt_miscdev = { .fops = &hpwdt_fops, }; -#ifdef CONFIG_HPWDT_NMI_DECODING -static struct notifier_block die_notifier = { - .notifier_call = hpwdt_pretimeout, - .priority =0 , -}; -#endif /* CONFIG_HPWDT_NMI_DECODING */ -/* * Init & Exit */
@@ -739,10 +729,9 @@ static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev)* die notify list to handle a critical NMI. The default is to * be last so other users of the NMI signal can function. */ -if (priority) - die_notifier.priority =0x7FFFFFFF ; - - retval =register_die_notifier (&die_notifier); + retval =register_nmi_handler (NMI_UNKNOWN , hpwdt_pretimeout, + (priority) ?NMI_HANDLE_FIRST :0 , +"hpwdt" );if (retval !=0 ) { dev_warn(&dev->dev, "Unable to register a die notifier (err=%d).\n",
@@ -762,7 +751,7 @@ static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev)static void hpwdt_exit_nmi_decoding (void ) { -unregister_die_notifier (&die_notifier); +unregister_nmi_handler (NMI_UNKNOWN ,"hpwdt" );if (cru_rom_addr)iounmap (cru_rom_addr); }
Signature · 1 line
1.7.6
Re: [V4][PATCH 3/6] x86, nmi: wire up NMI handlers to new routines
Quoted 11 lines · Don Zickus
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(as I couldn't figure out why it was there).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).
Quoted 5 lines
Cc Jason Wessel<[email protected]>Cc Andi Kleen<[email protected]>Cc Robert Richter<[email protected]>Cc Huang Ying<[email protected]>Cc Corey Minyard<[email protected]>
Quoted 916 lines
Cc Jack Steiner<[email protected]>Signed-off-by Don Zickus<[email protected]>--- arch/x86/include/asm/nmi.h | 20 ---------- arch/x86/include/asm/reboot.h | 2 +- arch/x86/kernel/apic/hw_nmi.c | 27 +++----------- arch/x86/kernel/apic/x2apic_uv_x.c | 20 ++-------- arch/x86/kernel/cpu/mcheck/mce-inject.c | 20 ++++------- arch/x86/kernel/cpu/mcheck/mce.c | 3 -- arch/x86/kernel/cpu/perf_event.c | 60 +++---------------------------- arch/x86/kernel/crash.c | 5 +-- arch/x86/kernel/kgdb.c | 60 +++++++++++++++++++++++-------- arch/x86/kernel/nmi.c | 11 ++++-- arch/x86/kernel/reboot.c | 23 ++++-------- arch/x86/oprofile/nmi_int.c | 40 ++++++-------------- arch/x86/oprofile/nmi_timer_int.c | 28 +++----------- drivers/acpi/apei/ghes.c | 22 ++++------- drivers/char/ipmi/ipmi_watchdog.c | 32 +++++----------- drivers/watchdog/hpwdt.c | 23 +++--------- 16 files changed, 125 insertions(+), 271 deletions(-)arch/x86/include/asm/nmi.h +0
-20@@ -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 1enum {arch/x86/include/asm/reboot.h +1
-1@@ -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@@ -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@@ -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@@ -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 ; }arch/x86/kernel/cpu/mcheck/mce.c +0
-3@@ -908,9 +908,6 @@ void do_machine_check(struct pt_regs *regs, long error_code)percpu_inc (mce_exception_count); -if (notify_die (DIE_NMI ,"machine check" , regs, error_code, -18 ,SIGKILL ) ==NOTIFY_STOP ) - goto out;if (!banks) goto out;arch/x86/kernel/cpu/perf_event.c +5
-55@@ -1375,68 +1375,18 @@ struct pmu_nmi_state { static DEFINE_PER_CPU(struct pmu_nmi_state, pmu_nmi);static int __kprobes -perf_event_nmi_handler (struct notifier_block *self, -unsigned long cmd,void *__args) +perf_event_nmi_handler (unsigned int cmd,struct pt_regs *regs) { -struct die_args *args = __args; -unsigned int this_nmi;int handled;if (!atomic_read (&active_events)) -return NOTIFY_DONE ; +return NMI_DONE ; -switch (cmd) { -case DIE_NMI : -break ; -case DIE_NMIUNKNOWN : - this_nmi =percpu_read (irq_stat.__nmi_count); -if (this_nmi !=__this_cpu_read (pmu_nmi.marked)) -/* let the kernel handle the unknown nmi */ -return NOTIFY_DONE ; -/* -* This one is a PMU back-to-back nmi. Two events -* trigger 'simultaneously' raising two back-to-back -* NMIs. If the first NMI handles both, the latter -* will be empty and daze the CPU. So, we drop it to -* avoid false-positive 'unknown nmi' messages. -*/ -return NOTIFY_STOP ; -default : -return NOTIFY_DONE ; - } - - handled = x86_pmu.handle_irq (args->regs); -if (!handled) -return NOTIFY_DONE ; - - this_nmi =percpu_read (irq_stat.__nmi_count); -if ((handled>1 ) || -/* the next nmi could be a back-to-back nmi */ - ((__this_cpu_read (pmu_nmi.marked) == this_nmi)&& - (__this_cpu_read (pmu_nmi.handled)>1 ))) { -/* -* We could have two subsequent back-to-back nmis: The -* first handles more than one counter, the 2nd -* handles only one counter and the 3rd handles no -* counter. -* -* This is the 2nd nmi because the previous was -* handling more than one counter. We will mark the -* next (3rd) and then drop it if unhandled. -*/ -__this_cpu_write (pmu_nmi.marked, this_nmi +1 ); -__this_cpu_write (pmu_nmi.handled, handled); - } + handled = x86_pmu.handle_irq (regs); -return NOTIFY_STOP ; +return handled; } -static __read_mostly struct notifier_block perf_event_nmi_notifier = { - .notifier_call = perf_event_nmi_handler, - .next =NULL , - .priority =NMI_LOCAL_LOW_PRIOR , -}; -static struct event_constraint unconstrained;static struct event_constraint emptyconstraint;@@ -1557,7 +1507,7 @@ static int __init init_hw_perf_events(void) ((1LL << x86_pmu.num_counters_fixed)-1 )<<X86_PMC_IDX_FIXED ;perf_events_lapic_init (); -register_die_notifier (&perf_event_nmi_notifier); +register_nmi_handler (NMI_LOCAL , perf_event_nmi_handler,0 ,"PMI" ); unconstrained = (struct event_constraint ) __EVENT_CONSTRAINT(0, (1ULL<< x86_pmu.num_counters) - 1,arch/x86/kernel/crash.c +1
-4@@ -32,15 +32,12 @@ int in_crash_kexec;#if defined(CONFIG_SMP )&& defined(CONFIG_X86_LOCAL_APIC ) -static void kdump_nmi_callback (int cpu,struct die_args *args) +static void kdump_nmi_callback (int cpu,struct pt_regs *regs) { -struct pt_regs *regs;#ifdef CONFIG_X86_32 struct pt_regs fixed_regs;#endif - regs = args->regs; -#ifdef CONFIG_X86_32 if (!user_mode_vm (regs)) {crash_fixup_ss_esp (&fixed_regs, regs);arch/x86/kernel/kgdb.c +45
-15@@ -511,28 +511,37 @@ single_step_cont(struct pt_regs *regs, struct die_args *args)static int was_in_debug_nmi[NR_CPUS ]; -static int __kgdb_notify (struct die_args *args,unsigned long cmd) +static int kgdb_nmi_handler (unsigned int cmd,struct pt_regs *regs) { -struct pt_regs *regs = args->regs; -switch (cmd) { -case DIE_NMI : +case NMI_LOCAL :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 NMI_HANDLED ; } -return NOTIFY_DONE ; +break ; -case DIE_NMIUNKNOWN : +case NMI_UNKNOWN :if (was_in_debug_nmi[raw_smp_processor_id ()]) { was_in_debug_nmi[raw_smp_processor_id ()] =0 ; -return NOTIFY_STOP ; +return NMI_HANDLED ; } -return NOTIFY_DONE ; +break ; +default : +/* do nothing */ +break ; + } +return NMI_DONE ; +} + +static int __kgdb_notify (struct die_args *args,unsigned long cmd) +{ +struct pt_regs *regs = args->regs; +switch (cmd) {case DIE_DEBUG :if (atomic_read (&kgdb_cpu_doing_single_step) !=-1 ) {if (user_mode (regs))@@ -590,11 +599,6 @@ kgdb_notify(struct notifier_block *self, unsigned long cmd, void *ptr)static struct notifier_block kgdb_notifier = { .notifier_call = kgdb_notify, - -/* -* Lowest-prio notifier priority, we want to be notified last: -*/ - .priority =NMI_LOCAL_LOW_PRIOR , };/** @@ -605,7 +609,31 @@ static struct notifier_block kgdb_notifier = {*/ int kgdb_arch_init (void ) { -return register_die_notifier (&kgdb_notifier); +int retval; + + retval =register_die_notifier (&kgdb_notifier); +if (retval) + goto out; + + retval =register_nmi_handler (NMI_LOCAL , kgdb_nmi_handler, +0 ,"kgdb" ); +if (retval) + goto out1; + + retval =register_nmi_handler (NMI_UNKNOWN , kgdb_nmi_handler, +0 ,"kgdb" ); + +if (retval) + goto out2; + +return retval; + +out2: +unregister_nmi_handler (NMI_LOCAL ,"kgdb" ); +out1: +unregister_die_notifier (&kgdb_notifier); +out: +return retval; } static void kgdb_hw_overflow_handler(struct perf_event *event,@@ -673,6 +701,8 @@ void kgdb_arch_exit(void) breakinfo[i].pev =NULL ; } } +unregister_nmi_handler (NMI_UNKNOWN ,"kgdb" ); +unregister_nmi_handler (NMI_LOCAL ,"kgdb" );unregister_die_notifier (&kgdb_notifier); }arch/x86/kernel/nmi.c +8
-3@@ -1,6 +1,7 @@/* * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs +* Copyright (C) 2011 Don Zickus Red Hat, Inc. * * Pentium III FXSR, SSE support * Gareth Hughes<[email protected]>, May 2000 @@ -252,8 +253,10 @@ io_check_error(unsigned char reason, struct pt_regs *regs) static notrace __kprobes voidunknown_nmi_error (unsigned char reason,struct pt_regs *regs) { -if (notify_die (DIE_NMIUNKNOWN ,"nmi" , regs, reason,2 ,SIGINT ) == -NOTIFY_STOP ) +int handled; + + handled =nmi_handle (NMI_UNKNOWN , regs); +if (handled)return ;#ifdef CONFIG_MCA /* @@ -278,13 +281,15 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs) static notrace __kprobes void default_do_nmi(struct pt_regs *regs) {unsigned char reason =0 ; +int handled;/* * CPU-specific NMI must be processed before non-CPU-specific * NMI, otherwise we may lose it, because the CPU-specific * NMI can not be detected/processed on other CPUs. */ -if (notify_die (DIE_NMI ,"nmi" , regs,0 ,2 ,SIGINT ) ==NOTIFY_STOP ) + handled =nmi_handle (NMI_LOCAL , regs); +if (handled)return ;/* Non-CPU-specific NMI: NMI sources can be processed on any CPU */ arch/x86/kernel/reboot.c +7
-16@@ -464,7 +464,7 @@ static inline void kb_wait(void) } } -static void vmxoff_nmi (int cpu,struct die_args *args) +static void vmxoff_nmi (int cpu,struct pt_regs *regs) {cpu_emergency_vmxoff (); }@@ -736,14 +736,10 @@ static nmi_shootdown_cb shootdown_callback;static atomic_t waiting_for_crash_ipi; -static int crash_nmi_callback (struct notifier_block *self, -unsigned long val,void *data) +static int crash_nmi_callback (unsigned int val,struct pt_regs *regs) {int cpu; -if (val !=DIE_NMI ) -return NOTIFY_OK ; - cpu =raw_smp_processor_id ();/* Don't do anything if this handler is invoked on crashing cpu. @@ -751,10 +747,10 @@ static int crash_nmi_callback(struct notifier_block *self,* an NMI if system was initially booted with nmi_watchdog parameter. */ if (cpu == crashing_cpu) -return NOTIFY_STOP ; +return NMI_HANDLED ;local_irq_disable (); -shootdown_callback (cpu, (struct die_args *)data); +shootdown_callback (cpu, regs);atomic_dec (&waiting_for_crash_ipi);/* Assume hlt works */ @@ -762,7 +758,7 @@ static int crash_nmi_callback(struct notifier_block *self,for (;;)cpu_relax (); -return 1 ; +return NMI_HANDLED ; }static void smp_send_nmi_allbutself (void )@@ -770,12 +766,6 @@ static void smp_send_nmi_allbutself(void) apic->send_IPI_allbutself (NMI_VECTOR ); } -static struct notifier_block crash_nmi_nb = { - .notifier_call = crash_nmi_callback, -/* we want to be the first one called */ - .priority =NMI_LOCAL_HIGH_PRIOR +1 , -}; -/* Halt all other CPUs, calling the specified function on each of them * * This function can be used to halt all other CPUs on crash @@ -794,7 +784,8 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback)atomic_set (&waiting_for_crash_ipi,num_online_cpus () -1 );/* Would it be better to replace the trap vector here? */ -if (register_die_notifier (&crash_nmi_nb)) +if (register_nmi_handler (NMI_LOCAL , crash_nmi_callback, +NMI_FLAG_FIRST ,"crash" ))return ;/* return what? */ /* Ensure the new callback function is set before sending * out the NMI arch/x86/oprofile/nmi_int.c +11
-27@@ -61,26 +61,15 @@ u64 op_x86_get_ctrl(struct op_x86_model_spec const *model, } -static int profile_exceptions_notify (struct notifier_block *self, -unsigned long val,void *data) +static int profile_exceptions_notify (unsigned int val,struct pt_regs *regs) { -struct die_args *args = (struct die_args *)data; -int ret =NOTIFY_DONE ; - -switch (val) { -case DIE_NMI : -if (ctr_running) - model->check_ctrs (args->regs,&__get_cpu_var (cpu_msrs)); -else if (!nmi_enabled) -break ; -else - model->stop (&__get_cpu_var (cpu_msrs)); - ret =NOTIFY_STOP ; -break ; -default : -break ; - } -return ret; +if (ctr_running) + model->check_ctrs (regs,&__get_cpu_var (cpu_msrs)); +else if (!nmi_enabled) +return NMI_DONE ; +else + model->stop (&__get_cpu_var (cpu_msrs)); +return NMI_HANDLED ; }static void nmi_cpu_save_registers (struct op_msrs *msrs)@@ -363,12 +352,6 @@ static void nmi_cpu_setup(void *dummy)apic_write (APIC_LVTPC ,APIC_DM_NMI ); } -static struct notifier_block profile_exceptions_nb = { - .notifier_call = profile_exceptions_notify, - .next =NULL , - .priority =NMI_LOCAL_LOW_PRIOR , -}; -static void nmi_cpu_restore_registers (struct op_msrs *msrs) {struct op_msr *counters = msrs->counters;@@ -508,7 +491,8 @@ static int nmi_setup(void) ctr_running =0 ;/* make variables visible to the nmi handler: */ smp_mb (); - err =register_die_notifier (&profile_exceptions_nb); + err =register_nmi_handler (NMI_LOCAL , profile_exceptions_notify, +0 ,"oprofile" );if (err) goto fail;@@ -538,7 +522,7 @@ static void nmi_shutdown(void)put_online_cpus ();/* make variables visible to the nmi handler: */ smp_mb (); -unregister_die_notifier (&profile_exceptions_nb); +unregister_nmi_handler (NMI_LOCAL ,"oprofile" ); msrs =&get_cpu_var (cpu_msrs); model->shutdown (msrs);free_msrs ();arch/x86/oprofile/nmi_timer_int.c +6
-22@@ -18,32 +18,16 @@#include <asm/apic.h> #include <asm/ptrace.h> -static int profile_timer_exceptions_notify (struct notifier_block *self, -unsigned long val,void *data) +static int profile_timer_exceptions_notify (unsigned int val,struct pt_regs *regs) { -struct die_args *args = (struct die_args *)data; -int ret =NOTIFY_DONE ; - -switch (val) { -case DIE_NMI : -oprofile_add_sample (args->regs,0 ); - ret =NOTIFY_STOP ; -break ; -default : -break ; - } -return ret; +oprofile_add_sample (regs,0 ); +return NMI_HANDLED ; } -static struct notifier_block profile_timer_exceptions_nb = { - .notifier_call = profile_timer_exceptions_notify, - .next =NULL , - .priority =NMI_LOW_PRIOR , -}; -static int timer_start (void ) { -if (register_die_notifier (&profile_timer_exceptions_nb)) +if (register_nmi_handler (NMI_LOCAL , profile_timer_exceptions_notify, +0 ,"oprofile-timer" ))return 1 ;return 0 ; }@@ -51,7 +35,7 @@ static int timer_start(void)static void timer_stop (void ) { -unregister_die_notifier (&profile_timer_exceptions_nb); +unregister_nmi_handler (NMI_LOCAL ,"oprofile-timer" );synchronize_sched ();/* Allow already-started NMIs to complete. */ }drivers/acpi/apei/ghes.c +8
-14@@ -50,6 +50,7 @@#include <acpi/hed.h> #include <asm/mce.h> #include <asm/tlbflush.h> +#include <asm/nmi.h> #include "apei-internal.h" @@ -749,15 +750,11 @@ static void ghes_proc_in_irq(struct irq_work *irq_work) } } -static int ghes_notify_nmi (struct notifier_block *this, -unsigned long cmd,void *data) +static int ghes_notify_nmi (unsigned int cmd,struct pt_regs *regs) {struct ghes *ghes, *ghes_global =NULL ;int sev, sev_global =-1 ; -int ret =NOTIFY_DONE ; - -if (cmd !=DIE_NMI ) -return ret; +int ret =NMI_DONE ;raw_spin_lock (&ghes_nmi_lock);list_for_each_entry_rcu (ghes,&ghes_nmi, list) {@@ -770,10 +767,10 @@ static int ghes_notify_nmi(struct notifier_block *this, sev_global = sev; ghes_global = ghes; } - ret =NOTIFY_STOP ; + ret =NMI_HANDLED ; } -if (ret ==NOTIFY_DONE ) +if (ret ==NMI_DONE ) goto out;if (sev_global>=GHES_SEV_PANIC ) {@@ -825,10 +822,6 @@ static struct notifier_block ghes_notifier_sci = { .notifier_call = ghes_notify_sci, }; -static struct notifier_block ghes_notifier_nmi = { - .notifier_call = ghes_notify_nmi, -}; -static unsigned long ghes_esource_prealloc_size (const struct acpi_hest_generic *generic) {@@ -918,7 +911,8 @@ static int __devinit ghes_probe(struct platform_device *ghes_dev)ghes_estatus_pool_expand (len);mutex_lock (&ghes_list_mutex);if (list_empty (&ghes_nmi)) -register_die_notifier (&ghes_notifier_nmi); +register_nmi_handler (NMI_LOCAL , ghes_notify_nmi,0 , +"ghes" );list_add_rcu (&ghes->list,&ghes_nmi);mutex_unlock (&ghes_list_mutex);break ;@@ -964,7 +958,7 @@ static int __devexit ghes_remove(struct platform_device *ghes_dev)mutex_lock (&ghes_list_mutex);list_del_rcu (&ghes->list);if (list_empty (&ghes_nmi)) -unregister_die_notifier (&ghes_notifier_nmi); +unregister_nmi_handler (NMI_LOCAL ,"ghes" );mutex_unlock (&ghes_list_mutex);/* * To synchronize with NMI handler, ghes can only be drivers/char/ipmi/ipmi_watchdog.c +10
-22@@ -1077,17 +1077,8 @@ static void ipmi_unregister_watchdog(int ipmi_intf)#ifdef HAVE_DIE_NMI static int -ipmi_nmi (struct notifier_block *self,unsigned long val,void *data) +ipmi_nmi (unsigned int val,struct pt_regs *regs) { -struct die_args *args = data; - -if (val !=DIE_NMIUNKNOWN ) -return NOTIFY_OK ; - -/* Hack, if it's a memory or I/O error, ignore it. */ -if (args->err&0xc0 ) -return NOTIFY_OK ; -/* * If we get here, it's an NMI that's not a memory or I/O * error. We can't truly tell if it's from IPMI or not @@ -1097,15 +1088,15 @@ ipmi_nmi(struct notifier_block *self, unsigned long val, void *data)if (testing_nmi) { testing_nmi =2 ; -return NOTIFY_STOP ; +return NMI_HANDLED ; }/* If we are not expecting a timeout, ignore it. */ if (ipmi_watchdog_state ==WDOG_TIMEOUT_NONE ) -return NOTIFY_OK ; +return NMI_DONE ;if (preaction_val !=WDOG_PRETIMEOUT_NMI ) -return NOTIFY_OK ; +return NMI_DONE ;/* * If no one else handled the NMI, we assume it was the IPMI @@ -1120,12 +1111,8 @@ ipmi_nmi(struct notifier_block *self, unsigned long val, void *data) panic(PFX "pre-timeout"); } -return NOTIFY_STOP ; +return NMI_HANDLED ; } - -static struct notifier_block ipmi_nmi_handler = { - .notifier_call = ipmi_nmi -};#endif static int wdog_reboot_handler(struct notifier_block *this,@@ -1290,7 +1277,8 @@ static void check_parms(void) } }if (do_nmi&& !nmi_handler_registered) { - rv =register_die_notifier (&ipmi_nmi_handler); + rv =register_nmi_handler (NMI_UNKNOWN , ipmi_nmi,0 , +"ipmi" );if (rv) { printk(KERN_WARNING PFX "Can't register nmi handler\n");@@ -1298,7 +1286,7 @@ static void check_parms(void) } else nmi_handler_registered =1 ; }else if (!do_nmi&& nmi_handler_registered) { -unregister_die_notifier (&ipmi_nmi_handler); +unregister_nmi_handler (NMI_UNKNOWN ,"ipmi" ); nmi_handler_registered =0 ; }#endif @@ -1336,7 +1324,7 @@ static int __init ipmi_wdog_init(void)if (rv) {#ifdef HAVE_DIE_NMI if (nmi_handler_registered) -unregister_die_notifier (&ipmi_nmi_handler); +unregister_nmi_handler (NMI_UNKNOWN ,"ipmi" );#endif atomic_notifier_chain_unregister (&panic_notifier_list, &wdog_panic_notifier);@@ -1357,7 +1345,7 @@ static void __exit ipmi_wdog_exit(void)#ifdef HAVE_DIE_NMI if (nmi_handler_registered) -unregister_die_notifier (&ipmi_nmi_handler); +unregister_nmi_handler (NMI_UNKNOWN ,"ipmi" );#endif atomic_notifier_chain_unregister(&panic_notifier_list,drivers/watchdog/hpwdt.c +6
-17@@ -477,15 +477,12 @@ static int hpwdt_time_left(void)/* * NMI Handler */ -static int hpwdt_pretimeout (struct notifier_block *nb,unsigned long ulReason, +static int hpwdt_pretimeout (unsigned int ulReason,struct pt_regs *regs,void *data) {unsigned long rom_pl;static int die_nmi_called; -if (ulReason !=DIE_NMIUNKNOWN ) - goto out; -if (!hpwdt_nmi_decoding) goto out;@@ -507,7 +504,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, "Management Log for details.\n"); out: - return NOTIFY_OK; + return NMI_DONE; }#endif /* CONFIG_HPWDT_NMI_DECODING */ @@ -647,13 +644,6 @@ static struct miscdevice hpwdt_miscdev = { .fops =&hpwdt_fops, }; -#ifdef CONFIG_HPWDT_NMI_DECODING -static struct notifier_block die_notifier = { - .notifier_call = hpwdt_pretimeout, - .priority =0 , -}; -#endif /* CONFIG_HPWDT_NMI_DECODING */ -/* * Init& Exit */ @@ -739,10 +729,9 @@ static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev)* die notify list to handle a critical NMI. The default is to * be last so other users of the NMI signal can function. */ -if (priority) - die_notifier.priority =0x7FFFFFFF ; - - retval =register_die_notifier (&die_notifier); + retval =register_nmi_handler (NMI_UNKNOWN , hpwdt_pretimeout, + (priority) ?NMI_HANDLE_FIRST :0 , +"hpwdt" );if (retval !=0 ) { dev_warn(&dev->dev, "Unable to register a die notifier (err=%d).\n",@@ -762,7 +751,7 @@ static int __devinit hpwdt_init_nmi_decoding(struct pci_dev *dev)static void hpwdt_exit_nmi_decoding (void ) { -unregister_die_notifier (&die_notifier); +unregister_nmi_handler (NMI_UNKNOWN ,"hpwdt" );if (cru_rom_addr)iounmap (cru_rom_addr); }
PATCH v4 4/6 x86, nmi: add in logic to handle multiple events and unknown NMIs
In reply to Don ZickusPrevious patches allow the NMI subsystem to process multipe NMI events in one NMI. As previously discussed this can cause issues when an event triggered another NMI but is processed in the current NMI. This causes the next NMI to go unprocessed and become an 'unknown' NMI.
To handle this, we first have to flag whether or not the NMI handler handled more than one event or not. If it did, then there exists a chance that the next NMI might be already processed. Once the NMI is flagged as a candidate to be swallowed, we next look for a back-to-back NMI condition.
This is determined by looking at the %rip from pt_regs. If it is the same as the previous NMI, it is assumed the cpu did not have a chance to jump back into a non-NMI context and execute code and instead handled another NMI.
If both of those conditions are true then we will swallow any unknown NMI.
There still exists a chance that we accidentally swallow a real unknown NMI, but for now things seem better.
V2:
- forgot to add the 'read' code for swallow_nmi (went into next patch)
V3:
- redesigned the algorithm to utilize Avi's idea of detecting a back-to-back NMI with %rip.
better b2b nmi handling
--- arch/x86/kernel/nmi.c | 80 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 75 insertions(+), 5 deletions(-)
arch/x86/kernel/nmi.c +75 -5
@@ -66,7 +66,7 @@ __setup("unknown_nmi_panic", setup_unknown_nmi_panic);#define nmi_to_desc (type) (&nmi_desc[type]) -static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) +static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b) {struct nmi_desc *desc =nmi_to_desc (type);struct nmiaction *next_a, *a, **ap = &desc->head;
@@ -87,6 +87,16 @@ static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) handled += a->handler (type, regs); +/* +* Optimization: only loop once if this is not a +* back-to-back NMI. The idea is nothing is dropped +* on the first NMI, only on the second of a back-to-back +* NMI. No need to waste cycles going through all the +* handlers. +*/ +if (!b2b && handled) +break ; + a = next_a; }rcu_read_unlock ();
@@ -255,7 +265,13 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs) {int handled; - handled =nmi_handle (NMI_UNKNOWN , regs); +/* +* Use 'false' as back-to-back NMIs are dealt with one level up. +* Of course this makes having multiple 'unknown' handlers useless +* as only the first one is ever run (unless it can actually determine +* if it caused the NMI) +*/ + handled =nmi_handle (NMI_UNKNOWN , regs, false);if (handled)return ;#ifdef CONFIG_MCA
@@ -278,19 +294,49 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)pr_emerg ("Dazed and confused, but trying to continue\n" ); } +DEFINE_PER_CPU (bool, swallow_nmi); +DEFINE_PER_CPU(unsigned long, save_rip); + static notrace __kprobes void default_do_nmi(struct pt_regs *regs) {unsigned char reason =0 ;int handled; +bool b2b = false;/* * CPU-specific NMI must be processed before non-CPU-specific * NMI, otherwise we may lose it, because the CPU-specific * NMI can not be detected/processed on other CPUs. */ - handled =nmi_handle (NMI_LOCAL , regs); -if (handled) + +/* +* Back-to-back NMIs are interesting because they can either +* be two NMI or more than two NMIs (any thing over two is dropped +* due to NMI being edge-triggered). If this is the second half +* of the back-to-back NMI, assume we dropped things and process +* more handlers. Otherwise reset the 'swallow' NMI behaviour +*/ +if (regs->ip ==__this_cpu_read (save_rip)) + b2b = true; +else +__this_cpu_write (swallow_nmi, false); + +__this_cpu_write (save_rip, regs->ip); + + handled =nmi_handle (NMI_LOCAL , regs, b2b); +if (handled) { +/* +* There are cases when a NMI handler handles multiple +* events in the current NMI. One of these events may +* be queued for in the next NMI. Because the event is +* already handled, the next NMI will result in an unknown +* NMI. Instead lets flag this for a potential NMI to +* swallow. +*/ +if (handled >1 ) +__this_cpu_write (swallow_nmi, true);return ; + }/* Non-CPU-specific NMI: NMI sources can be processed on any CPU */ raw_spin_lock (&nmi_reason_lock);
@@ -313,7 +359,31 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs) }raw_spin_unlock (&nmi_reason_lock); -unknown_nmi_error (reason, regs); +/* +* Only one NMI can be latched at a time. To handle +* this we may process multiple nmi handlers at once to +* cover the case where an NMI is dropped. The downside +* to this approach is we may process an NMI prematurely, +* while its real NMI is sitting latched. This will cause +* an unknown NMI on the next run of the NMI processing. +* +* We tried to flag that condition above, by setting the +* swallow_nmi flag when we process more than one event. +* This condition is also only present on the second half +* of a back-to-back NMI, so we flag that condition too. +* +* If both are true, we assume we already processed this +* NMI previously and we swallow it. Otherwise we reset +* the logic. +* +* I am sure there are scenarios where we accidentally +* swallow a real 'unknown' NMI. But this is the best +* we can do for now. +*/ +if (b2b &&__this_cpu_read (swallow_nmi)) + ; +else +unknown_nmi_error (reason, regs); } dotraplinkage notrace __kprobes void
Signature · 1 line
1.7.6
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
Quoted 10 lines · Don Zickus
Previous patches allow the NMI subsystem to process multipe NMI events in one NMI. As previously discussed this can cause issues when an event triggered another NMI but is processed in the current NMI. This causes the next NMI to go unprocessed and become an 'unknown' NMI.
To handle this, we first have to flag whether or not the NMI handler handled more than one event or not. If it did, then there exists a chance that the next NMI might be already processed. Once the NMI is flagged as a candidate to be swallowed, we next look for a back-to-back NMI condition.
Quoted 8 lines
This is determined by looking at the %rip from
pt_regs. If it is the same as the previous NMI, it is assumed the cpu did not have a chance to jump back into a non-NMI context and execute code and instead handled another NMI.If both of those conditions are true then we will swallow any unknown NMI.
There still exists a chance that we accidentally swallow a real unknown NMI, but for now things seem better.
Patch looks good, but the changelog is outdated.
arch/x86/kernel/nmi.c unknown_nmi_error(unsigned char reason, struct pt_regs *regs) · line 298
Quoted 6 lines
arch/x86/kernel/nmi.c +2
-0@@ -278,19 +294,49 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)pr_emerg ("Dazed and confused, but trying to continue\n" ); } +DEFINE_PER_CPU (bool, swallow_nmi); +DEFINE_PER_CPU(unsigned long, save_rip);
'static'. Also need a better name for save_rip (suggest last_nmi_rip).
Signature · 2 lines
I have a truly marvellous patch that fixes the bug which this signature is too narrow to contain.
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
Quoted 15 lines · Avi Kivity
Quoted 14 lines · Don Zickus
Previous patches allow the NMI subsystem to process multipe NMI events in one NMI. As previously discussed this can cause issues when an event triggered another NMI but is processed in the current NMI. This causes the next NMI to go unprocessed and become an 'unknown' NMI.
To handle this, we first have to flag whether or not the NMI handler handled more than one event or not. If it did, then there exists a chance that the next NMI might be already processed. Once the NMI is flagged as a candidate to be swallowed, we next look for a back-to-back NMI condition.
This is determined by looking at the %rip from
pt_regs. If it is the same as the previous NMI, it is assumed the cpu did not have a chance to jump back into a non-NMI context and execute code and instead handled another NMI.
Quoted 6 lines
Quoted 4 lines
If both of those conditions are true then we will swallow any unknown NMI.
There still exists a chance that we accidentally swallow a real unknown NMI, but for now things seem better.
Patch looks good, but the changelog is outdated.
Perhaps, but I tried rewriting most of it to reflect the current changes. Was there something obvious in there that I missed? I re-read it a few times and can't figure out what part might be outdated (not that I disagree with you, I just want to update it).
Quoted 9 lines
arch/x86/kernel/nmi.c unknown_nmi_error(unsigned char reason, struct pt_regs *regs) · line 298
Quoted 7 lines
arch/x86/kernel/nmi.c +2
-0@@ -278,19 +294,49 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)pr_emerg ("Dazed and confused, but trying to continue\n" ); } +DEFINE_PER_CPU (bool, swallow_nmi); +DEFINE_PER_CPU(unsigned long, save_rip);'static'. Also need a better name for
save_rip(suggestlast_nmi_rip).
Good suggestion.
Thanks,
Don
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
Quoted 21 lines · Don Zickus
Quoted 20 lines · Avi Kivity
Quoted 18 lines · Don Zickus
Previous patches allow the NMI subsystem to process multipe NMI events in one NMI. As previously discussed this can cause issues when an event triggered another NMI but is processed in the current NMI. This causes the next NMI to go unprocessed and become an 'unknown' NMI.
To handle this, we first have to flag whether or not the NMI handler handled more than one event or not. If it did, then there exists a chance that the next NMI might be already processed. Once the NMI is flagged as a candidate to be swallowed, we next look for a back-to-back NMI condition.
This is determined by looking at the %rip from
pt_regs. If it is the same as the previous NMI, it is assumed the cpu did not have a chance to jump back into a non-NMI context and execute code and instead handled another NMI.If both of those conditions are true then we will swallow any unknown NMI.
There still exists a chance that we accidentally swallow a real unknown NMI, but for now things seem better.
Quoted 7 lines
Quoted 1 line
Patch looks good, but the changelog is outdated.
Perhaps, but I tried rewriting most of it to reflect the current changes. Was there something obvious in there that I missed? I re-read it a few times and can't figure out what part might be outdated (not that I disagree with you, I just want to update it).
It's not really outdated (I guess I misread it). However it emphasises the nmi swallowing part (which I guess was the focus of the first version) and doesn't really talk about doing just one source in ordinary NMIs and processing all sources in second (and third...) back-to-back NMIs. I'd add something about that.
Signature · 1 line
error compiling committee.c: too many arguments to function
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
Quoted 30 lines · Avi Kivity
Quoted 21 lines · Don Zickus
Quoted 20 lines · Avi Kivity
Quoted 18 lines · Don Zickus
Previous patches allow the NMI subsystem to process multipe NMI events in one NMI. As previously discussed this can cause issues when an event triggered another NMI but is processed in the current NMI. This causes the next NMI to go unprocessed and become an 'unknown' NMI.
To handle this, we first have to flag whether or not the NMI handler handled more than one event or not. If it did, then there exists a chance that the next NMI might be already processed. Once the NMI is flagged as a candidate to be swallowed, we next look for a back-to-back NMI condition.
This is determined by looking at the %rip from
pt_regs. If it is the same as the previous NMI, it is assumed the cpu did not have a chance to jump back into a non-NMI context and execute code and instead handled another NMI.If both of those conditions are true then we will swallow any unknown NMI.
There still exists a chance that we accidentally swallow a real unknown NMI, but for now things seem better.
Quoted 7 lines
Quoted 1 line
Patch looks good, but the changelog is outdated.
Perhaps, but I tried rewriting most of it to reflect the current changes. Was there something obvious in there that I missed? I re-read it a few times and can't figure out what part might be outdated (not that I disagree with you, I just want to update it).
Quoted 5 lines
It's not really outdated (I guess I misread it). However it emphasises the nmi swallowing part (which I guess was the focus of the first version) and doesn't really talk about doing just one source in ordinary NMIs and processing all sources in second (and third...) back-to-back NMIs. I'd add something about that.
Ah, yes. I can add that.
Thanks,
Don
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
In reply to Don ZickusQuoted 4 lines · Don Zickus
V3:
- redesigned the algorithm to utilize Avi's idea of detecting a back-to-back NMI with %rip.
Hi Robert,
I realized I added an optimization for executing the nmi handlers to help minimize the impact on the virt folks and realize it might break your IBS stuff.
Quoted 12 lines
arch/x86/kernel/nmi.c +4
-1-static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) +static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b) {struct nmi_desc *desc =nmi_to_desc (type);struct nmiaction *next_a, *a, **ap = &desc->head;@@ -87,6 +87,16 @@ static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) handled += a->handler (type, regs); +/* +* Optimization: only loop once if this is not a +* back-to-back NMI. The idea is nothing is dropped
arch/x86/kernel/nmi.c static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) · line 102
Quoted 10 lines
arch/x86/kernel/nmi.c +7
-0+* on the first NMI, only on the second of a back-to-back +* NMI. No need to waste cycles going through all the +* handlers. +*/ +if (!b2b && handled) +break ; + a = next_a; }rcu_read_unlock ();
The optimization is to run through the handlers until one of them claims the NMI but only for the first NMI. Whereas on the second half of a back-to-back NMI, run through all the handlers regardless of how many claim they handled it.
Does your IBS stuff need to always run through two handlers?
Cheers,
Don
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
Quoted 40 lines · Don Zickus
Quoted 4 lines · Don Zickus
V3:
- redesigned the algorithm to utilize Avi's idea of detecting a back-to-back NMI with %rip.Hi Robert,
I realized I added an optimization for executing the nmi handlers to help minimize the impact on the virt folks and realize it might break your IBS stuff.
Quoted 12 lines
arch/x86/kernel/nmi.c +4
-1-static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) +static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b) {struct nmi_desc *desc =nmi_to_desc (type);struct nmiaction *next_a, *a, **ap = &desc->head;@@ -87,6 +87,16 @@ static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) handled += a->handler (type, regs); +/* +* Optimization: only loop once if this is not a +* back-to-back NMI. The idea is nothing is dropped arch/x86/kernel/nmi.c static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) · line 102
Quoted 10 lines
arch/x86/kernel/nmi.c +7
-0+* on the first NMI, only on the second of a back-to-back +* NMI. No need to waste cycles going through all the +* handlers. +*/ +if (!b2b && handled) +break ; + a = next_a; }rcu_read_unlock ();The optimization is to run through the handlers until one of them claims the NMI but only for the first NMI. Whereas on the second half of a back-to-back NMI, run through all the handlers regardless of how many claim they handled it.
Quoted 1 line
Does your IBS stuff need to always run through two handlers?
As said in my previous answer, it might probably work, but I will test it.
-Robert
Signature · 2 lines
Advanced Micro Devices, Inc. Operating System Research Center
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
In reply to Don ZickusReview static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) · line 98
Quoted 13 lines · Don Zickus
(quoted diff) +9
-0@@ -87,6 +87,16 @@ static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) handled += a->handler(type, regs); + /* + * Optimization: only loop once if this is not a + * back-to-back NMI. The idea is nothing is dropped + * on the first NMI, only on the second of a back-to-back + * NMI. No need to waste cycles going through all the + * handlers. + */ + if (!b2b && handled) + break;
Don, if I am not missing something, this actually does not work because perfctr NMIs do not re-trigger. Suppose a handler running before perfctr. It sets 'handled' and the chain is stopped here. To run through the perfctr handler the NMI must retrigger which it doesn't.
I tested the above with enclosed patch.
The patch handles the nmi and then stops the chain. You see by the PMI count that the perfctr nmi is not handled:
Patch applied:
# echo $(($(grep PMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g')))
0
# echo $(($(grep NMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g')))
0
# perf record -e cpu-cycles bash -c 'perl -e "while(1) {}" & sleep 5 ; kill $!'
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.011 MB perf.data (~472 samples) ]
# echo $(($(grep PMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g')))
128
# echo $(($(grep NMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g')))
1387W/o the patch (tip/perf/core: 51887c8):
# echo $(($(grep NMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g')))
0
# echo $(($(grep PMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g')))
0
# perf record -e cpu-cycles bash -c 'perl -e "while(1) {}" & sleep 5 ; kill $!'
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.194 MB perf.data (~8455 samples) ]
# echo $(($(grep PMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g')))
4918
# echo $(($(grep NMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g')))
4918So we may not jump out the while loop.
-Robert
Quoted 8 lines
(quoted diff) +1
-0+ a = next_a; } rcu_read_unlock();From
b1d68bf037cfa78f073cf71c296057ff422294f2Mon Sep 17 00:00:00 2001
From: Robert Richter <[email protected]>
Date: Wed, 14 Sep 2011 11:44:49 +0200
Subject: [PATCH] perf_nmi_test
--- arch/x86/kernel/cpu/perf_event.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/perf_event.c +45 -0
@@ -31,6 +31,7 @@#include <asm/compat.h> #include <asm/smp.h> #include <asm/alternative.h> +#include <asm/hardirq.h> #if 0 #undef wrmsrl
@@ -43,6 +44,8 @@ do { \ } while (0)#endif +#define irq_stats (x) (&per_cpu(irq_stat, x)) +/* * | NHM/WSM | SNB | * register -------------------------------
@@ -1383,6 +1386,7 @@ perf_event_nmi_handler(struct notifier_block *self,struct die_args *args = __args;unsigned int this_nmi;int handled; +int cpu;if (!atomic_read (&active_events))return NOTIFY_DONE ;
@@ -1408,6 +1412,9 @@ perf_event_nmi_handler(struct notifier_block *self, } handled = x86_pmu.handle_irq (args->regs); + cpu =smp_processor_id (); +trace_printk ("perf: NMI: %d, PMI: %d, handled: %d\n" ,irq_stats (cpu)->__nmi_count, +irq_stats (cpu)->apic_perf_irqs, handled);if (!handled)return NOTIFY_DONE ;
@@ -1961,3 +1968,41 @@ unsigned long perf_misc_flags(struct pt_regs *regs)return misc; } + +static DEFINE_PER_CPU(unsigned long, save_rip); + +static int __kprobes perf_test_nmi_handler (struct notifier_block *self, +unsigned long cmd,void *__args) +{ +struct die_args *args = __args; +bool b2b = false; +int cpu =smp_processor_id (); + +if (cmd !=DIE_NMI ) +return NOTIFY_DONE ; + +if (args->regs->ip ==__this_cpu_read (save_rip)) + b2b = true; + +__this_cpu_write (save_rip, args->regs->ip); + +trace_printk ("skip: NMI: %d, PMI: %d, b2b: %d\n" ,irq_stats (cpu)->__nmi_count, +irq_stats (cpu)->apic_perf_irqs, b2b); + +if (!b2b) +return NOTIFY_STOP ; + +return NOTIFY_DONE ; +} + +static __read_mostly struct notifier_block perf_test_nmi_notifier = { + .notifier_call = perf_test_nmi_handler, + .priority =NMI_LOCAL_HIGH_PRIOR , +}; + +static __init int perf_nmi_test_init (void ) +{ +return register_die_notifier (&perf_test_nmi_notifier); +} + +device_initcall (perf_nmi_test_init);
Signature · 7 lines
1.7.6.1 -- Advanced Micro Devices, Inc. Operating System Research Center
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
Quoted 5 lines · Robert Richter
Quoted 4 lines · Don Zickus
(quoted diff) +0
-0@@ -87,6 +87,16 @@ static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) handled += a->handler(type, regs);
Quoted 15 lines
Review static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) · line 98
Quoted 9 lines
(quoted diff) +9
-0+ /* + * Optimization: only loop once if this is not a + * back-to-back NMI. The idea is nothing is dropped + * on the first NMI, only on the second of a back-to-back + * NMI. No need to waste cycles going through all the + * handlers. + */ + if (!b2b && handled) + break;Don, if I am not missing something, this actually does not work because perfctr NMIs do not re-trigger. Suppose a handler running before perfctr. It sets 'handled' and the chain is stopped here. To run through the perfctr handler the NMI must retrigger which it doesn't.
Your patch is incorrect. Your dummy handler does not handle a _real_ NMI. Which means no _real_ NMI was ever generated. Of course perf won't work. You just swallowed its NMI.
The change I made is for nmi handlers that actually have an NMI associated with them. The idea is if somebody generated an NMI, it will get handled by a handler. If perf comes along and generates another NMI, it should get latched. Upon handling the first NMI, the perf NMI should be sitting queued up and cause the back-to-back NMI. In this case all the handlers will be executed (to handle dropped NMIs).
My only question to you is the IBS stuff you were working on. Does that generate a _real_ NMI or does it just piggy back off of the perf NMI?
Cheers,
Don
Quoted 145 lines
I tested the above with enclosed patch.
The patch handles the nmi and then stops the chain. You see by the PMI count that the perfctr nmi is not handled:
Patch applied:
# echo $(($(grep PMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g'))) 0 # echo $(($(grep NMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g'))) 0 # perf record -e cpu-cycles bash -c 'perl -e "while(1) {}" & sleep 5 ; kill $!' [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.011 MB perf.data (~472 samples) ] # echo $(($(grep PMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g'))) 128 # echo $(($(grep NMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g'))) 1387W/o the patch (tip/perf/core: 51887c8):
# echo $(($(grep NMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g'))) 0 # echo $(($(grep PMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g'))) 0 # perf record -e cpu-cycles bash -c 'perl -e "while(1) {}" & sleep 5 ; kill $!' [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.194 MB perf.data (~8455 samples) ] # echo $(($(grep PMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g'))) 4918 # echo $(($(grep NMI /proc/interrupts | sed -e 's/.*: *//;s/ *Non.*//;s/ */ + /g'))) 4918So we may not jump out the while loop.
-Robert
Review static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) · line 102
Quoted 4 lines
(quoted diff) +1
-0+ a = next_a; } rcu_read_unlock();From
b1d68bf037cfa78f073cf71c296057ff422294f2Mon Sep 17 00:00:00 2001
From: Robert Richter <[email protected]>
Date: Wed, 14 Sep 2011 11:44:49 +0200
Subject: [PATCH]perf_nmi_testSigned-off-by Robert Richter <[email protected]>--- arch/x86/kernel/cpu/perf_event.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-)arch/x86/kernel/cpu/perf_event.c +45
-0@@ -31,6 +31,7 @@#include <asm/compat.h> #include <asm/smp.h> #include <asm/alternative.h> +#include <asm/hardirq.h> #if 0 #undef wrmsrl@@ -43,6 +44,8 @@ do { \ } while (0)#endif +#define irq_stats (x) (&per_cpu(irq_stat, x)) +/* * | NHM/WSM | SNB | * register ------------------------------- @@ -1383,6 +1386,7 @@ perf_event_nmi_handler(struct notifier_block *self,struct die_args *args = __args;unsigned int this_nmi;int handled; +int cpu;if (!atomic_read (&active_events))return NOTIFY_DONE ;@@ -1408,6 +1412,9 @@ perf_event_nmi_handler(struct notifier_block *self, } handled = x86_pmu.handle_irq (args->regs); + cpu =smp_processor_id (); +trace_printk ("perf: NMI: %d, PMI: %d, handled: %d\n" ,irq_stats (cpu)->__nmi_count, +irq_stats (cpu)->apic_perf_irqs, handled);if (!handled)return NOTIFY_DONE ;@@ -1961,3 +1968,41 @@ unsigned long perf_misc_flags(struct pt_regs *regs)return misc; } + +static DEFINE_PER_CPU(unsigned long, save_rip); + +static int __kprobes perf_test_nmi_handler (struct notifier_block *self, +unsigned long cmd,void *__args) +{ +struct die_args *args = __args; +bool b2b = false; +int cpu =smp_processor_id (); + +if (cmd !=DIE_NMI ) +return NOTIFY_DONE ; + +if (args->regs->ip ==__this_cpu_read (save_rip)) + b2b = true; + +__this_cpu_write (save_rip, args->regs->ip); + +trace_printk ("skip: NMI: %d, PMI: %d, b2b: %d\n" ,irq_stats (cpu)->__nmi_count, +irq_stats (cpu)->apic_perf_irqs, b2b); + +if (!b2b) +return NOTIFY_STOP ; + +return NOTIFY_DONE ; +} + +static __read_mostly struct notifier_block perf_test_nmi_notifier = { + .notifier_call = perf_test_nmi_handler, + .priority =NMI_LOCAL_HIGH_PRIOR , +}; + +static __init int perf_nmi_test_init (void ) +{ +return register_die_notifier (&perf_test_nmi_notifier); +} + +device_initcall (perf_nmi_test_init);Signature · 7 lines
1.7.6.1 -- Advanced Micro Devices, Inc. Operating System Research Center
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
Quoted 26 lines · Don Zickus
Quoted 5 lines · Robert Richter
Quoted 4 lines · Don Zickus
(quoted diff) +0
-0@@ -87,6 +87,16 @@ static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) handled += a->handler(type, regs);Quoted 15 lines
Review static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) · line 98
Quoted 9 lines
(quoted diff) +9
-0+ /* + * Optimization: only loop once if this is not a + * back-to-back NMI. The idea is nothing is dropped + * on the first NMI, only on the second of a back-to-back + * NMI. No need to waste cycles going through all the + * handlers. + */ + if (!b2b && handled) + break;Don, if I am not missing something, this actually does not work because perfctr NMIs do not re-trigger. Suppose a handler running before perfctr. It sets 'handled' and the chain is stopped here. To run through the perfctr handler the NMI must retrigger which it doesn't.
Your patch is incorrect. Your dummy handler does not handle a _real_ NMI. Which means no _real_ NMI was ever generated. Of course perf won't work. You just swallowed its NMI.
Quoted 6 lines
The change I made is for nmi handlers that actually have an NMI associated with them. The idea is if somebody generated an NMI, it will get handled by a handler. If perf comes along and generates another NMI, it should get latched. Upon handling the first NMI, the perf NMI should be sitting queued up and cause the back-to-back NMI. In this case all the handlers will be executed (to handle dropped NMIs).
Yes, your thought about the latched NMI could work. Though I better test this with some real nmis from different sources. Unfortunately this is much harder to trigger. Will give it a try. It would be a pretty nice optimization then.
Quoted 2 lines
My only question to you is the IBS stuff you were working on. Does that generate a _real_ NMI or does it just piggy back off of the perf NMI?
Yes, IBS generates real NMIs, there is an own interrupt vector for it.
-Robert
Signature · 2 lines
Advanced Micro Devices, Inc. Operating System Research Center
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
Quoted 27 lines · Robert Richter
Quoted 26 lines · Don Zickus
Quoted 5 lines · Robert Richter
Quoted 4 lines · Don Zickus
(quoted diff) +0
-0@@ -87,6 +87,16 @@ static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) handled += a->handler(type, regs);Quoted 15 lines
Review static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) · line 98
Quoted 9 lines
(quoted diff) +9
-0+ /* + * Optimization: only loop once if this is not a + * back-to-back NMI. The idea is nothing is dropped + * on the first NMI, only on the second of a back-to-back + * NMI. No need to waste cycles going through all the + * handlers. + */ + if (!b2b && handled) + break;Don, if I am not missing something, this actually does not work because perfctr NMIs do not re-trigger. Suppose a handler running before perfctr. It sets 'handled' and the chain is stopped here. To run through the perfctr handler the NMI must retrigger which it doesn't.
Your patch is incorrect. Your dummy handler does not handle a _real_ NMI. Which means no _real_ NMI was ever generated. Of course perf won't work. You just swallowed its NMI.
Quoted 8 lines
Quoted 6 lines
The change I made is for nmi handlers that actually have an NMI associated with them. The idea is if somebody generated an NMI, it will get handled by a handler. If perf comes along and generates another NMI, it should get latched. Upon handling the first NMI, the perf NMI should be sitting queued up and cause the back-to-back NMI. In this case all the handlers will be executed (to handle dropped NMIs).
Yes, your thought about the latched NMI could work. Though I better
I don't think it is a matter of could as I believe this is how x86 is designed if I understand correctly. :-)
Quoted 3 lines
test this with some real nmis from different sources. Unfortunately this is much harder to trigger. Will give it a try. It would be a pretty nice optimization then.
That is why I was generating NMIs using IPIs
apic->send_IPI_mask(cpumask_of(smp_processor_id()), NMI_VECTOR)
Quoted 6 lines
Quoted 3 lines
My only question to you is the IBS stuff you were working on. Does that generate a _real_ NMI or does it just piggy back off of the perf NMI?
Yes, IBS generates real NMIs, there is an own interrupt vector for it.
Ok, good.
Cheers,
Don
Re: [V4][PATCH 4/6] x86, nmi: add in logic to handle multiple events and unknown NMIs
In reply to Robert RichterQuoted 34 lines · Robert Richter
Quoted 26 lines · Don Zickus
Quoted 5 lines · Robert Richter
Quoted 4 lines · Don Zickus
(quoted diff) +0
-0@@ -87,6 +87,16 @@ static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) handled += a->handler(type, regs);Quoted 15 lines
Review static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs) · line 98
Quoted 9 lines
(quoted diff) +9
-0+ /* + * Optimization: only loop once if this is not a + * back-to-back NMI. The idea is nothing is dropped + * on the first NMI, only on the second of a back-to-back + * NMI. No need to waste cycles going through all the + * handlers. + */ + if (!b2b && handled) + break;Don, if I am not missing something, this actually does not work because perfctr NMIs do not re-trigger. Suppose a handler running before perfctr. It sets 'handled' and the chain is stopped here. To run through the perfctr handler the NMI must retrigger which it doesn't.
Your patch is incorrect. Your dummy handler does not handle a _real_ NMI. Which means no _real_ NMI was ever generated. Of course perf won't work. You just swallowed its NMI.
Quoted 6 lines
The change I made is for nmi handlers that actually have an NMI associated with them. The idea is if somebody generated an NMI, it will get handled by a handler. If perf comes along and generates another NMI, it should get latched. Upon handling the first NMI, the perf NMI should be sitting queued up and cause the back-to-back NMI. In this case all the handlers will be executed (to handle dropped NMIs).
Quoted 4 lines
Yes, your thought about the latched NMI could work. Though I better test this with some real nmis from different sources. Unfortunately this is much harder to trigger. Will give it a try. It would be a pretty nice optimization then.
Don,
I did some tests today with parallel IBS and perfctr sessions running. I see cases for all combinations of NMI back-to-back sequences (see below for the traces, the patch and attached log file):
[1] IBS - IBS
[2] IBS - perfctr
[3] perfctr - IBS
[4] perfctr - perfctr
So we see that all cases exists. Unfortunately this is not an evidence that the approach works in *any* case, because we don't see potentially lost entries. This is hard to prove. But I think the can assume it works as expected. I also asked the hw guys for clarification. Will let you know if we must modify the algorithm.
-Robert
Some back-to-back traces:
<...>-2358 [002] 35.807818: perf_ibs_nmi_handler: b2b: seq 335: handled: 1 (#336), last handled: 1 (#335)
<...>-2358 [002] 35.808396: perf_ibs_nmi_handler: b2b: seq 340: handled: 1 (#341), last handled: 1 (#340) [1]
<...>-2358 [002] 35.814160: perf_ibs_nmi_handler: b2b: seq 391: handled: 1 (#392), last handled: 1 (#391)
<...>-2358 [002] 35.818585: perf_ibs_nmi_handler: b2b: seq 430: handled: 1 (#431), last handled: 1 (#430) <...>-2349 [007] 36.026940: perf_ibs_nmi_handler: b2b: seq 2338: handled: 1 (#2339), last handled: 1 (#2338)
<...>-2349 [007] 36.027063: perf_ibs_nmi_handler: b2b: seq 2364: handled: 1 (#2365), last handled: 0 (#2364)
<...>-2349 [007] 36.027064: perf_event_nmi_handler: b2b: seq 168: handled: 0 (#2365), last handled: 1 (#2364)
<...>-2349 [007] 36.027066: perf_ibs_nmi_handler: b2b: seq 2365: handled: 0 (#2366), last handled: 1 (#2365) [2]
<...>-2349 [007] 36.027068: perf_event_nmi_handler: b2b: seq 169: handled: 1 (#2366), last handled: 0 (#2365) [2]
<...>-2349 [007] 36.027183: perf_ibs_nmi_handler: b2b: seq 2389: handled: 0 (#2390), last handled: 0 (#2389)
<...>-2349 [007] 36.027185: perf_event_nmi_handler: b2b: seq 193: handled: 1 (#2390), last handled: 1 (#2389)
<...>-2349 [007] 36.027189: perf_ibs_nmi_handler: b2b: seq 2391: handled: 1 (#2392), last handled: 0 (#2391) [3]
<...>-2349 [007] 36.027191: perf_event_nmi_handler: b2b: seq 195: handled: 0 (#2392), last handled: 1 (#2391) [3]
<...>-2349 [007] 36.027193: perf_ibs_nmi_handler: b2b: seq 2392: handled: 0 (#2393), last handled: 1 (#2392)
<...>-2349 [007] 36.027195: perf_event_nmi_handler: b2b: seq 196: handled: 1 (#2393), last handled: 0 (#2392)
<...>-2349 [007] 36.027206: perf_ibs_nmi_handler: b2b: seq 2395: handled: 0 (#2396), last handled: 0 (#2395)
<...>-2349 [007] 36.027208: perf_event_nmi_handler: b2b: seq 199: handled: 1 (#2396), last handled: 1 (#2395)
<...>-2349 [007] 36.027212: perf_ibs_nmi_handler: b2b: seq 2396: handled: 0 (#2397), last handled: 0 (#2396)
<...>-2349 [007] 36.027215: perf_event_nmi_handler: b2b: seq 200: handled: 1 (#2397), last handled: 1 (#2396)
<...>-2349 [007] 36.027218: perf_ibs_nmi_handler: b2b: seq 2397: handled: 0 (#2398), last handled: 0 (#2397)
<...>-2349 [007] 36.027221: perf_event_nmi_handler: b2b: seq 201: handled: 1 (#2398), last handled: 1 (#2397)
<...>-2349 [007] 36.027224: perf_ibs_nmi_handler: b2b: seq 2398: handled: 0 (#2399), last handled: 0 (#2398)
<...>-2349 [007] 36.027227: perf_event_nmi_handler: b2b: seq 202: handled: 1 (#2399), last handled: 1 (#2398)
<...>-2349 [007] 36.027302: perf_ibs_nmi_handler: b2b: seq 2414: handled: 0 (#2415), last handled: 0 (#2414) <...>-2358 [002] 36.026053: perf_ibs_nmi_handler: b2b: seq 2306: handled: 0 (#2307), last handled: 0 (#2306)
<...>-2358 [002] 36.026056: perf_event_nmi_handler: b2b: seq 115: handled: 1 (#2307), last handled: 1 (#2306)
<...>-2358 [002] 36.026081: perf_ibs_nmi_handler: b2b: seq 2313: handled: 0 (#2314), last handled: 0 (#2313) [4]
<...>-2358 [002] 36.026083: perf_event_nmi_handler: b2b: seq 121: handled: 1 (#2314), last handled: 1 (#2313) [4]
<...>-2358 [002] 36.026115: perf_ibs_nmi_handler: b2b: seq 2320: handled: 0 (#2321), last handled: 0 (#2320)
<...>-2358 [002] 36.026117: perf_event_nmi_handler: b2b: seq 128: handled: 1 (#2321), last handled: 1 (#2320)Quoted 14 lines
Quoted 3 lines
My only question to you is the IBS stuff you were working on. Does that generate a _real_ NMI or does it just piggy back off of the perf NMI?
Yes, IBS generates real NMIs, there is an own interrupt vector for it.
-Robert
Signature · 4 lines
Advanced Micro Devices, Inc. Operating System Research Center From 215f2880d166489892865c3e9e2b46ee157a7e2d Mon Sep 17 00:00:00 2001
From: Robert Richter <[email protected]>
Date: Thu, 15 Sep 2011 11:57:28 +0200
Subject: [PATCH] perf-nmi-test
--- arch/x86/kernel/cpu/perf_event.c | 40 +++++++++++++++++++++++++++--- arch/x86/kernel/cpu/perf_event_amd_ibs.c | 36 ++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/perf_event.c +36 -4
@@ -1376,15 +1376,47 @@ struct pmu_nmi_state { static DEFINE_PER_CPU(struct pmu_nmi_state, pmu_nmi); +#define irq_stats (x) (&per_cpu(irq_stat, x)) + +struct last_nmi { +unsigned long rip; +unsigned int nmi_count; +int handled; +unsigned int seq; +}; + +static DEFINE_PER_CPU(struct last_nmi, last); + +static void check_nmi (struct pt_regs *regs,int handled) +{ +int cpu =smp_processor_id (); +unsigned int nmi_count =irq_stats (cpu)->__nmi_count; + +__this_cpu_inc (last.seq); +if (regs->ip ==__this_cpu_read (last.rip)) { +trace_printk ("b2b: seq %d: handled: %d (#%d), last handled: %d (#%d)\n" , +__this_cpu_read (last.seq), + handled, + nmi_count, +__this_cpu_read (last.handled), +__this_cpu_read (last.nmi_count)); + }else { +__this_cpu_write (last.rip, regs->ip); + } + +__this_cpu_write (last.handled, handled); +__this_cpu_write (last.nmi_count, nmi_count); +} +static int __kprobes perf_event_nmi_handler (unsigned int cmd,struct pt_regs *regs) { -int handled; +int handled =NMI_DONE ; -if (!atomic_read (&active_events)) -return NMI_DONE ; +if (atomic_read (&active_events)) + handled = x86_pmu.handle_irq (regs); - handled = x86_pmu.handle_irq (regs); +check_nmi (regs, handled);return handled; }
arch/x86/kernel/cpu/perf_event_amd_ibs.c +35 -1
@@ -422,6 +422,38 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)return 1 ; } +#define irq_stats (x) (&per_cpu(irq_stat, x)) + +struct last_nmi { +unsigned long rip; +unsigned int nmi_count; +int handled; +unsigned int seq; +}; + +static DEFINE_PER_CPU(struct last_nmi, last); + +static void check_nmi (struct pt_regs *regs,int handled) +{ +int cpu =smp_processor_id (); +unsigned int nmi_count =irq_stats (cpu)->__nmi_count; + +__this_cpu_inc (last.seq); +if (regs->ip ==__this_cpu_read (last.rip)) { +trace_printk ("b2b: seq %d: handled: %d (#%d), last handled: %d (#%d)\n" , +__this_cpu_read (last.seq), + handled, + nmi_count, +__this_cpu_read (last.handled), +__this_cpu_read (last.nmi_count)); + }else { +__this_cpu_write (last.rip, regs->ip); + } + +__this_cpu_write (last.handled, handled); +__this_cpu_write (last.nmi_count, nmi_count); +} +static int __kprobes perf_ibs_nmi_handler (unsigned int cmd,struct pt_regs *regs) {
@@ -433,6 +465,8 @@ perf_ibs_nmi_handler(unsigned int cmd, struct pt_regs *regs)if (handled)inc_irq_stat (apic_perf_irqs); +check_nmi (regs, handled); +return handled; }
@@ -463,7 +497,7 @@ static __init int perf_event_ibs_init(void)perf_ibs_pmu_init (&perf_ibs_fetch,"ibs_fetch" );perf_ibs_pmu_init (&perf_ibs_op,"ibs_op" ); -register_nmi_handler (NMI_LOCAL , &perf_ibs_nmi_handler,0 ,"perf_ibs" ); +register_nmi_handler (NMI_LOCAL , &perf_ibs_nmi_handler,NMI_FLAG_FIRST ,"perf_ibs" );printk (KERN_INFO "perf: AMD IBS detected (0x%08x)\n" , ibs_caps);return 0 ;
Signature · 7 lines
1.7.6.1 -- Advanced Micro Devices, Inc. Operating System Research Center
PATCH v4 5/6 x86, nmi: track NMI usage stats
In reply to Don ZickusNow that the NMI handler are broken into lists, increment the appropriate stats for each list. This allows us to see what is going on when they get printed out in the next patch.
--- arch/x86/kernel/nmi.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-)
arch/x86/kernel/nmi.c +18 -2
@@ -48,6 +48,15 @@ static struct nmi_desc nmi_desc[NMI_MAX] = }; +struct nmi_stats { +unsigned int normal; +unsigned int unknown; +unsigned int external; +unsigned int swallow; +}; + +static DEFINE_PER_CPU(struct nmi_stats, nmi_stats); +static int ignore_nmis;int unknown_nmi_panic;
@@ -272,8 +281,13 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)* if it caused the NMI) */ handled =nmi_handle (NMI_UNKNOWN , regs, false); -if (handled) +if (handled) { +__this_cpu_add (nmi_stats.unknown, handled);return ; + } + +__this_cpu_add (nmi_stats.unknown,1 ); +#ifdef CONFIG_MCA /* * Might actually be able to figure out what the guilty party
@@ -324,6 +338,7 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)__this_cpu_write (save_rip, regs->ip); handled =nmi_handle (NMI_LOCAL , regs, b2b); +__this_cpu_add (nmi_stats.normal, handled);if (handled) {/* * There are cases when a NMI handler handles multiple
@@ -354,6 +369,7 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)*/ reassert_nmi ();#endif +__this_cpu_add (nmi_stats.external,1 );raw_spin_unlock (&nmi_reason_lock);return ; }
@@ -381,7 +397,7 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)* we can do for now. */ if (b2b &&__this_cpu_read (swallow_nmi)) - ; +__this_cpu_add (nmi_stats.swallow,1 );else unknown_nmi_error (reason, regs); }
Signature · 1 line
1.7.6
PATCH v4 6/6 x86, nmi: print out NMI stats in /proc/interrupts
In reply to Don ZickusThis is a cheap hack to add the stats to the middle of /proc/interrupts. It is more of a conversation starter than anything as I am not sure the right letters and place to put this stuff.
The benefit of these stats is a better breakdown of which list the NMIs get handled in either a normal handler, unknown, or external. It also list the number of unknown NMIs swallowed to help check for false positives or not. Another benefit is the ability to actually see which NMI handlers are currently registered in the system.
The output of 'cat /proc/interrupts/ will look like this:
<snip>
58: 275 0 864 0 PCI-MSI-edge eth0 NMI: 4161 4155 158 4194 Non-maskable interrupts SWA: 0 0 0 0 Unknown NMIs swallowed 0: 4161 4155 158 4194 NMI PMI, arch_bt UNK: 0 0 0 0 NMI EXT: 0 0 0 0 NMI LOC: 12653 13304 13974 12926 Local timer interrupts SPU: 0 0 0 0 Spurious interrupts PMI: 6 6 5 6 Performance monitoring interrupts IWI: 0 0 0 0 IRQ work interrupts RES: 1839 1897 1821 1854 Rescheduling interrupts CAL: 524 2714 392 331 Function call interrupts TLB: 217 146 593 576 TLB shootdowns TRM: 0 0 0 0 Thermal event interrupts THR: 0 0 0 0 Threshold APIC interrupts MCE: 0 0 0 0 Machine check exceptions MCP: 1 1 1 1 Machine check polls ERR: 0 MIS: 0
--- arch/x86/include/asm/nmi.h | 2 + arch/x86/kernel/irq.c | 2 + arch/x86/kernel/nmi.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 0 deletions(-)
arch/x86/include/asm/nmi.h +2 -0
@@ -24,6 +24,8 @@ void arch_trigger_all_cpu_backtrace(void);#define NMI_FLAG_FIRST 1 +void arch_show_nmi (struct seq_file *p,int prec); +enum {NMI_LOCAL =0 ,NMI_UNKNOWN ,
arch/x86/kernel/irq.c +2 -0
@@ -16,6 +16,7 @@#include <asm/idle.h> #include <asm/mce.h> #include <asm/hw_irq.h> +#include <asm/nmi.h> atomic_t irq_err_count;
@@ -55,6 +56,7 @@ int arch_show_interrupts(struct seq_file *p, int prec)for_each_online_cpu (j)seq_printf (p,"%10u " ,irq_stats (j)->__nmi_count);seq_printf (p," Non-maskable interrupts\n" ); +arch_show_nmi (p, prec);#ifdef CONFIG_X86_LOCAL_APIC seq_printf (p,"%*s: " , prec,"LOC" );for_each_online_cpu (j)
arch/x86/kernel/nmi.c +47 -0
50 lines not on this page · raw message
Signature · 1 line
1.7.6
Re: [V4][PATCH 6/6] x86, nmi: print out NMI stats in /proc/interrupts
Quoted 9 lines · Don Zickus
This is a cheap hack to add the stats to the middle of
/proc/interrupts. It is more of a conversation starter than anything as I am not sure the right letters and place to put this stuff.The benefit of these stats is a better breakdown of which list the NMIs get handled in either a normal handler, unknown, or external. It also list the number of unknown NMIs swallowed to help check for false positives or not. Another benefit is the ability to actually see which NMI handlers are currently registered in the system.
I wanted to trying modifying this patch to add a /proc/nmi instead. In there I was thinking about putting per-NMI-handler stats. However, I don't know how to dynamically allocate per-cpu memory (basically every time someone registers a handler, allocate a per-cpu chunk to track its stats). Is this overkill? Anyone have any ideas on how to do that?
Cheers,
Don
Quoted 122 lines
The output of 'cat
/proc/interrupts/will look like this:<snip>
58: 275 0 864 0 PCI-MSI-edge eth0 NMI: 4161 4155 158 4194 Non-maskable interrupts SWA: 0 0 0 0 Unknown NMIs swallowed 0: 4161 4155 158 4194 NMI PMI, arch_bt UNK: 0 0 0 0 NMI EXT: 0 0 0 0 NMI LOC: 12653 13304 13974 12926 Local timer interrupts SPU: 0 0 0 0 Spurious interrupts PMI: 6 6 5 6 Performance monitoring interrupts IWI: 0 0 0 0 IRQ work interrupts RES: 1839 1897 1821 1854 Rescheduling interrupts CAL: 524 2714 392 331 Function call interrupts TLB: 217 146 593 576 TLB shootdowns TRM: 0 0 0 0 Thermal event interrupts THR: 0 0 0 0 Threshold APIC interrupts MCE: 0 0 0 0 Machine check exceptions MCP: 1 1 1 1 Machine check polls ERR: 0 MIS: 0Signed-off-by Don Zickus <[email protected]>--- arch/x86/include/asm/nmi.h | 2 + arch/x86/kernel/irq.c | 2 + arch/x86/kernel/nmi.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 0 deletions(-)arch/x86/include/asm/nmi.h +2
-0@@ -24,6 +24,8 @@ void arch_trigger_all_cpu_backtrace(void);#define NMI_FLAG_FIRST 1 +void arch_show_nmi (struct seq_file *p,int prec); +enum {NMI_LOCAL =0 ,NMI_UNKNOWN ,arch/x86/kernel/irq.c +2
-0@@ -16,6 +16,7 @@#include <asm/idle.h> #include <asm/mce.h> #include <asm/hw_irq.h> +#include <asm/nmi.h> atomic_t irq_err_count;@@ -55,6 +56,7 @@ int arch_show_interrupts(struct seq_file *p, int prec)for_each_online_cpu (j)seq_printf (p,"%10u " ,irq_stats (j)->__nmi_count);seq_printf (p," Non-maskable interrupts\n" ); +arch_show_nmi (p, prec);#ifdef CONFIG_X86_LOCAL_APIC seq_printf (p,"%*s: " , prec,"LOC" );for_each_online_cpu (j)arch/x86/kernel/nmi.c +47
-0@@ -424,3 +424,50 @@ void restart_nmi(void) { ignore_nmis--; } + +void arch_show_nmi (struct seq_file *p,int prec) +{ +int j; +struct nmiaction *action; + +seq_printf (p,"%*s: " , prec,"SWA" ); +for_each_online_cpu (j) +seq_printf (p,"%10u " ,per_cpu (nmi_stats.swallow, j)); +seq_printf (p," Unknown NMIs swallowed\n" ); + +seq_printf (p,"%*s: " , prec," 0" ); +for_each_online_cpu (j) +seq_printf (p,"%10u " ,per_cpu (nmi_stats.normal, j)); +seq_printf (p," NMI" ); + action = (nmi_to_desc (NMI_LOCAL ))->head; +if (action) { +seq_printf (p,"\t%s" , action->name); +while ((action = action->next) !=NULL ) +seq_printf (p,", %s" , action->name); + } +seq_putc (p,'\n' ); + +seq_printf (p,"%*s: " , prec,"UNK" ); +for_each_online_cpu (j) +seq_printf (p,"%10u " ,per_cpu (nmi_stats.unknown, j)); +seq_printf (p," NMI" ); + action = (nmi_to_desc (NMI_UNKNOWN ))->head; +if (action) { +seq_printf (p,"\t%s" , action->name); +while ((action = action->next) !=NULL ) +seq_printf (p,", %s" , action->name); + } +seq_putc (p,'\n' ); + +seq_printf (p,"%*s: " , prec,"EXT" ); +for_each_online_cpu (j) +seq_printf (p,"%10u " ,per_cpu (nmi_stats.external, j)); +seq_printf (p," NMI" ); + action = (nmi_to_desc (NMI_EXTERNAL ))->head; +if (action) { +seq_printf (p,"\t%s" , action->name); +while ((action = action->next) !=NULL ) +seq_printf (p,", %s" , action->name); + } +seq_putc (p,'\n' ); +}Signature · 1 line
1.7.6