Commit 1abf23fb authored Sep 26, 2018 by Sean Christopherson Committed by Paolo Bonzini Oct 17, 2018

KVM: nVMX: use vm_exit_controls_init() to write exit controls for vmcs02

Write VM_EXIT_CONTROLS using vm_exit_controls_init() when configuring
vmcs02, otherwise vm_exit_controls_shadow will be stale. EFER in
particular can be corrupted if VM_EXIT_LOAD_IA32_EFER is not updated
due to an incorrect shadow optimization, which can crash L0 due to
EFER not being loaded on exit. This does not occur with the current
code base simply because update_transition_efer() unconditionally
clears VM_EXIT_LOAD_IA32_EFER before conditionally setting it, and
because a nested guest always starts with VM_EXIT_LOAD_IA32_EFER
clear, i.e. we'll only ever unnecessarily clear the bit. That is,
until someone optimizes update_transition_efer()...

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 5b8ba41d

arch/x86/kvm/vmx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -12262,7 +12262,7 @@ static int prepare_vmcs02(struct kvm_vcpu vcpu, struct vmcs12 vmcs12,
		* we should use its exit controls. Note that VM_EXIT_LOAD_IA32_EFER
		* bits are further modified by vmx_set_efer() below.
		*/
		vmcs_write32(VM_EXIT_CONTROLS, vmcs_config.vmexit_ctrl);
		vm_exit_controls_init(vmx, vmcs_config.vmexit_ctrl);

		/* vmcs12's VM_ENTRY_LOAD_IA32_EFER and VM_ENTRY_IA32E_MODE are
		* emulated by vmx_set_efer(), below.

Admin message