Module Name: src
Committed By: maxv
Date: Sun Jul 19 06:36:38 UTC 2020
Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_svmfunc.S nvmm_x86_vmx.c
nvmm_x86_vmxfunc.S
Log Message:
The TLB flush IPIs do not respect the IPL, so enforcing IPL_HIGH has no
effect. Disable interrupts earlier instead. This prevents a possible race
against such IPIs.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/nvmm/x86/nvmm_x86_svm.c \
src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S \
src/sys/dev/nvmm/x86/nvmm_x86_vmxfunc.S
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/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.63 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.64
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.63 Fri Jul 3 16:09:54 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Sun Jul 19 06:36:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.63 2020/07/03 16:09:54 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.64 2020/07/19 06:36:37 maxv Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.63 2020/07/03 16:09:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.64 2020/07/19 06:36:37 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,6 +56,18 @@ __KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm
int svm_vmrun(paddr_t, uint64_t *);
+static inline void
+svm_clgi(void)
+{
+ asm volatile ("clgi" ::: "memory");
+}
+
+static inline void
+svm_stgi(void)
+{
+ asm volatile ("stgi" ::: "memory");
+}
+
#define MSR_VM_HSAVE_PA 0xC0010117
/* -------------------------------------------------------------------------- */
@@ -1347,7 +1359,7 @@ svm_vcpu_run(struct nvmm_machine *mach,
struct svm_cpudata *cpudata = vcpu->cpudata;
struct vmcb *vmcb = cpudata->vmcb;
uint64_t machgen;
- int hcpu, s;
+ int hcpu;
if (__predict_false(svm_vcpu_event_commit(vcpu) != 0)) {
return EINVAL;
@@ -1382,11 +1394,11 @@ svm_vcpu_run(struct nvmm_machine *mach,
svm_vmcb_cache_flush(vmcb, VMCB_CTRL_VMCB_CLEAN_I);
}
- s = splhigh();
+ svm_clgi();
machgen = svm_htlb_flush(machdata, cpudata);
svm_vmrun(cpudata->vmcb_pa, cpudata->gprs);
svm_htlb_flush_ack(cpudata, machgen);
- splx(s);
+ svm_stgi();
svm_vmcb_cache_default(vmcb);
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.63 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.64
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.63 Sat Jul 18 20:56:53 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Sun Jul 19 06:36:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.63 2020/07/18 20:56:53 maxv Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.64 2020/07/19 06:36:37 maxv Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.63 2020/07/18 20:56:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.64 2020/07/19 06:36:37 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -178,6 +178,18 @@ vmx_vmclear(paddr_t *pa)
);
}
+static inline void
+vmx_cli(void)
+{
+ asm volatile ("cli" ::: "memory");
+}
+
+static inline void
+vmx_sti(void)
+{
+ asm volatile ("sti" ::: "memory");
+}
+
#define MSR_IA32_FEATURE_CONTROL 0x003A
#define IA32_FEATURE_CONTROL_LOCK __BIT(0)
#define IA32_FEATURE_CONTROL_IN_SMX __BIT(1)
@@ -2043,7 +2055,7 @@ vmx_vcpu_run(struct nvmm_machine *mach,
uint64_t exitcode;
uint64_t intstate;
uint64_t machgen;
- int hcpu, s, ret;
+ int hcpu, ret;
bool launched;
vmx_vmcs_enter(vcpu);
@@ -2088,7 +2100,7 @@ vmx_vcpu_run(struct nvmm_machine *mach,
cpudata->gtsc_want_update = false;
}
- s = splhigh();
+ vmx_cli();
machgen = vmx_htlb_flush(machdata, cpudata);
lcr2(cpudata->gcr2);
if (launched) {
@@ -2098,7 +2110,7 @@ vmx_vcpu_run(struct nvmm_machine *mach,
}
cpudata->gcr2 = rcr2();
vmx_htlb_flush_ack(cpudata, machgen);
- splx(s);
+ vmx_sti();
if (__predict_false(ret != 0)) {
vmx_exit_invalid(exit, -1);
Index: src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S:1.3 src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S:1.4
--- src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S:1.3 Wed Apr 24 18:45:15 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S Sun Jul 19 06:36:37 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: nvmm_x86_svmfunc.S,v 1.3 2019/04/24 18:45:15 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svmfunc.S,v 1.4 2020/07/19 06:36:37 maxv 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
@@ -136,9 +136,6 @@ ENTRY(svm_vmrun)
/* Save the Host GPRs. */
HOST_SAVE_GPRS
- /* Disable Host interrupts. */
- clgi
-
/* Save the Host TR. */
HOST_SAVE_TR
@@ -189,9 +186,6 @@ ENTRY(svm_vmrun)
/* Restore the Host TR. */
HOST_RESTORE_TR
- /* Enable Host interrupts. */
- stgi
-
/* Restore the Host GPRs. */
HOST_RESTORE_GPRS
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmxfunc.S
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmxfunc.S:1.3 src/sys/dev/nvmm/x86/nvmm_x86_vmxfunc.S:1.4
--- src/sys/dev/nvmm/x86/nvmm_x86_vmxfunc.S:1.3 Sat Apr 27 08:16:19 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmxfunc.S Sun Jul 19 06:36:37 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: nvmm_x86_vmxfunc.S,v 1.3 2019/04/27 08:16:19 maxv Exp $ */
+/* $NetBSD: nvmm_x86_vmxfunc.S,v 1.4 2020/07/19 06:36:37 maxv 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
@@ -150,9 +150,6 @@ ENTRY(vmx_vmlaunch)
/* Save the Host GPRs. */
HOST_SAVE_GPRS
- /* Disable Host interrupts. */
- cli
-
/* Save the Host LDT. */
HOST_SAVE_LDT
@@ -174,7 +171,6 @@ ENTRY(vmx_vmlaunch)
/* Failure. */
addq $8,%rsp
HOST_RESTORE_LDT
- sti
HOST_RESTORE_GPRS
movq $-1,%rax
retq
@@ -187,9 +183,6 @@ ENTRY(vmx_vmresume)
/* Save the Host GPRs. */
HOST_SAVE_GPRS
- /* Disable Host interrupts. */
- cli
-
/* Save the Host LDT. */
HOST_SAVE_LDT
@@ -211,7 +204,6 @@ ENTRY(vmx_vmresume)
/* Failure. */
addq $8,%rsp
HOST_RESTORE_LDT
- sti
HOST_RESTORE_GPRS
movq $-1,%rax
retq
@@ -232,9 +224,6 @@ ENTRY(vmx_resume_rip)
/* Restore the Host LDT. */
HOST_RESTORE_LDT
- /* Enable Host interrupts. */
- sti
-
/* Restore the Host GPRs. */
HOST_RESTORE_GPRS
