Commit 65ac7264 authored by Avi Kivity's avatar Avi Kivity

KVM: VMX: Report unexpected simultaneous exceptions as internal errors

These happen when we trap an exception when another exception is being
delivered; we only expect these with MCEs and page faults.  If something
unexpected happens, things probably went south and we're better off reporting
an internal error and freezing.
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent a9c7399d
...@@ -2744,9 +2744,14 @@ static int handle_exception(struct kvm_vcpu *vcpu) ...@@ -2744,9 +2744,14 @@ static int handle_exception(struct kvm_vcpu *vcpu)
return handle_machine_check(vcpu); return handle_machine_check(vcpu);
if ((vect_info & VECTORING_INFO_VALID_MASK) && if ((vect_info & VECTORING_INFO_VALID_MASK) &&
!is_page_fault(intr_info)) !is_page_fault(intr_info)) {
printk(KERN_ERR "%s: unexpected, vectoring info 0x%x " vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
"intr info 0x%x\n", __func__, vect_info, intr_info); vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_SIMUL_EX;
vcpu->run->internal.ndata = 2;
vcpu->run->internal.data[0] = vect_info;
vcpu->run->internal.data[1] = intr_info;
return 0;
}
if ((intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR) if ((intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR)
return 1; /* already handled by vmx_vcpu_run() */ return 1; /* already handled by vmx_vcpu_run() */
......
...@@ -163,6 +163,7 @@ struct kvm_pit_config { ...@@ -163,6 +163,7 @@ struct kvm_pit_config {
/* For KVM_EXIT_INTERNAL_ERROR */ /* For KVM_EXIT_INTERNAL_ERROR */
#define KVM_INTERNAL_ERROR_EMULATION 1 #define KVM_INTERNAL_ERROR_EMULATION 1
#define KVM_INTERNAL_ERROR_SIMUL_EX 2
/* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */ /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */
struct kvm_run { struct kvm_run {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment