perf, x86: Fix double enable calls
Subsystems (2)
Commit-ID: f3d46b2e6fa57547f9884330798792afc83f4b04 Gitweb: http://git.kernel.org/tip/f3d46b2e6fa57547f9884330798792afc83f4b04 Author: Peter Zijlstra <[email protected]> AuthorDate: Sat, 6 Mar 2010 13:24:58 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 10 Mar 2010 13:22:35 +0100
perf, x86: Fix double enable calls
hw_perf_enable() would enable already enabled events.
This causes problems with code that assumes that ->enable/->disable calls are balanced (like the LBR code does).
What happens is that events that were already running and left in place would get enabled again.
Avoid this by only enabling new events that match their previous assignment.
Signed-off-by Peter Zijlstra <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_event.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/perf_event.c +4 -0
@@ -835,6 +835,10 @@ void hw_perf_enable(void) event = cpuc->event_list[i]; hwc = &event->hw; +if (i < n_running && +match_prev_assignment (hwc, cpuc, i)) +continue ; +if (hwc->idx ==-1 )x86_assign_hw_event (event, cpuc, i);