KVM: x86/pmu: Use PERF_TYPE_RAW to merge reprogram_{gp,fixed}counter()

The code sketch for reprogram_{gp, fixed}_counter() is similar, while the
fixed counter using the PERF_TYPE_HARDWAR type and the gp being
able to use either PERF_TYPE_HARDWAR or PERF_TYPE_RAW type
depending on the pmc->eventsel value.

After 'commit 761875634a5e ("KVM: x86/pmu: Setup pmc->eventsel
for fixed PMCs")', the pmc->eventsel of the fixed counter will also have
been setup with the same semantic value and will not be changed during
the guest runtime.

The original story of using the PERF_TYPE_HARDWARE type is to emulate
guest architecture PMU on a host without architecture PMU (the Pentium 4),
for which the guest vPMC needs to be reprogrammed using the kernel
generic perf_hw_id. But essentially, "the HARDWARE is just a convenience
wrapper over RAW IIRC", quoated from Peterz. So it could be pretty safe
to use the PERF_TYPE_RAW type only in practice to program both gp and
fixed counters naturally in the reprogram_counter().

To make the gp and fixed counters more semantically symmetrical,
the selection of EVENTSEL_{USER, OS, INT} bits is temporarily translated
via fixed_ctr_ctrl before the pmc_reprogram_counter() call.

Cc: Peter Zijlstra <peterz@infradead.org>
Suggested-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Like Xu <likexu@tencent.com>
Message-Id: <20220518132512.37864-9-likexu@tencent.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index d2a0581d9d4d6be5678ca36e573fc3b5d2072962..b46a96604fe62b1f16f58f8a58bbe20f53883b9e 100644 (file)
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -283,85 +283,48 @@ out:
        return allow_event;
 }
 
-static void reprogram_gp_counter(struct kvm_pmc *pmc)
+void reprogram_counter(struct kvm_pmc *pmc)
 {
-       u64 config;
-       u32 type = PERF_TYPE_RAW;
        struct kvm_pmu *pmu = pmc_to_pmu(pmc);
        u64 eventsel = pmc->eventsel;
-
-       if (eventsel & ARCH_PERFMON_EVENTSEL_PIN_CONTROL)
-               printk_once("kvm pmu: pin control bit is ignored\n");
+       u64 new_config = eventsel;
+       u8 fixed_ctr_ctrl;
 
        pmc_pause_counter(pmc);
 
-       if (!(eventsel & ARCH_PERFMON_EVENTSEL_ENABLE) || !pmc_is_enabled(pmc))
+       if (!pmc_speculative_in_use(pmc) || !pmc_is_enabled(pmc))
                return;
 
        if (!check_pmu_event_filter(pmc))
                return;
 
-       if (!(eventsel & (ARCH_PERFMON_EVENTSEL_EDGE |
-                         ARCH_PERFMON_EVENTSEL_INV |
-                         ARCH_PERFMON_EVENTSEL_CMASK |
-                         HSW_IN_TX |
-                         HSW_IN_TX_CHECKPOINTED))) {
-               config = static_call(kvm_x86_pmu_pmc_perf_hw_id)(pmc);
-               if (config != PERF_COUNT_HW_MAX)
-                       type = PERF_TYPE_HARDWARE;
-       }
+       if (eventsel & ARCH_PERFMON_EVENTSEL_PIN_CONTROL)
+               printk_once("kvm pmu: pin control bit is ignored\n");
 
-       if (type == PERF_TYPE_RAW)
-               config = eventsel & pmu->raw_event_mask;
+       if (pmc_is_fixed(pmc)) {
+               fixed_ctr_ctrl = fixed_ctrl_field(pmu->fixed_ctr_ctrl,
+                                                 pmc->idx - INTEL_PMC_IDX_FIXED);
+               if (fixed_ctr_ctrl & 0x1)
+                       eventsel |= ARCH_PERFMON_EVENTSEL_OS;
+               if (fixed_ctr_ctrl & 0x2)
+                       eventsel |= ARCH_PERFMON_EVENTSEL_USR;
+               if (fixed_ctr_ctrl & 0x8)
+                       eventsel |= ARCH_PERFMON_EVENTSEL_INT;
+               new_config = (u64)fixed_ctr_ctrl;
+       }
 
-       if (pmc->current_config == eventsel && pmc_resume_counter(pmc))
+       if (pmc->current_config == new_config && pmc_resume_counter(pmc))
                return;
 
        pmc_release_perf_event(pmc);
 
-       pmc->current_config = eventsel;
-       pmc_reprogram_counter(pmc, type, config,
+       pmc->current_config = new_config;
+       pmc_reprogram_counter(pmc, PERF_TYPE_RAW,
+                             (eventsel & pmu->raw_event_mask),
                              !(eventsel & ARCH_PERFMON_EVENTSEL_USR),
                              !(eventsel & ARCH_PERFMON_EVENTSEL_OS),
                              eventsel & ARCH_PERFMON_EVENTSEL_INT);
 }
-
-static void reprogram_fixed_counter(struct kvm_pmc *pmc)
-{
-       struct kvm_pmu *pmu = pmc_to_pmu(pmc);
-       int idx = pmc->idx - INTEL_PMC_IDX_FIXED;
-       u8 ctrl = fixed_ctrl_field(pmu->fixed_ctr_ctrl, idx);
-       unsigned en_field = ctrl & 0x3;
-       bool pmi = ctrl & 0x8;
-
-       pmc_pause_counter(pmc);
-
-       if (!en_field || !pmc_is_enabled(pmc))
-               return;
-
-       if (!check_pmu_event_filter(pmc))
-               return;
-
-       if (pmc->current_config == (u64)ctrl && pmc_resume_counter(pmc))
-               return;
-
-       pmc_release_perf_event(pmc);
-
-       pmc->current_config = (u64)ctrl;
-       pmc_reprogram_counter(pmc, PERF_TYPE_HARDWARE,
-                             static_call(kvm_x86_pmu_pmc_perf_hw_id)(pmc),
-                             !(en_field & 0x2), /* exclude user */
-                             !(en_field & 0x1), /* exclude kernel */
-                             pmi);
-}
-
-void reprogram_counter(struct kvm_pmc *pmc)
-{
-       if (pmc_is_gp(pmc))
-               reprogram_gp_counter(pmc);
-       else
-               reprogram_fixed_counter(pmc);
-}
 EXPORT_SYMBOL_GPL(reprogram_counter);
 
 void kvm_pmu_handle_event(struct kvm_vcpu *vcpu)