Commit d1fa0352 authored by Jan Kiszka's avatar Jan Kiszka Committed by Gleb Natapov
Browse files

KVM: nVMX: VM_ENTRY/EXIT_LOAD_IA32_EFER overrides EFER.LMA settings 



If we load the complete EFER MSR on entry or exit, EFER.LMA (and LME)
loading is skipped. Their consistency is already checked now before
starting the transition.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent 384bb783

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -7519,7 +7519,7 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) 


	if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_EFER)

		vcpu->arch.efer = vmcs12->guest_ia32_efer;

	if (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE)

	else if (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE)

		vcpu->arch.efer |= (EFER_LMA | EFER_LME);

	else

		vcpu->arch.efer &= ~(EFER_LMA | EFER_LME);
@@ -7929,7 +7929,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, 
{

	if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_EFER)

		vcpu->arch.efer = vmcs12->host_ia32_efer;

	if (vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE)

	else if (vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE)

		vcpu->arch.efer |= (EFER_LMA | EFER_LME);

	else

		vcpu->arch.efer &= ~(EFER_LMA | EFER_LME);