Commit 6f2b296a authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: SVM: Inject #GP on guest MSR_TSC_AUX accesses if RDTSCP unsupported 



Inject #GP on guest accesses to MSR_TSC_AUX if RDTSCP is unsupported in
the guest's CPUID model.

Fixes: 46896c73 ("KVM: svm: add support for RDTSCP")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210423223404.3860547-2-seanjc@google.com>
Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e23f6d49

arch/x86/kvm/svm/svm.c

+7 −0
Original line number Diff line number Diff line
@@ -2674,6 +2674,9 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	case MSR_TSC_AUX:

		if (!boot_cpu_has(X86_FEATURE_RDTSCP))

			return 1;

		if (!msr_info->host_initiated &&

		    !guest_cpuid_has(vcpu, X86_FEATURE_RDTSCP))

			return 1;

		msr_info->data = svm->tsc_aux;

		break;

	/*
@@ -2892,6 +2895,10 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) 
		if (!boot_cpu_has(X86_FEATURE_RDTSCP))

			return 1;



		if (!msr->host_initiated &&

		    !guest_cpuid_has(vcpu, X86_FEATURE_RDTSCP))

			return 1;



		/*

		 * This is rare, so we update the MSR here instead of using

		 * direct_access_msrs.  Doing that would require a rdmsr in