[PATCH 5/5] perf, x86: Move NMI clearing to end of PMI handler after the counter registers are reset
From: Andi Kleen
Date: Mon Feb 18 2013 - 13:49:08 EST
From: Andi Kleen <ak@xxxxxxxxxxxxxxx>
This avoids some problems with spurious PMIs on Haswell.
Haswell seems to behave more like P4 in this regard. Do
the same thing as the P4 perf handler by unmasking
the NMI only at the end. Shouldn't make any difference
for earlier family 6 cores.
Tested on Haswell, IvyBridge, Westmere, Saltwell (Atom)
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
arch/x86/kernel/cpu/perf_event_intel.c | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index f4d3377..23e1dcb 100644
@@ -1122,16 +1122,6 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)
cpuc = &__get_cpu_var(cpu_hw_events);
- * Some chipsets need to unmask the LVTPC in a particular spot
- * inside the nmi handler. As a result, the unmasking was pushed
- * into all the nmi handlers.
- * This handler doesn't seem to have any issues with the unmasking
- * so it was left at the top.
- apic_write(APIC_LVTPC, APIC_DM_NMI);
handled = intel_pmu_drain_bts_buffer();
status = intel_pmu_get_status();
@@ -1191,6 +1181,12 @@ again:
+ * Only unmask the NMI after the overflow counters
+ * have been reset. This avoids spurious NMIs on
+ * Haswell CPUs.
+ apic_write(APIC_LVTPC, APIC_DM_NMI);
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/