Module Name: src
Committed By: maxv
Date: Wed Apr 24 18:19:28 UTC 2019
Modified Files:
src/sys/dev/nvmm: nvmm.h
src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_vmx.c
Log Message:
Provide the hardware error code for NVMM_EXIT_INVALID, useful when
debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/nvmm/nvmm.h
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/nvmm.h
diff -u src/sys/dev/nvmm/nvmm.h:1.5 src/sys/dev/nvmm/nvmm.h:1.6
--- src/sys/dev/nvmm/nvmm.h:1.5 Thu Mar 21 20:21:40 2019
+++ src/sys/dev/nvmm/nvmm.h Wed Apr 24 18:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm.h,v 1.5 2019/03/21 20:21:40 maxv Exp $ */
+/* $NetBSD: nvmm.h,v 1.6 2019/04/24 18:19:28 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -103,6 +103,10 @@ struct nvmm_exit_insn {
uint64_t npc;
};
+struct nvmm_exit_invalid {
+ uint64_t hwcode;
+};
+
struct nvmm_exit {
enum nvmm_exit_reason reason;
union {
@@ -110,6 +114,7 @@ struct nvmm_exit {
struct nvmm_exit_io io;
struct nvmm_exit_msr msr;
struct nvmm_exit_insn insn;
+ struct nvmm_exit_invalid inv;
} u;
uint64_t exitstate[8];
};
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.39 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.40
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.39 Sat Apr 20 08:45:30 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Wed Apr 24 18:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.39 2019/04/20 08:45:30 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.40 2019/04/24 18:19:28 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.39 2019/04/20 08:45:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.40 2019/04/24 18:19:28 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1118,6 +1118,13 @@ error:
svm_inject_gp(mach, vcpu);
}
+static void
+svm_exit_invalid(struct nvmm_exit *exit, uint64_t code)
+{
+ exit->u.inv.hwcode = code;
+ exit->reason = NVMM_EXIT_INVALID;
+}
+
/* -------------------------------------------------------------------------- */
static void
@@ -1364,7 +1371,7 @@ svm_vcpu_run(struct nvmm_machine *mach,
break;
case VMCB_EXITCODE_FERR_FREEZE: /* ? */
default:
- exit->reason = NVMM_EXIT_INVALID;
+ svm_exit_invalid(exit, vmcb->ctrl.exitcode);
break;
}
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.26 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.27
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.26 Sat Apr 20 08:45:30 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Wed Apr 24 18:19:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.26 2019/04/20 08:45:30 maxv Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.27 2019/04/24 18:19:28 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.26 2019/04/20 08:45:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.27 2019/04/24 18:19:28 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1623,6 +1623,13 @@ vmx_exit_epf(struct nvmm_machine *mach,
exit->u.mem.inst_len = 0;
}
+static void
+vmx_exit_invalid(struct nvmm_exit *exit, uint64_t code)
+{
+ exit->u.inv.hwcode = code;
+ exit->reason = NVMM_EXIT_INVALID;
+}
+
/* -------------------------------------------------------------------------- */
static void
@@ -1917,7 +1924,7 @@ vmx_vcpu_run(struct nvmm_machine *mach,
exit->reason = NVMM_EXIT_NMI_READY;
break;
default:
- exit->reason = NVMM_EXIT_INVALID;
+ vmx_exit_invalid(exit, exitcode);
break;
}
