From f2c53a98916fbf2a27649ae004f7e253f0e17d30 Mon Sep 17 00:00:00 2001 From: "Li, Fei1" Date: Wed, 29 May 2019 22:02:24 +0800 Subject: [PATCH] hv: vmcs: trap CR4.SMAP/SMEP/PKE setting FuSa requires setting CR4.SMAP/SMEP/PKE will invalidate the TLB. However, setting CR4.SMAP will invalidate the TLB on native while not in non-root mode. To make sure this, we will trap CR4.SMAP/SMEP/PKE setting to invalidate the TLB in root mode. Tracked-On: #2561 Signed-off-by: Li, Fei1 Acked-by: Anthony Xu --- hypervisor/arch/x86/guest/virtual_cr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypervisor/arch/x86/guest/virtual_cr.c b/hypervisor/arch/x86/guest/virtual_cr.c index 23a20a459..2dbd7cd2a 100644 --- a/hypervisor/arch/x86/guest/virtual_cr.c +++ b/hypervisor/arch/x86/guest/virtual_cr.c @@ -26,7 +26,7 @@ CR0_NE | CR0_ET | CR0_TS | CR0_EM | CR0_MP | CR0_PE) /* CR4 bits hv want to trap to track status change */ -#define CR4_TRAP_MASK (CR4_PSE | CR4_PAE | CR4_VMXE | CR4_PCIDE) +#define CR4_TRAP_MASK (CR4_PSE | CR4_PAE | CR4_VMXE | CR4_PCIDE | CR4_SMEP | CR4_SMAP | CR4_PKE) #define CR4_RESERVED_MASK ~(CR4_VME | CR4_PVI | CR4_TSD | CR4_DE | CR4_PSE | \ CR4_PAE | CR4_MCE | CR4_PGE | CR4_PCE | \ CR4_OSFXSR | CR4_PCIDE | CR4_OSXSAVE | \