Commit fae9ebde authored by Kan Liang's avatar Kan Liang Committed by Peter Zijlstra

perf/x86/intel: Optimize FIXED_CTR_CTRL access

All the fixed counters share a fixed control register. The current
perf reads and re-writes the fixed control register for each fixed
counter disable/enable, which is unnecessary.

When changing the fixed control register, the entire PMU must be
disabled via the global control register. The changing cannot be taken
effect until the entire PMU is re-enabled. Only updating the fixed
control register once right before the entire PMU re-enabling is
enough.

The read of the fixed control register is not necessary either. The
value can be cached in the per CPU cpu_hw_events.

Test results:

Counting all the fixed counters with the perf bench sched pipe as below
on a SPR machine.

 $perf stat -e cycles,instructions,ref-cycles,slots --no-inherit --
  taskset -c 1 perf bench sched pipe

The Total elapsed time reduces from 5.36s (without the patch) to 4.99s
(with the patch), which is ~6.9% improvement.
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20220804140729.2951259-1-kan.liang@linux.intel.com
parent dbf4e792
...@@ -2190,6 +2190,12 @@ static void __intel_pmu_enable_all(int added, bool pmi) ...@@ -2190,6 +2190,12 @@ static void __intel_pmu_enable_all(int added, bool pmi)
u64 intel_ctrl = hybrid(cpuc->pmu, intel_ctrl); u64 intel_ctrl = hybrid(cpuc->pmu, intel_ctrl);
intel_pmu_lbr_enable_all(pmi); intel_pmu_lbr_enable_all(pmi);
if (cpuc->fixed_ctrl_val != cpuc->active_fixed_ctrl_val) {
wrmsrl(MSR_ARCH_PERFMON_FIXED_CTR_CTRL, cpuc->fixed_ctrl_val);
cpuc->active_fixed_ctrl_val = cpuc->fixed_ctrl_val;
}
wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL,
intel_ctrl & ~cpuc->intel_ctrl_guest_mask); intel_ctrl & ~cpuc->intel_ctrl_guest_mask);
...@@ -2407,9 +2413,10 @@ static inline void intel_clear_masks(struct perf_event *event, int idx) ...@@ -2407,9 +2413,10 @@ static inline void intel_clear_masks(struct perf_event *event, int idx)
static void intel_pmu_disable_fixed(struct perf_event *event) static void intel_pmu_disable_fixed(struct perf_event *event)
{ {
struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
struct hw_perf_event *hwc = &event->hw; struct hw_perf_event *hwc = &event->hw;
u64 ctrl_val, mask;
int idx = hwc->idx; int idx = hwc->idx;
u64 mask;
if (is_topdown_idx(idx)) { if (is_topdown_idx(idx)) {
struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events); struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
...@@ -2426,9 +2433,7 @@ static void intel_pmu_disable_fixed(struct perf_event *event) ...@@ -2426,9 +2433,7 @@ static void intel_pmu_disable_fixed(struct perf_event *event)
intel_clear_masks(event, idx); intel_clear_masks(event, idx);
mask = 0xfULL << ((idx - INTEL_PMC_IDX_FIXED) * 4); mask = 0xfULL << ((idx - INTEL_PMC_IDX_FIXED) * 4);
rdmsrl(hwc->config_base, ctrl_val); cpuc->fixed_ctrl_val &= ~mask;
ctrl_val &= ~mask;
wrmsrl(hwc->config_base, ctrl_val);
} }
static void intel_pmu_disable_event(struct perf_event *event) static void intel_pmu_disable_event(struct perf_event *event)
...@@ -2701,8 +2706,9 @@ static void intel_pmu_read_event(struct perf_event *event) ...@@ -2701,8 +2706,9 @@ static void intel_pmu_read_event(struct perf_event *event)
static void intel_pmu_enable_fixed(struct perf_event *event) static void intel_pmu_enable_fixed(struct perf_event *event)
{ {
struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
struct hw_perf_event *hwc = &event->hw; struct hw_perf_event *hwc = &event->hw;
u64 ctrl_val, mask, bits = 0; u64 mask, bits = 0;
int idx = hwc->idx; int idx = hwc->idx;
if (is_topdown_idx(idx)) { if (is_topdown_idx(idx)) {
...@@ -2746,10 +2752,8 @@ static void intel_pmu_enable_fixed(struct perf_event *event) ...@@ -2746,10 +2752,8 @@ static void intel_pmu_enable_fixed(struct perf_event *event)
mask |= ICL_FIXED_0_ADAPTIVE << (idx * 4); mask |= ICL_FIXED_0_ADAPTIVE << (idx * 4);
} }
rdmsrl(hwc->config_base, ctrl_val); cpuc->fixed_ctrl_val &= ~mask;
ctrl_val &= ~mask; cpuc->fixed_ctrl_val |= bits;
ctrl_val |= bits;
wrmsrl(hwc->config_base, ctrl_val);
} }
static void intel_pmu_enable_event(struct perf_event *event) static void intel_pmu_enable_event(struct perf_event *event)
......
...@@ -270,6 +270,10 @@ struct cpu_hw_events { ...@@ -270,6 +270,10 @@ struct cpu_hw_events {
u64 active_pebs_data_cfg; u64 active_pebs_data_cfg;
int pebs_record_size; int pebs_record_size;
/* Intel Fixed counter configuration */
u64 fixed_ctrl_val;
u64 active_fixed_ctrl_val;
/* /*
* Intel LBR bits * Intel LBR bits
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment