Thu Jan 9 16:20:12 2020 UTC ()
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.


(maxv)
diff -r1.46 -r1.47 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
cvs diff -r1.46 -r1.47 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c (expand / switch to unified diff)

--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c 2019/12/10 18:06:50 1.46
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c 2020/01/09 16:20:12 1.47
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: nvmm_x86_vmx.c,v 1.46 2019/12/10 18:06:50 ad Exp $ */ 1/* $NetBSD: nvmm_x86_vmx.c,v 1.47 2020/01/09 16:20:12 maxv Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2018-2019 The NetBSD Foundation, Inc. 4 * Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Maxime Villard. 8 * by Maxime Villard.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.46 2019/12/10 18:06:50 ad Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.47 2020/01/09 16:20:12 maxv Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/systm.h> 36#include <sys/systm.h>
37#include <sys/kernel.h> 37#include <sys/kernel.h>
38#include <sys/kmem.h> 38#include <sys/kmem.h>
39#include <sys/cpu.h> 39#include <sys/cpu.h>
40#include <sys/xcall.h> 40#include <sys/xcall.h>
41#include <sys/mman.h> 41#include <sys/mman.h>
42 42
43#include <uvm/uvm.h> 43#include <uvm/uvm.h>
44#include <uvm/uvm_page.h> 44#include <uvm/uvm_page.h>
45 45
46#include <x86/cputypes.h> 46#include <x86/cputypes.h>
@@ -1678,27 +1678,27 @@ vmx_exit_wrmsr(struct nvmm_machine *mach @@ -1678,27 +1678,27 @@ vmx_exit_wrmsr(struct nvmm_machine *mach
1678 1678
1679 inslen = vmx_vmread(VMCS_EXIT_INSTRUCTION_LENGTH); 1679 inslen = vmx_vmread(VMCS_EXIT_INSTRUCTION_LENGTH);
1680 rip = vmx_vmread(VMCS_GUEST_RIP); 1680 rip = vmx_vmread(VMCS_GUEST_RIP);
1681 exit->u.wrmsr.npc = rip + inslen; 1681 exit->u.wrmsr.npc = rip + inslen;
1682 1682
1683 vmx_vcpu_state_provide(vcpu, NVMM_X64_STATE_GPRS); 1683 vmx_vcpu_state_provide(vcpu, NVMM_X64_STATE_GPRS);
1684} 1684}
1685 1685
1686static void 1686static void
1687vmx_exit_xsetbv(struct nvmm_machine *mach, struct nvmm_cpu *vcpu, 1687vmx_exit_xsetbv(struct nvmm_machine *mach, struct nvmm_cpu *vcpu,
1688 struct nvmm_vcpu_exit *exit) 1688 struct nvmm_vcpu_exit *exit)
1689{ 1689{
1690 struct vmx_cpudata *cpudata = vcpu->cpudata; 1690 struct vmx_cpudata *cpudata = vcpu->cpudata;
1691 uint16_t val; 1691 uint64_t val;
1692 1692
1693 exit->reason = NVMM_VCPU_EXIT_NONE; 1693 exit->reason = NVMM_VCPU_EXIT_NONE;
1694 1694
1695 val = (cpudata->gprs[NVMM_X64_GPR_RDX] << 32) | 1695 val = (cpudata->gprs[NVMM_X64_GPR_RDX] << 32) |
1696 (cpudata->gprs[NVMM_X64_GPR_RAX] & 0xFFFFFFFF); 1696 (cpudata->gprs[NVMM_X64_GPR_RAX] & 0xFFFFFFFF);
1697 1697
1698 if (__predict_false(cpudata->gprs[NVMM_X64_GPR_RCX] != 0)) { 1698 if (__predict_false(cpudata->gprs[NVMM_X64_GPR_RCX] != 0)) {
1699 goto error; 1699 goto error;
1700 } else if (__predict_false((val & ~vmx_xcr0_mask) != 0)) { 1700 } else if (__predict_false((val & ~vmx_xcr0_mask) != 0)) {
1701 goto error; 1701 goto error;
1702 } else if (__predict_false((val & XCR0_X87) == 0)) { 1702 } else if (__predict_false((val & XCR0_X87) == 0)) {
1703 goto error; 1703 goto error;
1704 } 1704 }