[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110414174420.GA8950@elte.hu>
Date: Thu, 14 Apr 2011 19:44:20 +0200
From: Ingo Molnar <mingo@...e.hu>
To: Cyrill Gorcunov <gorcunov@...nvz.org>
Cc: Lin Ming <ming.m.lin@...el.com>, Don Zickus <dzickus@...hat.com>,
Shaun Ruffell <sruffell@...ium.com>,
Maciej Rutecki <maciej.rutecki@...il.com>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Stephane Eranian <eranian@...gle.com>,
Robert Richter <robert.richter@....com>,
lkml <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH -tip] perf, x86: fix unknown NMIs on a Pentium4 box
below is the commit which needs to be fixed - note that i improved the
changelog, please keep these fixes for future submissions.
Thanks,
Ingo
------------------>
>From 1b6556e28ea29c2e7fe0eb710b100db035278c32 Mon Sep 17 00:00:00 2001
From: Don Zickus <dzickus@...hat.com>
Date: Thu, 14 Apr 2011 18:48:48 +0400
Subject: [PATCH] perf, x86: Fix spurious 'unknown NMI' messages on Pentium4 systems
When using perf on a Pentium4 box, lots of unknown NMIs are
generated. This is the result of a P4 quirk that is subtle. The
P4 generates an NMI when the counter overflows and unlike other
models where the NMI is a one time event, the P4 continues to
assert its NMI until cleared by the OS.
As a side effect to this quirk, the NMI on the apic is masked
off to prevent a stream of NMIs until the overflow flag is
cleared. During the perf re-design, this subtle-ness was
overlooked and the apic was unmasked _before_ the overflow flag
was cleared. As a result, this generated an extra NMI on P4
machines.
The fix is trivial: wait until the NMI is properly handled
before un-masking the apic.
Tested-by: Shaun Ruffell <sruffell@...ium.com>
Signed-off-by: Don Zickus <dzickus@...hat.com>
Cc: Lin Ming <ming.m.lin@...el.com>
Cc: Maciej Rutecki <maciej.rutecki@...il.com>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Robert Richter <robert.richter@....com>
[ Added a comment into code itself as well. ]
Signed-off-by: Cyrill Gorcunov <gorcunov@...nvz.org>
Link: http://lkml.kernel.org/r/4DA70950.3060102@openvz.org
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/cpu/perf_event.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index eed3673a..d3a1902 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1370,9 +1370,16 @@ perf_event_nmi_handler(struct notifier_block *self,
return NOTIFY_DONE;
}
- apic_write(APIC_LVTPC, APIC_DM_NMI);
handled = x86_pmu.handle_irq(args->regs);
+
+ /*
+ * Note the unmasking of LVTPC entry must be
+ * done *after* counter oveflow flag is cleared
+ * otherwise it might lead to double NMIs generation.
+ */
+ apic_write(APIC_LVTPC, APIC_DM_NMI);
+
if (!handled)
return NOTIFY_DONE;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists