Module Name: src
Committed By: martin
Date: Mon Feb 10 19:05:05 UTC 2020
Modified Files:
src/lib/libnvmm [netbsd-9]: libnvmm.3
src/share/man/man4 [netbsd-9]: nvmm.4
src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86_vmx.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #688):
share/man/man4/nvmm.4: revision 1.5
lib/libnvmm/libnvmm.3: revision 1.26
sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.47
Mmh, as noted in PR/54847, this should be uint64_t, not uint16_t. Harmless
because we use only the two lowest bits anyway.
I believe this could be caught by KUBSAN; time to do another round of
NVMM+K_SAN testing.
Reference nvmmctl(8).
To generate a diff of this commit:
cvs rdiff -u -r1.19.4.1 -r1.19.4.2 src/lib/libnvmm/libnvmm.3
cvs rdiff -u -r1.4 -r1.4.4.1 src/share/man/man4/nvmm.4
cvs rdiff -u -r1.36.2.4 -r1.36.2.5 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/lib/libnvmm/libnvmm.3
diff -u src/lib/libnvmm/libnvmm.3:1.19.4.1 src/lib/libnvmm/libnvmm.3:1.19.4.2
--- src/lib/libnvmm/libnvmm.3:1.19.4.1 Sun Nov 10 12:58:30 2019
+++ src/lib/libnvmm/libnvmm.3 Mon Feb 10 19:05:05 2020
@@ -1,6 +1,6 @@
-.\" $NetBSD: libnvmm.3,v 1.19.4.1 2019/11/10 12:58:30 martin Exp $
+.\" $NetBSD: libnvmm.3,v 1.19.4.2 2020/02/10 19:05:05 martin Exp $
.\"
-.\" Copyright (c) 2018, 2019 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 28, 2019
+.Dd February 9, 2020
.Dt LIBNVMM 3
.Os
.Sh NAME
@@ -733,7 +733,8 @@ A query was made on a machine or a VCPU
An attempt was made to access a machine that does not belong to the process.
.El
.Sh SEE ALSO
-.Xr nvmm 4
+.Xr nvmm 4 ,
+.Xr nvmmctl 8
.Sh AUTHORS
NVMM was designed and implemented by
.An Maxime Villard .
Index: src/share/man/man4/nvmm.4
diff -u src/share/man/man4/nvmm.4:1.4 src/share/man/man4/nvmm.4:1.4.4.1
--- src/share/man/man4/nvmm.4:1.4 Thu Mar 28 19:00:40 2019
+++ src/share/man/man4/nvmm.4 Mon Feb 10 19:05:05 2020
@@ -1,6 +1,6 @@
-.\" $NetBSD: nvmm.4,v 1.4 2019/03/28 19:00:40 maxv Exp $
+.\" $NetBSD: nvmm.4,v 1.4.4.1 2020/02/10 19:05:05 martin Exp $
.\"
-.\" Copyright (c) 2018 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" This code is derived from software contributed to The NetBSD Foundation
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd March 28, 2019
+.Dd February 9, 2020
.Dt NVMM 4
.Os
.Sh NAME
@@ -54,7 +54,8 @@ x86-SVM, for x86 AMD CPUs
x86-VMX, for x86 Intel CPUs
.El
.Sh SEE ALSO
-.Xr libnvmm 3
+.Xr libnvmm 3 ,
+.Xr nvmmctl 8
.Sh AUTHORS
The
.Nm
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36.2.4 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36.2.5
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36.2.4 Mon Nov 25 16:39:30 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Mon Feb 10 19:05:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.36.2.4 2019/11/25 16:39:30 martin Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.36.2.5 2020/02/10 19:05:05 martin Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.36.2.4 2019/11/25 16:39:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.36.2.5 2020/02/10 19:05:05 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1690,7 +1690,7 @@ vmx_exit_xsetbv(struct nvmm_machine *mac
struct nvmm_vcpu_exit *exit)
{
struct vmx_cpudata *cpudata = vcpu->cpudata;
- uint16_t val;
+ uint64_t val;
exit->reason = NVMM_VCPU_EXIT_NONE;
