KVM: SVM: INTERCEPT_RDTSCP is never intercepted anyway

commit e8d93d5d93f85949e7299be289c6e7e1154b2f78 upstream.

svm_recalc_instruction_intercepts() is always called at least once
before the vCPU is started, so the setting or clearing of the RDTSCP
intercept can be dropped from the TSC_AUX virtualization support.

Extracted from a patch by Tom Lendacky.

Cc: stable@vger.kernel.org
Fixes: 296d5a17e793 ("KVM: SEV-ES: Use V_TSC_AUX if available instead of RDTSC/MSR_TSC_AUX intercepts")
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index d08d5e085649faed355919bb159ea4d95c2a175b..e0d14f964fe74d064f6ecedee2079188098f4552 100644 (file)
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -2990,11 +2990,8 @@ static void sev_es_init_vmcb(struct vcpu_svm *svm)
 
        if (boot_cpu_has(X86_FEATURE_V_TSC_AUX) &&
            (guest_cpuid_has(&svm->vcpu, X86_FEATURE_RDTSCP) ||
-            guest_cpuid_has(&svm->vcpu, X86_FEATURE_RDPID))) {
+            guest_cpuid_has(&svm->vcpu, X86_FEATURE_RDPID)))
                set_msr_interception(vcpu, svm->msrpm, MSR_TSC_AUX, 1, 1);
-               if (guest_cpuid_has(&svm->vcpu, X86_FEATURE_RDTSCP))
-                       svm_clr_intercept(svm, INTERCEPT_RDTSCP);
-       }
 }
 
 void sev_init_vmcb(struct vcpu_svm *svm)