KVM: x86/pmu: Rename reprogram_counters() to clarify usage

Rename reprogram_counters() to kvm_pmu_request_counters_reprogram()
clarifying that it is more similar to
kvm_pmu_request_counter_reprogram(), and less similar to
reprogram_counter(). The kvm_pmu_* prefix is also appropriate as the
function is exposed in the header.

Opportunistically rename the argument from 'diff' to 'counters'.

No functional change intended.

Signed-off-by: Yosry Ahmed <yosry@kernel.org>
Link: https://patch.msgid.link/20260527234711.4175166-7-yosry@kernel.org
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index d6ac3c55fce552ca98e3f9f5a74daf4e379e81e4..afbc731e72174712b855325c36f1f7dc5c275aca 100644 (file)
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -889,7 +889,7 @@ int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
                if (pmu->global_ctrl != data) {
                        diff = pmu->global_ctrl ^ data;
                        pmu->global_ctrl = data;
-                       reprogram_counters(pmu, diff);
+                       kvm_pmu_request_counters_reprogram(pmu, diff);
                }
                /*
                 * Unconditionally forward writes to vendor code, i.e. to the

diff --git a/arch/x86/kvm/pmu.h b/arch/x86/kvm/pmu.h
index b1f2418e960ac29a68ca9a5b7fd81ab5a263efc9..f8286067722b02c2b3e93d8301eeb782988db9b8 100644 (file)
--- a/arch/x86/kvm/pmu.h
+++ b/arch/x86/kvm/pmu.h
@@ -210,14 +210,15 @@ static inline void kvm_pmu_request_counter_reprogram(struct kvm_pmc *pmc)
        kvm_make_request(KVM_REQ_PMU, pmc->vcpu);
 }
 
-static inline void reprogram_counters(struct kvm_pmu *pmu, u64 diff)
+static inline void kvm_pmu_request_counters_reprogram(struct kvm_pmu *pmu,
+                                                     u64 counters)
 {
        int bit;
 
-       if (!diff)
+       if (!counters)
                return;
 
-       for_each_set_bit(bit, (unsigned long *)&diff, X86_PMC_IDX_MAX)
+       for_each_set_bit(bit, (unsigned long *)&counters, X86_PMC_IDX_MAX)
                set_bit(bit, pmu->reprogram_pmi);
        kvm_make_request(KVM_REQ_PMU, pmu_to_vcpu(pmu));
 }

diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
index 27eb76e6b6a034b8089360c76f61c8b0898671d6..9bd77843d8da225dbb7e9045f57941a0a24b532e 100644 (file)
--- a/arch/x86/kvm/vmx/pmu_intel.c
+++ b/arch/x86/kvm/vmx/pmu_intel.c
@@ -391,7 +391,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
                if (pmu->pebs_enable != data) {
                        diff = pmu->pebs_enable ^ data;
                        pmu->pebs_enable = data;
-                       reprogram_counters(pmu, diff);
+                       kvm_pmu_request_counters_reprogram(pmu, diff);
                }
                break;
        case MSR_IA32_DS_AREA: