x86,perf: P4 PMU -- handle unflagged events
Subsystems (2)
PATCH 1/1 x86,perf: P4 PMU -- handle unflagged events
From: Cyrill Gorcunov <[email protected]>
Subject: [PATCH] x86,perf: P4 PMU -- handle unflagged events
It might happen that event if being overflowed without proper bit set. Check the sign bit in counter.
Tested-by Lin Ming <[email protected]>
Signed-off-by Cyrill Gorcunov <[email protected]>
CC Peter Zijlstra <[email protected]>
CC Ingo Molnar <[email protected]>
CC Frederic Weisbecker <[email protected]>
--- arch/x86/kernel/cpu/perf_event_p4.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-)
arch/x86/kernel/cpu/perf_event_p4.c +16 -16
@@ -465,15 +465,21 @@ out:return rc; } -static inline void p4_pmu_clear_cccr_ovf (struct hw_perf_event *hwc) +static inline int p4_pmu_clear_cccr_ovf (struct hw_perf_event *hwc) { -unsigned long dummy; +int overflow =0 ; +u32 low, high; -rdmsrl (hwc->config_base + hwc->idx, dummy); -if (dummy &P4_CCCR_OVF ) { +rdmsr (hwc->config_base + hwc->idx, low, high); + +/* we need to check high bit for unflagged overflows */ +if ((low &P4_CCCR_OVF ) || (high & (1 <<31 ))) { + overflow =1 ; (void )checking_wrmsrl (hwc->config_base + hwc->idx, - ((u64 )dummy) & ~P4_CCCR_OVF ); + ((u64 )low) & ~P4_CCCR_OVF ); } + +return overflow; }static inline void p4_pmu_disable_event (struct perf_event *event)
@@ -584,21 +590,15 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)WARN_ON_ONCE (hwc->idx != idx); -/* -* FIXME: Redundant call, actually not needed -* but just to check if we're screwed -*/ -p4_pmu_clear_cccr_ovf (hwc); +/* it might be unflagged overflow */ + handled =p4_pmu_clear_cccr_ovf (hwc); val =x86_perf_event_update (event); -if (val & (1ULL << (x86_pmu.cntval_bits -1 ))) +if (!handled && (val & (1ULL << (x86_pmu.cntval_bits -1 ))))continue ; -/* -* event overflow -*/ - handled =1 ; - data.period = event->hw.last_period; +/* event overflow for sure */ + data.period = event->hw.last_period;if (!x86_perf_event_set_period (event))continue ;
[tip:perf/core] perf, x86: P4 PMU -- handle unflagged events
Commit-ID: 0db1a7bc00216a981d0b7056627ad8682f4f0636 Gitweb: http://git.kernel.org/tip/0db1a7bc00216a981d0b7056627ad8682f4f0636 Author: Cyrill Gorcunov <[email protected]> AuthorDate: Mon, 17 May 2010 16:13:04 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 18 May 2010 08:25:34 +0200
perf, x86: P4 PMU -- handle unflagged events
It might happen that an event can overflow without the proper overflow flag set. Check the sign bit in the raw counter value to solve this problem.
Tested-by Lin Ming <[email protected]>
Signed-off-by Cyrill Gorcunov <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Cyrill Gorcunov <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_event_p4.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-)
arch/x86/kernel/cpu/perf_event_p4.c +16 -16
@@ -465,15 +465,21 @@ out:return rc; } -static inline void p4_pmu_clear_cccr_ovf (struct hw_perf_event *hwc) +static inline int p4_pmu_clear_cccr_ovf (struct hw_perf_event *hwc) { -unsigned long dummy; +int overflow =0 ; +u32 low, high; -rdmsrl (hwc->config_base + hwc->idx, dummy); -if (dummy &P4_CCCR_OVF ) { +rdmsr (hwc->config_base + hwc->idx, low, high); + +/* we need to check high bit for unflagged overflows */ +if ((low &P4_CCCR_OVF ) || (high & (1 <<31 ))) { + overflow =1 ; (void )checking_wrmsrl (hwc->config_base + hwc->idx, - ((u64 )dummy) & ~P4_CCCR_OVF ); + ((u64 )low) & ~P4_CCCR_OVF ); } + +return overflow; }static inline void p4_pmu_disable_event (struct perf_event *event)
@@ -584,21 +590,15 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)WARN_ON_ONCE (hwc->idx != idx); -/* -* FIXME: Redundant call, actually not needed -* but just to check if we're screwed -*/ -p4_pmu_clear_cccr_ovf (hwc); +/* it might be unflagged overflow */ + handled =p4_pmu_clear_cccr_ovf (hwc); val =x86_perf_event_update (event); -if (val & (1ULL << (x86_pmu.cntval_bits -1 ))) +if (!handled && (val & (1ULL << (x86_pmu.cntval_bits -1 ))))continue ; -/* -* event overflow -*/ - handled =1 ; - data.period = event->hw.last_period; +/* event overflow for sure */ + data.period = event->hw.last_period;if (!x86_perf_event_set_period (event))continue ;