Commit 13afa29a authored by Like Xu's avatar Like Xu Committed by Sean Christopherson
Browse files

KVM: x86/pmu: Provide Intel PMU's pmc_is_enabled() as generic x86 code 



Move the Intel PMU implementation of pmc_is_enabled() to common x86 code
as pmc_is_globally_enabled(), and drop AMD's implementation.  AMD PMU
currently supports only v1, and thus not PERF_GLOBAL_CONTROL, thus the
semantics for AMD are unchanged.  And when support for AMD PMU v2 comes
along, the common behavior will also Just Work.

Signed-off-by: default avatarLike Xu <likexu@tencent.com>
Co-developed-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20230603011058.1038821-6-seanjc@google.com


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

arch/x86/include/asm/kvm-x86-pmu-ops.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ BUILD_BUG_ON(1) 
 * at the call sites.

 */

KVM_X86_PMU_OP(hw_event_available)

KVM_X86_PMU_OP(pmc_is_enabled)

KVM_X86_PMU_OP(pmc_idx_to_pmc)

KVM_X86_PMU_OP(rdpmc_ecx_to_pmc)

KVM_X86_PMU_OP(msr_idx_to_pmc)

arch/x86/kvm/pmu.c

+0 −5
Original line number Diff line number Diff line
@@ -93,11 +93,6 @@ void kvm_pmu_ops_update(const struct kvm_pmu_ops *pmu_ops) 
#undef __KVM_X86_PMU_OP

}



static inline bool pmc_is_globally_enabled(struct kvm_pmc *pmc)

{

	return static_call(kvm_x86_pmu_pmc_is_enabled)(pmc);

}



static void kvm_pmi_trigger_fn(struct irq_work *irq_work)

{

	struct kvm_pmu *pmu = container_of(irq_work, struct kvm_pmu, irq_work);

arch/x86/kvm/pmu.h

+15 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


struct kvm_pmu_ops {

	bool (*hw_event_available)(struct kvm_pmc *pmc);

	bool (*pmc_is_enabled)(struct kvm_pmc *pmc);

	struct kvm_pmc *(*pmc_idx_to_pmc)(struct kvm_pmu *pmu, int pmc_idx);

	struct kvm_pmc *(*rdpmc_ecx_to_pmc)(struct kvm_vcpu *vcpu,

		unsigned int idx, u64 *mask);
@@ -227,6 +226,21 @@ static inline void reprogram_counters(struct kvm_pmu *pmu, u64 diff) 
	kvm_make_request(KVM_REQ_PMU, pmu_to_vcpu(pmu));

}



/*

 * Check if a PMC is enabled by comparing it against global_ctrl bits.

 *

 * If the vPMU doesn't have global_ctrl MSR, all vPMCs are enabled.

 */

static inline bool pmc_is_globally_enabled(struct kvm_pmc *pmc)

{

	struct kvm_pmu *pmu = pmc_to_pmu(pmc);



	if (!kvm_pmu_has_perf_global_ctrl(pmu))

		return true;



	return test_bit(pmc->idx, (unsigned long *)&pmu->global_ctrl);

}



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/svm/pmu.c

+0 −9
Original line number Diff line number Diff line
@@ -78,14 +78,6 @@ static bool amd_hw_event_available(struct kvm_pmc *pmc) 
	return true;

}



/* check if a PMC is enabled by comparing it against global_ctrl bits. Because

 * AMD CPU doesn't have global_ctrl MSR, all PMCs are enabled (return TRUE).

 */

static bool amd_pmc_is_enabled(struct kvm_pmc *pmc)

{

	return true;

}



static bool amd_is_valid_rdpmc_ecx(struct kvm_vcpu *vcpu, unsigned int idx)

{

	struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
@@ -220,7 +212,6 @@ static void amd_pmu_reset(struct kvm_vcpu *vcpu) 


struct kvm_pmu_ops amd_pmu_ops __initdata = {

	.hw_event_available = amd_hw_event_available,

	.pmc_is_enabled = amd_pmc_is_enabled,

	.pmc_idx_to_pmc = amd_pmc_idx_to_pmc,

	.rdpmc_ecx_to_pmc = amd_rdpmc_ecx_to_pmc,

	.msr_idx_to_pmc = amd_msr_idx_to_pmc,

arch/x86/kvm/vmx/pmu_intel.c

+1 −13
Original line number Diff line number Diff line
@@ -95,17 +95,6 @@ static bool intel_hw_event_available(struct kvm_pmc *pmc) 
	return true;

}



/* check if a PMC is enabled by comparing it with globl_ctrl bits. */

static bool intel_pmc_is_enabled(struct kvm_pmc *pmc)

{

	struct kvm_pmu *pmu = pmc_to_pmu(pmc);



	if (!kvm_pmu_has_perf_global_ctrl(pmu))

		return true;



	return test_bit(pmc->idx, (unsigned long *)&pmu->global_ctrl);

}



static bool intel_is_valid_rdpmc_ecx(struct kvm_vcpu *vcpu, unsigned int idx)

{

	struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
@@ -759,7 +748,7 @@ void intel_pmu_cross_mapped_check(struct kvm_pmu *pmu) 
		pmc = intel_pmc_idx_to_pmc(pmu, bit);



		if (!pmc || !pmc_speculative_in_use(pmc) ||

		    !intel_pmc_is_enabled(pmc) || !pmc->perf_event)

		    !pmc_is_globally_enabled(pmc) || !pmc->perf_event)

			continue;



		/*
@@ -774,7 +763,6 @@ void intel_pmu_cross_mapped_check(struct kvm_pmu *pmu) 


struct kvm_pmu_ops intel_pmu_ops __initdata = {

	.hw_event_available = intel_hw_event_available,

	.pmc_is_enabled = intel_pmc_is_enabled,

	.pmc_idx_to_pmc = intel_pmc_idx_to_pmc,

	.rdpmc_ecx_to_pmc = intel_rdpmc_ecx_to_pmc,

	.msr_idx_to_pmc = intel_msr_idx_to_pmc,