Commit e8d93d5d authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: SVM: INTERCEPT_RDTSCP is never intercepted anyway 



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: 296d5a17 ("KVM: SEV-ES: Use V_TSC_AUX if available instead of RDTSC/MSR_TSC_AUX intercepts")
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0df9dab8

arch/x86/kvm/svm/sev.c

+1 −4
Original line number Diff line number Diff line
@@ -3027,11 +3027,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)