kvm: vmx: Set IA32_TSC_AUX for legacy mode guests (0023ef39) · Commits · 戴 / test

RDTSCP is supported in legacy mode as well as long mode. The IA32_TSC_AUX MSR should be set to the correct guest value before entering any guest that supports RDTSCP. Fixes: ("KVM: VMX: Add instruction rdtscp support for guest") Signed-off-by:

Jim Mattson <jmattson@google.com> Reviewed-by:

Peter Shier <pshier@google.com> Reviewed-by:

Marc Orr <marcorr@google.com> Reviewed-by:

Liran Alon <liran.alon@oracle.com> Reviewed-by:

Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/vmx/vmx.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1382,9 +1382,6 @@ static void setup_msrs(struct vcpu_vmx *vmx)
		index = __find_msr_index(vmx, MSR_CSTAR);
		if (index >= 0)
		move_msr_up(vmx, index, save_nmsrs++);
		index = __find_msr_index(vmx, MSR_TSC_AUX);
		if (index >= 0 && guest_cpuid_has(&vmx->vcpu, X86_FEATURE_RDTSCP))
		move_msr_up(vmx, index, save_nmsrs++);
		/*
		* MSR_STAR is only needed on long mode guests, and only
		* if efer.sce is enabled.
		@@ -1397,6 +1394,9 @@ static void setup_msrs(struct vcpu_vmx *vmx)
		index = __find_msr_index(vmx, MSR_EFER);
		if (index >= 0 && update_transition_efer(vmx, index))
		move_msr_up(vmx, index, save_nmsrs++);
		index = __find_msr_index(vmx, MSR_TSC_AUX);
		if (index >= 0 && guest_cpuid_has(&vmx->vcpu, X86_FEATURE_RDTSCP))
		move_msr_up(vmx, index, save_nmsrs++);

		vmx->save_nmsrs = save_nmsrs;
		vmx->guest_msrs_dirty = true;

Admin message