x86, nmi: Add in logic to handle multiple events and unknown NMIs

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.

An optimization has also been added to the nmi notifier rountine.  Because x86
can latch up to one NMI while currently processing an NMI, we don't have to
worry about executing _all_ the handlers in a standalone NMI.  The idea is
if multiple NMIs come in, the second NMI will represent them.  For those
back-to-back NMI cases, we have the potentail to drop NMIs.  Therefore only
execute all the handlers in the second half of a detected back-to-back NMI.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1317409584-23662-5-git-send-email-dzickus@redhat.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
index 53610957feaf4fa2ac34dd620bfe42b5821f6e30..fd3f9f18cf3f739f8b9f69204829ffb163d81e4b 100644 (file)
--- a/arch/x86/include/asm/nmi.h
+++ b/arch/x86/include/asm/nmi.h
@@ -42,5 +42,6 @@ void unregister_nmi_handler(unsigned int, const char *);
 
 void stop_nmi(void);
 void restart_nmi(void);
+void local_touch_nmi(void);
 
 #endif /* _ASM_X86_NMI_H */

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index e20f5e790599dec3da0ac840a0a7ff49bbacc813..35b39592732b1e63cba88c071d5ed4d2d1a66878 100644 (file)
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -71,7 +71,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 *a;
@@ -85,12 +85,9 @@ static int notrace __kprobes nmi_handle(unsigned int type, struct pt_regs *regs)
         * can be latched at any given time.  Walk the whole list
         * to handle those situations.
         */
-       list_for_each_entry_rcu(a, &desc->head, list) {
-
+       list_for_each_entry_rcu(a, &desc->head, list)
                handled += a->handler(type, regs);
 
-       }
-
        rcu_read_unlock();
 
        /* return total number of NMI events handled */
@@ -104,6 +101,13 @@ static int __setup_nmi(unsigned int type, struct nmiaction *action)
 
        spin_lock_irqsave(&desc->lock, flags);
 
+       /*
+        * most handlers of type NMI_UNKNOWN never return because
+        * they just assume the NMI is theirs.  Just a sanity check
+        * to manage expectations
+        */
+       WARN_ON_ONCE(type == NMI_UNKNOWN && !list_empty(&desc->head));
+
        /*
         * some handlers need to be executed first otherwise a fake
         * event confuses some handlers (kdump uses this flag)
@@ -251,7 +255,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
@@ -274,19 +284,49 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)
        pr_emerg("Dazed and confused, but trying to continue\n");
 }
 
+static DEFINE_PER_CPU(bool, swallow_nmi);
+static DEFINE_PER_CPU(unsigned long, last_nmi_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(last_nmi_rip))
+               b2b = true;
+       else
+               __this_cpu_write(swallow_nmi, false);
+
+       __this_cpu_write(last_nmi_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);
@@ -309,7 +349,40 @@ 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.
+        *
+        * There are scenarios where we may accidentally swallow
+        * a 'real' unknown NMI.  For example, while processing
+        * a perf NMI another perf NMI comes in along with a
+        * 'real' unknown NMI.  These two NMIs get combined into
+        * one (as descibed above).  When the next NMI gets
+        * processed, it will be flagged by perf as handled, but
+        * noone will know that there was a 'real' unknown NMI sent
+        * also.  As a result it gets swallowed.  Or if the first
+        * perf NMI returns two events handled then the second
+        * NMI will get eaten by the logic below, again losing 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
@@ -334,3 +407,9 @@ void restart_nmi(void)
 {
        ignore_nmis--;
 }
+
+/* reset the back-to-back NMI logic */
+void local_touch_nmi(void)
+{
+       __this_cpu_write(last_nmi_rip, 0);
+}

diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 7a3b65107a27cce70ff2b20c03e909c712c32e7e..46ff054ebaaaabb85d935cda95eae0470ef78b50 100644 (file)
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -57,6 +57,7 @@
 #include <asm/idle.h>
 #include <asm/syscalls.h>
 #include <asm/debugreg.h>
+#include <asm/nmi.h>
 
 asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
 
@@ -107,6 +108,7 @@ void cpu_idle(void)
                        if (cpu_is_offline(cpu))
                                play_dead();
 
+                       local_touch_nmi();
                        local_irq_disable();
                        /* Don't trace irqs off for idle */
                        stop_critical_timings();

diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index f693e44e1bf63a303a3e53a00d927721e6602e86..3bd7e6eebf316a33196641eef0940b4d73dde03d 100644 (file)
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -51,6 +51,7 @@
 #include <asm/idle.h>
 #include <asm/syscalls.h>
 #include <asm/debugreg.h>
+#include <asm/nmi.h>
 
 asmlinkage extern void ret_from_fork(void);
 
@@ -133,6 +134,7 @@ void cpu_idle(void)
                         * from here on, until they go to idle.
                         * Otherwise, idle callbacks can misfire.
                         */
+                       local_touch_nmi();
                        local_irq_disable();
                        enter_idle();
                        /* Don't trace irqs off for idle */