Commit 7bb7fce1 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: x86/pmu: Prioritize VMX interception over #GP on RDPMC due to bad index 



Apply the pre-intercepts RDPMC validity check only to AMD, and rename all
relevant functions to make it as clear as possible that the check is not a
standard PMC index check.  On Intel, the basic rule is that only invalid
opcodes and privilege/permission/mode checks have priority over VM-Exit,
i.e. RDPMC with an invalid index should VM-Exit, not #GP.  While the SDM
doesn't explicitly call out RDPMC, it _does_ explicitly use RDMSR of a
non-existent MSR as an example where VM-Exit has priority over #GP, and
RDPMC is effectively just a variation of RDMSR.

Manually testing on various Intel CPUs confirms this behavior, and the
inverted priority was introduced for SVM compatibility, i.e. was not an
intentional change for Intel PMUs.  On AMD, *all* exceptions on RDPMC have
priority over VM-Exit.

Check for a NULL kvm_pmu_ops.check_rdpmc_early instead of using a RET0
static call so as to provide a convenient location to document the
difference between Intel and AMD, and to again try to make it as obvious
as possible that the early check is a one-off thing, not a generic "is
this PMC valid?" helper.

Fixes: 8061252e ("KVM: SVM: Add intercept checks for remaining twobyte instructions")
Cc: Jim Mattson <jmattson@google.com>
Tested-by: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Link: https://lore.kernel.org/r/20240109230250.424295-8-seanjc@google.com


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

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ BUILD_BUG_ON(1) 
KVM_X86_PMU_OP(pmc_idx_to_pmc)

KVM_X86_PMU_OP(rdpmc_ecx_to_pmc)

KVM_X86_PMU_OP(msr_idx_to_pmc)

KVM_X86_PMU_OP(is_valid_rdpmc_ecx)

KVM_X86_PMU_OP_OPTIONAL(check_rdpmc_early)

KVM_X86_PMU_OP(is_valid_msr)

KVM_X86_PMU_OP(get_msr)

KVM_X86_PMU_OP(set_msr)

arch/x86/kvm/emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -3962,7 +3962,7 @@ static int check_rdpmc(struct x86_emulate_ctxt *ctxt) 
	 * protected mode.

	 */

	if ((!(cr4 & X86_CR4_PCE) && ctxt->ops->cpl(ctxt)) ||

	    ctxt->ops->check_pmc(ctxt, rcx))

	    ctxt->ops->check_rdpmc_early(ctxt, rcx))

		return emulate_gp(ctxt, 0);



	return X86EMUL_CONTINUE;

arch/x86/kvm/kvm_emulate.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ struct x86_emulate_ops { 
	int (*set_msr_with_filter)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 data);

	int (*get_msr_with_filter)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 *pdata);

	int (*get_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 *pdata);

	int (*check_pmc)(struct x86_emulate_ctxt *ctxt, u32 pmc);

	int (*check_rdpmc_early)(struct x86_emulate_ctxt *ctxt, u32 pmc);

	int (*read_pmc)(struct x86_emulate_ctxt *ctxt, u32 pmc, u64 *pdata);

	void (*halt)(struct x86_emulate_ctxt *ctxt);

	void (*wbinvd)(struct x86_emulate_ctxt *ctxt);

arch/x86/kvm/pmu.c

+13 −3
Original line number Diff line number Diff line
@@ -524,10 +524,20 @@ void kvm_pmu_handle_event(struct kvm_vcpu *vcpu) 
		kvm_pmu_cleanup(vcpu);

}



/* check if idx is a valid index to access PMU */

bool kvm_pmu_is_valid_rdpmc_ecx(struct kvm_vcpu *vcpu, unsigned int idx)

int kvm_pmu_check_rdpmc_early(struct kvm_vcpu *vcpu, unsigned int idx)

{

	return static_call(kvm_x86_pmu_is_valid_rdpmc_ecx)(vcpu, idx);

	/*

	 * On Intel, VMX interception has priority over RDPMC exceptions that

	 * aren't already handled by the emulator, i.e. there are no additional

	 * check needed for Intel PMUs.

	 *

	 * On AMD, _all_ exceptions on RDPMC have priority over SVM intercepts,

	 * i.e. an invalid PMC results in a #GP, not #VMEXIT.

	 */

	if (!kvm_pmu_ops.check_rdpmc_early)

		return 0;



	return static_call(kvm_x86_pmu_check_rdpmc_early)(vcpu, idx);

}



bool is_vmware_backdoor_pmc(u32 pmc_idx)

arch/x86/kvm/pmu.h

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct kvm_pmu_ops { 
	struct kvm_pmc *(*rdpmc_ecx_to_pmc)(struct kvm_vcpu *vcpu,

		unsigned int idx, u64 *mask);

	struct kvm_pmc *(*msr_idx_to_pmc)(struct kvm_vcpu *vcpu, u32 msr);

	bool (*is_valid_rdpmc_ecx)(struct kvm_vcpu *vcpu, unsigned int idx);

	int (*check_rdpmc_early)(struct kvm_vcpu *vcpu, unsigned int idx);

	bool (*is_valid_msr)(struct kvm_vcpu *vcpu, u32 msr);

	int (*get_msr)(struct kvm_vcpu *vcpu, struct msr_data *msr_info);

	int (*set_msr)(struct kvm_vcpu *vcpu, struct msr_data *msr_info);
@@ -215,7 +215,7 @@ static inline bool pmc_is_globally_enabled(struct kvm_pmc *pmc) 
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);

bool kvm_pmu_is_valid_rdpmc_ecx(struct kvm_vcpu *vcpu, unsigned int idx);

int kvm_pmu_check_rdpmc_early(struct kvm_vcpu *vcpu, unsigned int idx);

bool kvm_pmu_is_valid_msr(struct kvm_vcpu *vcpu, u32 msr);

int kvm_pmu_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info);

int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info);