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

KVM: VMX: Don't toggle VM_ENTRY_IA32E_MODE for 32-bit kernels/KVM 



Don't toggle VM_ENTRY_IA32E_MODE in 32-bit kernels/KVM and instead bug
the VM if KVM attempts to run the guest with EFER.LMA=1. KVM doesn't
support running 64-bit guests with 32-bit hosts.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20220830133737.1539624-23-vkuznets@redhat.com


Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1dae2765

arch/x86/kvm/vmx/vmx.c

+5 −0
Original line number Diff line number Diff line
@@ -3039,10 +3039,15 @@ int vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer) 
		return 0;



	vcpu->arch.efer = efer;

#ifdef CONFIG_X86_64

	if (efer & EFER_LMA)

		vm_entry_controls_setbit(vmx, VM_ENTRY_IA32E_MODE);

	else

		vm_entry_controls_clearbit(vmx, VM_ENTRY_IA32E_MODE);

#else

	if (KVM_BUG_ON(efer & EFER_LMA, vcpu->kvm))

		return 1;

#endif



	vmx_setup_uret_msrs(vmx);

	return 0;