[tip:perf/pebs] perf, x86: Fix LBR enable/disable vs cpuc->enabled
in [Kernel]
|
Prev: [PATCH] max730x: Add license macro
Next: [tip:perf/pebs] perf, x86: Don't reset the LBR as frequently
From: tip-bot for Peter Zijlstra on 10 Mar 2010 08:30 Commit-ID: 2df202bf7520eaffcbfb07e45dfa3cfb0aeee2c0 Gitweb: http://git.kernel.org/tip/2df202bf7520eaffcbfb07e45dfa3cfb0aeee2c0 Author: Peter Zijlstra <a.p.zijlstra(a)chello.nl> AuthorDate: Sat, 6 Mar 2010 13:48:54 +0100 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Wed, 10 Mar 2010 13:23:37 +0100 perf, x86: Fix LBR enable/disable vs cpuc->enabled We should never call ->enable with the pmu enabled, and we _can_ have ->disable called with the pmu enabled. Signed-off-by: Peter Zijlstra <a.p.zijlstra(a)chello.nl> Cc: Arnaldo Carvalho de Melo <acme(a)infradead.org> Cc: paulus(a)samba.org Cc: eranian(a)google.com Cc: robert.richter(a)amd.com Cc: fweisbec(a)gmail.com LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event_intel_lbr.c b/arch/x86/kernel/cpu/perf_event_intel_lbr.c index dcec765..0145f99 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c +++ b/arch/x86/kernel/cpu/perf_event_intel_lbr.c @@ -69,7 +69,7 @@ static void intel_pmu_lbr_enable(struct perf_event *event) if (!x86_pmu.lbr_nr) return; - WARN_ON(cpuc->enabled); + WARN_ON_ONCE(cpuc->enabled); /* * Reset the LBR stack if this is the first LBR user or @@ -93,9 +93,10 @@ static void intel_pmu_lbr_disable(struct perf_event *event) return; cpuc->lbr_users--; - BUG_ON(cpuc->lbr_users < 0); - WARN_ON(cpuc->enabled); + + if (cpuc->enabled && !cpuc->lbr_users) + __intel_pmu_lbr_disable(); } static void intel_pmu_lbr_enable_all(void) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |