Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10ba54a5 authored by Jan Kiszka's avatar Jan Kiszka Committed by Paolo Bonzini
Browse files

KVM: nVMX: Implement support for EFER saving on VM-exit 



Implement and advertise VM_EXIT_SAVE_IA32_EFER. L0 traps EFER writes
unconditionally, so we always find the current L2 value in the
architectural state.

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

arch/x86/kvm/vmx.c

+3 −1
Original line number Diff line number Diff line
@@ -2206,7 +2206,7 @@ static __init void nested_vmx_setup_ctls_msrs(void) 
#endif

		VM_EXIT_LOAD_IA32_PAT | VM_EXIT_SAVE_IA32_PAT;

	nested_vmx_exit_ctls_high |= (VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR |

				      VM_EXIT_LOAD_IA32_EFER);

		VM_EXIT_LOAD_IA32_EFER | VM_EXIT_SAVE_IA32_EFER);



	/* entry controls */

	rdmsr(MSR_IA32_VMX_ENTRY_CTLS,
@@ -8130,6 +8130,8 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) 
	vmcs12->guest_ia32_debugctl = vmcs_read64(GUEST_IA32_DEBUGCTL);

	if (vmcs12->vm_exit_controls & VM_EXIT_SAVE_IA32_PAT)

		vmcs12->guest_ia32_pat = vmcs_read64(GUEST_IA32_PAT);

	if (vmcs12->vm_exit_controls & VM_EXIT_SAVE_IA32_EFER)

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

	vmcs12->guest_sysenter_cs = vmcs_read32(GUEST_SYSENTER_CS);

	vmcs12->guest_sysenter_esp = vmcs_readl(GUEST_SYSENTER_ESP);

	vmcs12->guest_sysenter_eip = vmcs_readl(GUEST_SYSENTER_EIP);