KVM: x86/pmu: Fix a typo in kvm_pmu_request_counter_reprogam()

Like Xu · sean-jc · commit 4fa5843d81fd · 2023-04-07T09:07:41.000-07:00
Fix a "reprogam" => "reprogram" typo in kvm_pmu_request_counter_reprogam(). Fixes: 68fb475 ("KVM: x86/pmu: Defer reprogram_counter() to kvm_pmu_handle_event()") Signed-off-by: Like Xu <likexu@tencent.com> Link: https://lore.kernel.org/r/20230310113349.31799-1-likexu@tencent.com [sean: trim the changelog] Signed-off-by: Sean Christopherson <seanjc@google.com>
diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
@@ -650,7 +650,7 @@ static void kvm_pmu_incr_counter(struct kvm_pmc *pmc)
 {
 	pmc->prev_counter = pmc->counter;
 	pmc->counter = (pmc->counter + 1) & pmc_bitmask(pmc);
-	kvm_pmu_request_counter_reprogam(pmc);
+	kvm_pmu_request_counter_reprogram(pmc);
 }
 
 static inline bool eventsel_match_perf_hw_id(struct kvm_pmc *pmc,
diff --git a/arch/x86/kvm/pmu.h b/arch/x86/kvm/pmu.h
@@ -195,7 +195,7 @@ static inline void kvm_init_pmu_capability(const struct kvm_pmu_ops *pmu_ops)
 					     KVM_PMC_MAX_FIXED);
 }
 
-static inline void kvm_pmu_request_counter_reprogam(struct kvm_pmc *pmc)
+static inline void kvm_pmu_request_counter_reprogram(struct kvm_pmc *pmc)
 {
 	set_bit(pmc->idx, pmc_to_pmu(pmc)->reprogram_pmi);
 	kvm_make_request(KVM_REQ_PMU, pmc->vcpu);
diff --git a/arch/x86/kvm/svm/pmu.c b/arch/x86/kvm/svm/pmu.c
@@ -161,7 +161,7 @@ static int amd_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 		data &= ~pmu->reserved_bits;
 		if (data != pmc->eventsel) {
 			pmc->eventsel = data;
-			kvm_pmu_request_counter_reprogam(pmc);
+			kvm_pmu_request_counter_reprogram(pmc);
 		}
 		return 0;
 	}
diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
@@ -57,7 +57,7 @@ static void reprogram_fixed_counters(struct kvm_pmu *pmu, u64 data)
 		pmc = get_fixed_pmc(pmu, MSR_CORE_PERF_FIXED_CTR0 + i);
 
 		__set_bit(INTEL_PMC_IDX_FIXED + i, pmu->pmc_in_use);
-		kvm_pmu_request_counter_reprogam(pmc);
+		kvm_pmu_request_counter_reprogram(pmc);
 	}
 }
 
@@ -484,7 +484,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 
 			if (data != pmc->eventsel) {
 				pmc->eventsel = data;
-				kvm_pmu_request_counter_reprogam(pmc);
+				kvm_pmu_request_counter_reprogram(pmc);
 			}
 			break;
 		} else if (intel_pmu_handle_lbr_msrs_access(vcpu, msr_info, false)) {

Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,7 @@ static void kvm_pmu_incr_counter(struct kvm_pmc *pmc)`
`650`	`650`	`{`
`651`	`651`	`pmc->prev_counter = pmc->counter;`
`652`	`652`	`pmc->counter = (pmc->counter + 1) & pmc_bitmask(pmc);`
`653`		`- kvm_pmu_request_counter_reprogam(pmc);`
	`653`	`+ kvm_pmu_request_counter_reprogram(pmc);`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`static inline bool eventsel_match_perf_hw_id(struct kvm_pmc *pmc,`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ static inline void kvm_init_pmu_capability(const struct kvm_pmu_ops *pmu_ops)`
`195`	`195`	`KVM_PMC_MAX_FIXED);`
`196`	`196`	`}`
`197`	`197`
`198`		`-static inline void kvm_pmu_request_counter_reprogam(struct kvm_pmc *pmc)`
	`198`	`+static inline void kvm_pmu_request_counter_reprogram(struct kvm_pmc *pmc)`
`199`	`199`	`{`
`200`	`200`	`set_bit(pmc->idx, pmc_to_pmu(pmc)->reprogram_pmi);`
`201`	`201`	`kvm_make_request(KVM_REQ_PMU, pmc->vcpu);`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ static int amd_pmu_set_msr(struct kvm_vcpu vcpu, struct msr_data msr_info)`
`161`	`161`	`data &= ~pmu->reserved_bits;`
`162`	`162`	`if (data != pmc->eventsel) {`
`163`	`163`	`pmc->eventsel = data;`
`164`		`- kvm_pmu_request_counter_reprogam(pmc);`
	`164`	`+ kvm_pmu_request_counter_reprogram(pmc);`
`165`	`165`	`}`
`166`	`166`	`return 0;`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ static void reprogram_fixed_counters(struct kvm_pmu *pmu, u64 data)`
`57`	`57`	`pmc = get_fixed_pmc(pmu, MSR_CORE_PERF_FIXED_CTR0 + i);`
`58`	`58`
`59`	`59`	`__set_bit(INTEL_PMC_IDX_FIXED + i, pmu->pmc_in_use);`
`60`		`- kvm_pmu_request_counter_reprogam(pmc);`
	`60`	`+ kvm_pmu_request_counter_reprogram(pmc);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`@@ -484,7 +484,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu vcpu, struct msr_data msr_info)`
`484`	`484`
`485`	`485`	`if (data != pmc->eventsel) {`
`486`	`486`	`pmc->eventsel = data;`
`487`		`- kvm_pmu_request_counter_reprogam(pmc);`
	`487`	`+ kvm_pmu_request_counter_reprogram(pmc);`
`488`	`488`	`}`
`489`	`489`	`break;`
`490`	`490`	`} else if (intel_pmu_handle_lbr_msrs_access(vcpu, msr_info, false)) {`