perf: add counter bits argument for x86_perf_event_update
Subsystems (2)
RFC PATCH v3 1/3 perf: add counter bits argument for x86_perf_event_update
x86_perf_event_update will be used by later uncore patches. Add an argument to it to specify counter bits of pmu.
(No update from v2)
Signed-off-by Lin Ming <[email protected]>
--- arch/x86/kernel/cpu/perf_event.c | 12 ++++++------ arch/x86/kernel/cpu/perf_event_intel.c | 4 ++-- arch/x86/kernel/cpu/perf_event_p4.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)
arch/x86/kernel/cpu/perf_event.c +6 -6
@@ -277,11 +277,11 @@ static u64 __read_mostly hw_cache_event_ids* Can only be executed on the CPU where the event is active. * Returns the delta events processed. */ -static u64 -x86_perf_event_update (struct perf_event *event) +u64 +x86_perf_event_update (struct perf_event *event,int cntval_bits) {struct hw_perf_event *hwc = &event->hw; -int shift =64 - x86_pmu.cntval_bits; +int shift =64 - cntval_bits;u64 prev_raw_count, new_raw_count;int idx = hwc->idx;s64 delta;
@@ -1114,7 +1114,7 @@ static void x86_pmu_stop(struct perf_event *event, int flags)* Drain the remaining delta count out of a event * that we are disabling: */ -x86_perf_event_update (event); +x86_perf_event_update (event, x86_pmu.cntval_bits); hwc->state |=PERF_HES_UPTODATE ; } }
@@ -1176,7 +1176,7 @@ static int x86_pmu_handle_irq(struct pt_regs *regs) event = cpuc->events[idx]; - val =x86_perf_event_update (event); + val =x86_perf_event_update (event, x86_pmu.cntval_bits);if (val & (1ULL << (x86_pmu.cntval_bits -1 )))continue ;
@@ -1438,7 +1438,7 @@ early_initcall(init_hw_perf_events);static inline void x86_pmu_read (struct perf_event *event) { -x86_perf_event_update (event); +x86_perf_event_update (event, x86_pmu.cntval_bits); }/*
arch/x86/kernel/cpu/perf_event_intel.c +2 -2
@@ -536,7 +536,7 @@ static void intel_pmu_nhm_workaround(void)for (i =0 ; i <4 ; i++) { event = cpuc->events[i];if (event) -x86_perf_event_update (event); +x86_perf_event_update (event, x86_pmu.cntval_bits); }for (i =0 ; i <4 ; i++) {
@@ -673,7 +673,7 @@ static void intel_pmu_enable_event(struct perf_event *event)*/ static int intel_pmu_save_and_restart (struct perf_event *event) { -x86_perf_event_update (event); +x86_perf_event_update (event, x86_pmu.cntval_bits);return x86_perf_event_set_period (event); }
arch/x86/kernel/cpu/perf_event_p4.c +1 -1
@@ -919,7 +919,7 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)/* it might be unflagged overflow */ overflow =p4_pmu_clear_cccr_ovf (hwc); - val =x86_perf_event_update (event); + val =x86_perf_event_update (event, x86_pmu.cntval_bits);if (!overflow && (val & (1ULL << (x86_pmu.cntval_bits -1 ))))continue ;
Signature · 1 line
1.5.3