hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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@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: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2010-03-06 13:48:54 +01:00 committed by Ingo Molnar
parent 4807e3d5dc
commit 2df202bf75
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/kernel/cpu/perf_event_intel_lbr.c
View File

@ -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)