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

Commit a9c7399d authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Allow internal errors reported to userspace to carry extra data 



Usually userspace will freeze the guest so we can inspect it, but some
internal state is not available.  Add extra data to internal error
reporting so we can expose it to the debugger.  Extra data is specific
to the suberror.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent c54d2aba

arch/x86/kvm/mmu.c

+1 −0
Original line number Diff line number Diff line
@@ -2800,6 +2800,7 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u32 error_code) 
	case EMULATE_FAIL:

		vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;

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

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

		return 0;

	default:

		BUG();

arch/x86/kvm/vmx.c

+1 −0
Original line number Diff line number Diff line
@@ -3352,6 +3352,7 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu) 
			kvm_report_emulation_failure(vcpu, "emulation failure");

			vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;

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

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

			ret = 0;

			goto out;

		}

include/linux/kvm.h

+4 −0
Original line number Diff line number Diff line
@@ -251,6 +251,9 @@ struct kvm_run { 
		} dcr;

		struct {

			__u32 suberror;

			/* Available with KVM_CAP_INTERNAL_ERROR_DATA: */

			__u32 ndata;

			__u64 data[16];

		} internal;

		/* Fix the size of the union. */

		char padding[256];
@@ -484,6 +487,7 @@ struct kvm_ioeventfd { 
#define KVM_CAP_XEN_HVM 38

#endif

#define KVM_CAP_ADJUST_CLOCK 39

#define KVM_CAP_INTERNAL_ERROR_DATA 40



#ifdef KVM_CAP_IRQ_ROUTING

virt/kvm/kvm_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1653,6 +1653,7 @@ static long kvm_dev_ioctl_check_extension_generic(long arg) 
#ifdef CONFIG_KVM_APIC_ARCHITECTURE

	case KVM_CAP_SET_BOOT_CPU_ID:

#endif

	case KVM_CAP_INTERNAL_ERROR_DATA:

		return 1;

#ifdef CONFIG_HAVE_KVM_IRQCHIP

	case KVM_CAP_IRQ_ROUTING: