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

KVM: VMX: Don't _explicitly_ reconfigure user return MSRs on vCPU INIT 



When emulating vCPU INIT, do not unconditionally refresh the list of user
return MSRs that need to be loaded into hardware when running the guest.
Unconditionally refreshing the list is confusing, as the vast majority of
MSRs are not modified on INIT.  The real motivation is to handle the case
where an INIT during long mode obviates the need to load the SYSCALL MSRs,
and that is handled as needed by vmx_set_efer().

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210713163324.627647-36-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 432979b5

arch/x86/kvm/vmx/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -4410,6 +4410,8 @@ static void init_vmcs(struct vcpu_vmx *vmx) 
		vmx->pt_desc.guest.output_mask = 0x7F;

		vmcs_write64(GUEST_IA32_RTIT_CTL, 0);

	}



	vmx_setup_uret_msrs(vmx);

}



static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
@@ -4468,8 +4470,6 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) 
	if (kvm_mpx_supported())

		vmcs_write64(GUEST_BNDCFGS, 0);



	vmx_setup_uret_msrs(vmx);



	if (cpu_has_vmx_msr_bitmap())

		vmx_update_msr_bitmap(&vmx->vcpu);