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

Pull up following revision(s) (requested by riastradh in ticket #1666): 

sys/dev/nvmm/x86/nvmm_x86_svm.c: revision 1.85

nvmm: Filter CR4 bits on x86 SVM (AMD).

In particular, prohibit PKE, Protection Key Enable, which requires
some additional management of CPU state by nvmm.
This commit is contained in:
martin 2023-07-25 15:35:35 +00:00
parent acb0d2566e
commit d9042f15bc
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/dev/nvmm/x86/nvmm_x86_svm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nvmm_x86_svm.c,v 1.46.4.13 2020/09/13 11:56:44 martin Exp $ */
/* $NetBSD: nvmm_x86_svm.c,v 1.46.4.14 2023/07/25 15:35:35 martin Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.46.4.13 2020/09/13 11:56:44 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.46.4.14 2023/07/25 15:35:35 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -511,6 +511,33 @@ static uint64_t svm_xcr0_mask __read_mostly;
#define CR4_TLB_FLUSH \
(CR4_PSE|CR4_PAE|CR4_PGE|CR4_PCIDE|CR4_SMEP)
#define CR4_VALID \
(CR4_VME | \
CR4_PVI | \
CR4_TSD | \
CR4_DE | \
CR4_PSE | \
CR4_PAE | \
CR4_MCE | \
CR4_PGE | \
CR4_PCE | \
CR4_OSFXSR | \
CR4_OSXMMEXCPT | \
CR4_UMIP | \
/* CR4_LA57 excluded */ \
/* bit 13 reserved on AMD */ \
/* bit 14 reserved on AMD */ \
/* bit 15 reserved on AMD */ \
CR4_FSGSBASE | \
CR4_PCIDE | \
CR4_OSXSAVE | \
/* bit 19 reserved on AMD */ \
CR4_SMEP | \
CR4_SMAP \
/* CR4_PKE excluded */ \
/* CR4_CET excluded */ \
/* bits 24:63 reserved on AMD */)
/* -------------------------------------------------------------------------- */
struct svm_machdata {
@ -1847,6 +1874,7 @@ svm_vcpu_setstate(struct nvmm_cpu *vcpu)
vmcb->state.cr2 = state->crs[NVMM_X64_CR_CR2];
vmcb->state.cr3 = state->crs[NVMM_X64_CR_CR3];
vmcb->state.cr4 = state->crs[NVMM_X64_CR_CR4];
vmcb->state.cr4 &= CR4_VALID;
vmcb->ctrl.v &= ~VMCB_CTRL_V_TPR;
vmcb->ctrl.v |= __SHIFTIN(state->crs[NVMM_X64_CR_CR8],