x86: Add tests for user-mode CET
PATCH 1/1 x86: Add tests for user-mode CET
This unit-test is intended to test user-mode CET support of KVM, it's tested on Intel new platform. Two CET features: Shadow Stack Protection(SHSTK) and Indirect-Branch Tracking(IBT) are enclosed.
In SHSTK test, if the function return-address in normal stack is tampered with a value not equal to the one on shadow-stack, #CP (Control Protection Exception)will generated on function returning. This feature is supported by processor itself, no compiler/link option is required.
However, to enabled IBT, we need to add -fcf-protection=full in compiler options, this makes the compiler insert endbr64 at the very beginning of each jmp/call target given the binary is for x86_64.
To get PASS results, the following conditions must be met:
1) The processor is powered with CET feature.
2) The kernel is patched with the latest CET kernel patches.
3) The KVM and QEMU are patched with the latest CET patches.
4) Use CET-enabled gcc to compile the test app.
--- lib/x86/desc.c | 2 + lib/x86/msr.h | 2 + lib/x86/processor.h | 3 + x86/Makefile.common | 3 +- x86/Makefile.x86_64 | 3 +- x86/cet.c | 212 ++++++++++++++++++++++++++++++++++++++++++++ x86/unittests.cfg | 6 ++ 7 files changed, 229 insertions(+), 2 deletions(-) create mode 100644 x86/cet.c
lib/x86/desc.c +2 -0
@@ -179,6 +179,7 @@ EX(mf, 16);EX_E (ac,17 );EX (mc,18 );EX (xm,19 ); +EX_E (cp,21 ); asm (".pushsection .text \n\t" "__handle_exception: \n\t"
@@ -224,6 +225,7 @@ static void *idt_handlers[32] = { [17] = &ac_fault, [18] = &mc_fault, [19] = &xm_fault, + [21] = &cp_fault, };void setup_idt (void )
lib/x86/msr.h +2 -0
@@ -208,6 +208,8 @@#define MSR_IA32_EBL_CR_POWERON 0x0000002a#define MSR_IA32_FEATURE_CONTROL 0x0000003a#define MSR_IA32_TSC_ADJUST 0x0000003b +#define MSR_IA32_U_CET 0x000006a0 +#define MSR_IA32_PL3_SSP 0x000006a7#define FEATURE_CONTROL_LOCKED (1<<0)#define FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX (1<<1)
lib/x86/processor.h +3 -0
@@ -44,6 +44,7 @@#define X86_CR4_SMEP 0x00100000#define X86_CR4_SMAP 0x00200000#define X86_CR4_PKE 0x00400000 +#define X86_CR4_CET 0x00800000#define X86_EFLAGS_CF 0x00000001#define X86_EFLAGS_FIXED 0x00000002
@@ -149,8 +150,10 @@ static inline u8 cpuid_maxphyaddr(void)#define X86_FEATURE_PKU (CPUID(0x7, 0, ECX, 3))#define X86_FEATURE_LA57 (CPUID(0x7, 0, ECX, 16))#define X86_FEATURE_RDPID (CPUID(0x7, 0, ECX, 22)) +#define X86_FEATURE_SHSTK (CPUID(0x7, 0, ECX, 7))#define X86_FEATURE_SPEC_CTRL (CPUID(0x7, 0, EDX, 26))#define X86_FEATURE_ARCH_CAPABILITIES (CPUID(0x7, 0, EDX, 29)) +#define X86_FEATURE_IBT (CPUID(0x7, 0, EDX, 20))#define X86_FEATURE_NX (CPUID(0x80000001, 0, EDX, 20))#define X86_FEATURE_RDPRU (CPUID(0x80000008, 0, EBX, 4))
x86/Makefile.common +2 -1
@@ -58,7 +58,8 @@ tests-common = $(TEST_DIR)/vmexit.flat $(TEST_DIR)/tsc.flat \ $(TEST_DIR)/init.flat $(TEST_DIR)/smap.flat \ $(TEST_DIR)/hyperv_synic.flat $(TEST_DIR)/hyperv_stimer.flat \ $(TEST_DIR)/hyperv_connections.flat \ - $(TEST_DIR)/umip.flat $(TEST_DIR)/tsx-ctrl.flat + $(TEST_DIR)/umip.flat $(TEST_DIR)/tsx-ctrl.flat \ + $(TEST_DIR)/cet.flat test_cases: $(tests-common) $(tests)
x86/Makefile.x86_64 +2 -1
@@ -1,7 +1,7 @@ cstart.o = $(TEST_DIR)/cstart64.o bits = 64 ldarch = elf64-x86-64 -COMMON_CFLAGS += -mno-red-zone -mno-sse -mno-sse2 +COMMON_CFLAGS += -mno-red-zone -mno-sse -mno-sse2 -fcf-protection=full cflatobjs += lib/x86/setjmp64.o cflatobjs += lib/x86/intel-iommu.o
@@ -20,6 +20,7 @@ tests += $(TEST_DIR)/tscdeadline_latency.flat tests += $(TEST_DIR)/intel-iommu.flat tests += $(TEST_DIR)/vmware_backdoors.flat tests += $(TEST_DIR)/rdpru.flat +tests += $(TEST_DIR)/cet.flat include $(SRCDIR)/$(TEST_DIR)/Makefile.common
x86/cet.c new file +212 -0
212 lines not on this page · raw message
x86/unittests.cfg +6 -0
@@ -346,3 +346,9 @@ extra_params = -M q35,kernel-irqchip=split -device intel-iommu,intremap=on,eim=o file = tsx-ctrl.flat extra_params = -cpu host groups = tsx-ctrl + +[intel_cet] +file = cet.flat +arch = x86_64 +smp = 2 +extra_params = -enable-kvm -m 2048 -cpu host
Signature · 1 line
2.17.2