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

Commit b9bf6882 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: VMX: report internal error for the unhandleable event 



VM exits during Event Delivery is really unexpected if it is not caused
by Exceptions/EPT-VIOLATION/TASK_SWITCH, we'd better to report an internal
and freeze the guest, the VMM has the chance to check the guest

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 471842ec

arch/x86/kvm/vmx.c

+15 −4
Original line number Diff line number Diff line
@@ -5979,13 +5979,24 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu) 
		return 0;

	}



	/*

	 * Note:

	 * Do not try to fix EXIT_REASON_EPT_MISCONFIG if it caused by

	 * delivery event since it indicates guest is accessing MMIO.

	 * The vm-exit can be triggered again after return to guest that

	 * will cause infinite loop.

	 */

	if ((vectoring_info & VECTORING_INFO_VALID_MASK) &&

			(exit_reason != EXIT_REASON_EXCEPTION_NMI &&

			exit_reason != EXIT_REASON_EPT_VIOLATION &&

			exit_reason != EXIT_REASON_TASK_SWITCH))

		printk(KERN_WARNING "%s: unexpected, valid vectoring info "

		       "(0x%x) and exit reason is 0x%x\n",

		       __func__, vectoring_info, exit_reason);

			exit_reason != EXIT_REASON_TASK_SWITCH)) {

		vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;

		vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_DELIVERY_EV;

		vcpu->run->internal.ndata = 2;

		vcpu->run->internal.data[0] = vectoring_info;

		vcpu->run->internal.data[1] = exit_reason;

		return 0;

	}



	if (unlikely(!cpu_has_virtual_nmis() && vmx->soft_vnmi_blocked &&

	    !(is_guest_mode(vcpu) && nested_cpu_has_virtual_nmis(

include/linux/kvm.h

+6 −2
Original line number Diff line number Diff line
@@ -170,8 +170,12 @@ struct kvm_pit_config { 
#define KVM_EXIT_WATCHDOG         21



/* For KVM_EXIT_INTERNAL_ERROR */

/* Emulate instruction failed. */

#define KVM_INTERNAL_ERROR_EMULATION	1

/* Encounter unexpected simultaneous exceptions. */

#define KVM_INTERNAL_ERROR_SIMUL_EX	2

/* Encounter unexpected vm-exit due to delivery event. */

#define KVM_INTERNAL_ERROR_DELIVERY_EV	3



/* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */

struct kvm_run {