[src/netbsd-9]: src Pull up following revision(s) (requested by maxv in ticke...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/51efc66b7c74
branches:  netbsd-9
changeset: 963594:51efc66b7c74
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Feb 10 19:05:05 2020 +0000

description:
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).

diffstat:

 lib/libnvmm/libnvmm.3           |  9 +++++----
 share/man/man4/nvmm.4           |  9 +++++----
 sys/dev/nvmm/x86/nvmm_x86_vmx.c |  6 +++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diffs (89 lines):

diff -r b4086665b077 -r 51efc66b7c74 lib/libnvmm/libnvmm.3
--- a/lib/libnvmm/libnvmm.3     Mon Feb 10 18:59:48 2020 +0000
+++ b/lib/libnvmm/libnvmm.3     Mon Feb 10 19:05:05 2020 +0000
@@ -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 @@
 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 .
diff -r b4086665b077 -r 51efc66b7c74 share/man/man4/nvmm.4
--- a/share/man/man4/nvmm.4     Mon Feb 10 18:59:48 2020 +0000
+++ b/share/man/man4/nvmm.4     Mon Feb 10 19:05:05 2020 +0000
@@ -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-VMX, for x86 Intel CPUs
 .El
 .Sh SEE ALSO
-.Xr libnvmm 3
+.Xr libnvmm 3 ,
+.Xr nvmmctl 8
 .Sh AUTHORS
 The
 .Nm
diff -r b4086665b077 -r 51efc66b7c74 sys/dev/nvmm/x86/nvmm_x86_vmx.c
--- a/sys/dev/nvmm/x86/nvmm_x86_vmx.c   Mon Feb 10 18:59:48 2020 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86_vmx.c   Mon Feb 10 19:05:05 2020 +0000
@@ -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 @@
     struct nvmm_vcpu_exit *exit)
 {
        struct vmx_cpudata *cpudata = vcpu->cpudata;
-       uint16_t val;
+       uint64_t val;
 
        exit->reason = NVMM_VCPU_EXIT_NONE;