Commit 8de18543 authored by Like Xu's avatar Like Xu Committed by Sean Christopherson
Browse files

KVM: x86/pmu: Move reprogram_counters() to pmu.h 



Move reprogram_counters() out of Intel specific PMU code and into pmu.h so
that it can be used to implement AMD PMU v2 support.

No functional change intended.

Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarLike Xu <likexu@tencent.com>
[sean: rewrite changelog]
Link: https://lore.kernel.org/r/20230603011058.1038821-3-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 53550b89

arch/x86/kvm/pmu.h

+12 −0
Original line number Diff line number Diff line
@@ -201,6 +201,18 @@ 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)

{

	int bit;



	if (!diff)

		return;



	for_each_set_bit(bit, (unsigned long *)&diff, X86_PMC_IDX_MAX)

		set_bit(bit, pmu->reprogram_pmi);

	kvm_make_request(KVM_REQ_PMU, pmu_to_vcpu(pmu));

}



void kvm_pmu_deliver_pmi(struct kvm_vcpu *vcpu);

void kvm_pmu_handle_event(struct kvm_vcpu *vcpu);

int kvm_pmu_rdpmc(struct kvm_vcpu *vcpu, unsigned pmc, u64 *data);

arch/x86/kvm/vmx/pmu_intel.c

+0 −12
Original line number Diff line number Diff line
@@ -73,18 +73,6 @@ static struct kvm_pmc *intel_pmc_idx_to_pmc(struct kvm_pmu *pmu, int pmc_idx) 
	}

}



static void reprogram_counters(struct kvm_pmu *pmu, u64 diff)

{

	int bit;



	if (!diff)

		return;



	for_each_set_bit(bit, (unsigned long *)&diff, X86_PMC_IDX_MAX)

		set_bit(bit, pmu->reprogram_pmi);

	kvm_make_request(KVM_REQ_PMU, pmu_to_vcpu(pmu));

}



static bool intel_hw_event_available(struct kvm_pmc *pmc)

{

	struct kvm_pmu *pmu = pmc_to_pmu(pmc);