[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-03e22198d2379ffa746c9ea332fbb1f094f9423b@git.kernel.org>
Date: Mon, 4 Oct 2010 20:25:02 GMT
From: tip-bot for Cyrill Gorcunov <gorcunov@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, eranian@...gle.com, hpa@...or.com,
mingo@...hat.com, gorcunov@...nvz.org, gorcunov@...il.com,
robert.richter@....com, ming.m.lin@...el.com, tglx@...utronix.de,
mingo@...e.hu, dzickus@...hat.com
Subject: [tip:perf/urgent] perf, x86: Handle in flight NMIs on P4 platform
Commit-ID: 03e22198d2379ffa746c9ea332fbb1f094f9423b
Gitweb: http://git.kernel.org/tip/03e22198d2379ffa746c9ea332fbb1f094f9423b
Author: Cyrill Gorcunov <gorcunov@...il.com>
AuthorDate: Wed, 29 Sep 2010 23:01:38 -0400
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Thu, 30 Sep 2010 09:17:59 +0200
perf, x86: Handle in flight NMIs on P4 platform
Stephane reported we've forgot to guard the P4 platform
against spurious in-flight performance IRQs. Fix it.
This fixes potential spurious 'dazed and confused' NMI
messages.
Reported-by: Stephane Eranian <eranian@...gle.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@...nvz.org>
Signed-off-by: Don Zickus <dzickus@...hat.com>
Cc: fweisbec@...il.com
Cc: peterz@...radead.org
Cc: Robert Richter <robert.richter@....com>
Cc: Lin Ming <ming.m.lin@...el.com>
LKML-Reference: <1285815698-4298-1-git-send-email-dzickus@...hat.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/cpu/perf_event_p4.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c
index b560db3..2490151 100644
--- a/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/arch/x86/kernel/cpu/perf_event_p4.c
@@ -660,8 +660,12 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)
for (idx = 0; idx < x86_pmu.num_counters; idx++) {
int overflow;
- if (!test_bit(idx, cpuc->active_mask))
+ if (!test_bit(idx, cpuc->active_mask)) {
+ /* catch in-flight IRQs */
+ if (__test_and_clear_bit(idx, cpuc->running))
+ handled++;
continue;
+ }
event = cpuc->events[idx];
hwc = &event->hw;
--
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