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

Commit 2df202bf authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

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: 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 4807e3d5

arch/x86/kernel/cpu/perf_event_intel_lbr.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ static void intel_pmu_lbr_enable(struct perf_event *event) 
	if (!x86_pmu.lbr_nr)

	if (!x86_pmu.lbr_nr)

		return;

		return;





	WARN_ON(cpuc->enabled);

	WARN_ON_ONCE(cpuc->enabled);





	/*

	/*

	 * Reset the LBR stack if this is the first LBR user or

	 * 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;

		return;





	cpuc->lbr_users--;

	cpuc->lbr_users--;



	BUG_ON(cpuc->lbr_users < 0);

	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)

static void intel_pmu_lbr_enable_all(void)