Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorder the detection in vmx_ident(), to fix panic on old CPUs. We must

Browse Source 
read MSR_IA32_VMX_EPT_VPID_CAP _after_ ensuring EPT is there, because if
it's not, the rdmsr faults.
This commit is contained in:
maxv 2019-02-21 13:25:44 +00:00
parent fa98071a47
commit 01d6ce2a3a
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/dev/nvmm/x86/nvmm_x86_vmx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nvmm_x86_vmx.c,v 1.9 2019/02/21 12:17:52 maxv Exp $ */
/* $NetBSD: nvmm_x86_vmx.c,v 1.10 2019/02/21 13:25:44 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.9 2019/02/21 12:17:52 maxv Exp $");
__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.10 2019/02/21 13:25:44 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -2655,23 +2655,6 @@ vmx_ident(void)
return false;
}
msr = rdmsr(MSR_IA32_VMX_EPT_VPID_CAP);
if ((msr & IA32_VMX_EPT_VPID_WALKLENGTH_4) == 0) {
return false;
}
if ((msr & IA32_VMX_EPT_VPID_INVEPT) == 0) {
return false;
}
if ((msr & IA32_VMX_EPT_VPID_INVVPID) == 0) {
return false;
}
if ((msr & IA32_VMX_EPT_VPID_FLAGS_AD) == 0) {
return false;
}
if (!(msr & IA32_VMX_EPT_VPID_UC) && !(msr & IA32_VMX_EPT_VPID_WB)) {
return false;
}
/* PG and PE are reported, even if Unrestricted Guests is supported. */
vmx_cr0_fixed0 = rdmsr(MSR_IA32_VMX_CR0_FIXED0) & ~(CR0_PG|CR0_PE);
vmx_cr0_fixed1 = rdmsr(MSR_IA32_VMX_CR0_FIXED1) | (CR0_PG|CR0_PE);
@ -2724,6 +2707,23 @@ vmx_ident(void)
return false;
}
msr = rdmsr(MSR_IA32_VMX_EPT_VPID_CAP);
if ((msr & IA32_VMX_EPT_VPID_WALKLENGTH_4) == 0) {
return false;
}
if ((msr & IA32_VMX_EPT_VPID_INVEPT) == 0) {
return false;
}
if ((msr & IA32_VMX_EPT_VPID_INVVPID) == 0) {
return false;
}
if ((msr & IA32_VMX_EPT_VPID_FLAGS_AD) == 0) {
return false;
}
if (!(msr & IA32_VMX_EPT_VPID_UC) && !(msr & IA32_VMX_EPT_VPID_WB)) {
return false;
}
return true;
}