Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4807e3d5 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf, x86: Fix PEBS 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: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: paulus@samba.org
Cc: eranian@google.com
Cc: robert.richter@amd.com
Cc: fweisbec@gmail.com
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8f4aebd2

arch/x86/kernel/cpu/perf_event_intel_ds.c

+3 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static void intel_pmu_pebs_enable(struct perf_event *event) 
	hwc->config &= ~ARCH_PERFMON_EVENTSEL_INT;



	val |= 1ULL << hwc->idx;

	wrmsrl(MSR_IA32_PEBS_ENABLE, val);

	WARN_ON_ONCE(cpuc->enabled);



	if (x86_pmu.intel_cap.pebs_trap)

		intel_pmu_lbr_enable(event);
@@ -351,6 +351,7 @@ static void intel_pmu_pebs_disable(struct perf_event *event) 
	u64 val = cpuc->pebs_enabled;



	val &= ~(1ULL << hwc->idx);

	if (cpuc->enabled)

		wrmsrl(MSR_IA32_PEBS_ENABLE, val);



	hwc->config |= ARCH_PERFMON_EVENTSEL_INT;