Commit b3744c59 authored by Yang Weijiang's avatar Yang Weijiang Committed by Sean Christopherson
Browse files

KVM: x86: Allow setting CR4.CET if IBT or SHSTK is supported 



Drop X86_CR4_CET from CR4_RESERVED_BITS and instead mark CET as reserved
if and only if IBT *and* SHSTK are unsupported, i.e. allow CR4.CET to be
set if IBT or SHSTK is supported.  This creates a virtualization hole if
the CPU supports both IBT and SHSTK, but the kernel or vCPU model only
supports one of the features.  However, it's entirely legal for a CPU to
have only one of IBT or SHSTK, i.e. the hole is a flaw in the architecture,
not in KVM.

More importantly, so long as KVM is careful to initialize and context
switch both IBT and SHSTK state (when supported in hardware) if either
feature is exposed to the guest, a misbehaving guest can only harm itself.
E.g. VMX initializes host CET VMCS fields based solely on hardware
capabilities.

Signed-off-by: default avatarYang Weijiang <weijiang.yang@intel.com>
Signed-off-by: default avatarMathias Krause <minipli@grsecurity.net>
Tested-by: default avatarMathias Krause <minipli@grsecurity.net>
Tested-by: default avatarJohn Allen <john.allen@amd.com>
Tested-by: default avatarRick Edgecombe <rick.p.edgecombe@intel.com>
Signed-off-by: default avatarChao Gao <chao.gao@intel.com>
[sean: split to separate patch, write changelog]
Reviewed-by: default avatarBinbin Wu <binbin.wu@linux.intel.com>
Reviewed-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Link: https://lore.kernel.org/r/20250919223258.1604852-24-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 843af0f2

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ 
			  | X86_CR4_OSXSAVE | X86_CR4_SMEP | X86_CR4_FSGSBASE \

			  | X86_CR4_OSXMMEXCPT | X86_CR4_LA57 | X86_CR4_VMXE \

			  | X86_CR4_SMAP | X86_CR4_PKE | X86_CR4_UMIP \

			  | X86_CR4_LAM_SUP))

			  | X86_CR4_LAM_SUP | X86_CR4_CET))



#define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)

arch/x86/kvm/x86.h

+3 −0
Original line number Diff line number Diff line
@@ -680,6 +680,9 @@ static inline bool __kvm_is_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 
		__reserved_bits |= X86_CR4_PCIDE;       \

	if (!__cpu_has(__c, X86_FEATURE_LAM))           \

		__reserved_bits |= X86_CR4_LAM_SUP;     \

	if (!__cpu_has(__c, X86_FEATURE_SHSTK) &&       \

	    !__cpu_has(__c, X86_FEATURE_IBT))           \

		__reserved_bits |= X86_CR4_CET;         \

	__reserved_bits;                                \

})