Commit ecb49077 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMD 



Stop stripping bits 31:30 prior to validating/consuming the RDPMC index on
AMD.  Per the APM's documentation of RDPMC, *values* greater than 27 are
reserved.  The behavior of upper bits being flags is firmly Intel-only.

Fixes: ca724305 ("KVM: x86/vPMU: Implement AMD vPMU code for KVM")
Tested-by: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Link: https://lore.kernel.org/r/20240109230250.424295-7-seanjc@google.com


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

arch/x86/kvm/svm/pmu.c

+1 −3
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ static bool amd_is_valid_rdpmc_ecx(struct kvm_vcpu *vcpu, unsigned int idx) 
{

	struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);



	idx &= ~(3u << 30);



	return idx < pmu->nr_arch_gp_counters;

}
@@ -86,7 +84,7 @@ static bool amd_is_valid_rdpmc_ecx(struct kvm_vcpu *vcpu, unsigned int idx) 
static struct kvm_pmc *amd_rdpmc_ecx_to_pmc(struct kvm_vcpu *vcpu,

	unsigned int idx, u64 *mask)

{

	return amd_pmc_idx_to_pmc(vcpu_to_pmu(vcpu), idx & ~(3u << 30));

	return amd_pmc_idx_to_pmc(vcpu_to_pmu(vcpu), idx);

}



static struct kvm_pmc *amd_msr_idx_to_pmc(struct kvm_vcpu *vcpu, u32 msr)