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

Commit 5120702e authored by Mohammed Gamal's avatar Mohammed Gamal Committed by Avi Kivity
Browse files

KVM: VMX: Properly return error to userspace on vmentry failure 



The vmexit handler returns KVM_EXIT_UNKNOWN since there is no handler
for vmentry failures. This intercepts vmentry failures and returns
KVM_FAIL_ENTRY to userspace instead.

Signed-off-by: default avatarMohammed Gamal <m.gamal005@gmail.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent b66d8000

arch/x86/kvm/vmx.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -3665,6 +3665,13 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu) 
	if (enable_ept && is_paging(vcpu))

	if (enable_ept && is_paging(vcpu))

		vcpu->arch.cr3 = vmcs_readl(GUEST_CR3);

		vcpu->arch.cr3 = vmcs_readl(GUEST_CR3);





	if (exit_reason & VMX_EXIT_REASONS_FAILED_VMENTRY) {

		vcpu->run->exit_reason = KVM_EXIT_FAIL_ENTRY;

		vcpu->run->fail_entry.hardware_entry_failure_reason

			= exit_reason;

		return 0;

	}



	if (unlikely(vmx->fail)) {

	if (unlikely(vmx->fail)) {

		vcpu->run->exit_reason = KVM_EXIT_FAIL_ENTRY;

		vcpu->run->exit_reason = KVM_EXIT_FAIL_ENTRY;

		vcpu->run->fail_entry.hardware_entry_failure_reason

		vcpu->run->fail_entry.hardware_entry_failure_reason