perf, x86: Deal with multiple state bits for pebs-fmt1
Subsystems (2)
Commit-ID: 12ab854d744f04bfc5c6c4db723b7e31fc03eb29 Gitweb: http://git.kernel.org/tip/12ab854d744f04bfc5c6c4db723b7e31fc03eb29 Author: Peter Zijlstra <[email protected]> AuthorDate: Sat, 6 Mar 2010 18:57:38 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 10 Mar 2010 13:23:38 +0100
perf, x86: Deal with multiple state bits for pebs-fmt1
Its unclear if the PEBS state record will have only a single bit set, in case it does not and accumulates bits, deal with that by only processing each event once.
Also, robustify some of the code.
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_intel_ds.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_ds.c +13 -3
@@ -538,6 +538,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)struct perf_event *event =NULL ;struct perf_raw_record raw;struct pt_regs regs; +u64 status =0 ;int bit, n;if (!ds || !x86_pmu.pebs)
@@ -561,13 +562,22 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)for ( ; at < top; at++) {for_each_bit (bit, (unsigned long *)&at->status,MAX_PEBS_EVENTS ) { -if (!cpuc->events[bit]->attr.precise) + event = cpuc->events[bit]; +if (!test_bit (bit, cpuc->active_mask))continue ; - event = cpuc->events[bit]; +WARN_ON_ONCE (!event); + +if (!event->attr.precise) +continue ; + +if (__test_and_set_bit (bit, (unsigned long *)&status)) +continue ; + +break ; } -if (!event) +if (!event || bit >=MAX_PEBS_EVENTS )continue ;if (!intel_pmu_save_and_restart (event))