[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4DA70950.3060102@openvz.org>
Date: Thu, 14 Apr 2011 18:48:48 +0400
From: Cyrill Gorcunov <gorcunov@...nvz.org>
To: Ingo Molnar <mingo@...e.hu>
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: [PATCH -tip] perf, x86: fix unknown NMIs on a Pentium4 box
From: Don Zickus <dzickus@...hat.com>
Subject: [PATCH -tip] perf, x86: fix unknown NMIs on a Pentium4 box
When using perf on a Pentium4 box, lots of unknown NMIs would be generated.
This is the result of a P4 quirk that is subtle. The P4 generates an NMI
when the counter overflow and unlike other arches where the NMI is a one time
event, the P4 continues to assert its NMI until clear 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
the P4 mchines.
The fix is trivial, wait until the NMI is properly handled before un-masking
the apic.
Sadly, in the old nmi watchdog there was a note that explained this exact
behaviour.
Cyrill Gorcunov: Added a comment into code itself. We should consider
if we need to unmask LVTPC if no oveflow happened at all.
Ingo Molnar: Pointed out that unmasking unconditionally is proven by time
to be correct.
Signed-off-by: Don Zickus <dzickus@...hat.com>
Tested-by: Shaun Ruffell <sruffell@...ium.com>
Tested-by: Cyrill Gorcunov <gorcunov@...nvz.org>
Acked-by: Cyrill Gorcunov <gorcunov@...nvz.org>
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>
---
Ingo, please make sure I've added conform notes about conditional/uconditional
unmasking in changelog. Don, I've added a comment in code just to not forget why
we need it. Thanks.
arch/x86/kernel/cpu/perf_event.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
Index: linux-2.6.git/arch/x86/kernel/cpu/perf_event.c
=====================================================================
--- linux-2.6.git.orig/arch/x86/kernel/cpu/perf_event.c
+++ linux-2.6.git/arch/x86/kernel/cpu/perf_event.c
@@ -1370,9 +1370,16 @@ perf_event_nmi_handler(struct notifier_b
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;
--
Cyrill
--
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