Module Name: src
Committed By: maxv
Date: Sun Apr 7 14:28:50 UTC 2019
Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_vmx.c
Log Message:
Invert the filtering priority: now the kernel-managed cpuid leaves are
overwritable by the virtualizer. This is useful to virtualizers that want
to 100% control every leaf.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
cvs rdiff -u -r1.24 -r1.25 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/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.37 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.38
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.37 Sat Apr 6 11:49:53 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Sun Apr 7 14:28:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.37 2019/04/06 11:49:53 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.38 2019/04/07 14:28:50 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.37 2019/04/06 11:49:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.38 2019/04/07 14:28:50 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -853,6 +853,8 @@ svm_exit_cpuid(struct nvmm_machine *mach
cpudata->gprs[NVMM_X64_GPR_RCX] = descs[2];
cpudata->gprs[NVMM_X64_GPR_RDX] = descs[3];
+ svm_inkernel_handle_cpuid(vcpu, eax, ecx);
+
for (i = 0; i < SVM_NCPUIDS; i++) {
cpuid = &machdata->cpuid[i];
if (!machdata->cpuidpresent[i]) {
@@ -877,9 +879,6 @@ svm_exit_cpuid(struct nvmm_machine *mach
break;
}
- /* Overwrite non-tunable leaves. */
- svm_inkernel_handle_cpuid(vcpu, eax, ecx);
-
svm_inkernel_advance(cpudata->vmcb);
exit->reason = NVMM_EXIT_NONE;
}
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.24 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.25
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.24 Sat Apr 6 11:49:53 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Sun Apr 7 14:28:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.24 2019/04/06 11:49:53 maxv Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.25 2019/04/07 14:28:50 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.24 2019/04/06 11:49:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.25 2019/04/07 14:28:50 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1169,6 +1169,8 @@ vmx_exit_cpuid(struct nvmm_machine *mach
cpudata->gprs[NVMM_X64_GPR_RCX] = descs[2];
cpudata->gprs[NVMM_X64_GPR_RDX] = descs[3];
+ vmx_inkernel_handle_cpuid(vcpu, eax, ecx);
+
for (i = 0; i < VMX_NCPUIDS; i++) {
cpuid = &machdata->cpuid[i];
if (!machdata->cpuidpresent[i]) {
@@ -1193,9 +1195,6 @@ vmx_exit_cpuid(struct nvmm_machine *mach
break;
}
- /* Overwrite non-tunable leaves. */
- vmx_inkernel_handle_cpuid(vcpu, eax, ecx);
-
vmx_inkernel_advance();
exit->reason = NVMM_EXIT_NONE;
}
