Paravirtualized control register pinning test
cover Paravirtualized control register pinning test
This is the corresponding test for
https://lore.kernel.org/kvm/[email protected]/T/#t
Thank you!
John Andersen (1):
x86: Add control register pinning test
x86/Makefile.common | 3 +- lib/x86/desc.h | 1 + lib/x86/processor.h | 1 + lib/x86/desc.c | 8 +++ x86/cr_pin.c | 163 ++++++++++++++++++++++++++++++++++++++++++++ x86/pcid.c | 8 --- x86/unittests.cfg | 4 ++ 7 files changed, 179 insertions(+), 9 deletions(-) create mode 100644 x86/cr_pin.c
Signature · 1 line
2.21.0
PATCH 1/1 x86: Add control register pinning test
Paravirutalized control register pinning adds MSRs guests can use to discover which bits in CR0/4 they may pin, and MSRs for activating pinning for any of those bits.
We check that the bits allowed to be pinned for CR4 are UMIP, SMEP, and SMAP. Only WP should be allowed to be pinned in CR0.
We turn on all of the allowed bits, pin them, then attempt to disable them. We verify that the attempt to disable was unsuccessful, and that it generated a general protection fault.
--- x86/Makefile.common | 3 +- lib/x86/desc.h | 1 + lib/x86/processor.h | 1 + lib/x86/desc.c | 8 +++ x86/cr_pin.c | 163 ++++++++++++++++++++++++++++++++++++++++++++ x86/pcid.c | 8 --- x86/unittests.cfg | 4 ++ 7 files changed, 179 insertions(+), 9 deletions(-) create mode 100644 x86/cr_pin.c
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)/cr_pin.flat test_cases: $(tests-common) $(tests)
lib/x86/desc.h +1 -0
@@ -216,6 +216,7 @@ extern tss64_t tss;#endif unsigned exception_vector (void ); +int write_cr0_checking (unsigned long val);int write_cr4_checking (unsigned long val);unsigned exception_error_code (void );bool exception_rflags_rf (void );
lib/x86/processor.h +1 -0
@@ -141,6 +141,7 @@ static inline u8 cpuid_maxphyaddr(void)#define X86_FEATURE_SMEP (CPUID(0x7, 0, EBX, 7))#define X86_FEATURE_INVPCID (CPUID(0x7, 0, EBX, 10))#define X86_FEATURE_RTM (CPUID(0x7, 0, EBX, 11)) +#define X86_FEATURE_SMEP (CPUID(0x7, 0, EBX, 7))#define X86_FEATURE_SMAP (CPUID(0x7, 0, EBX, 20))#define X86_FEATURE_PCOMMIT (CPUID(0x7, 0, EBX, 22))#define X86_FEATURE_CLFLUSHOPT (CPUID(0x7, 0, EBX, 23))
lib/x86/desc.c +8 -0
@@ -251,6 +251,14 @@ unsigned exception_vector(void)return vector; } +int write_cr0_checking (unsigned long val) +{ + asm volatile(ASM_TRY("1f") + "mov %0, %%cr0\n\t" + "1:": : "r" (val)); +return exception_vector (); +} +int write_cr4_checking (unsigned long val) { asm volatile(ASM_TRY("1f")
x86/cr_pin.c new file +163 -0
163 lines not on this page · raw message
x86/pcid.c +0 -8
@@ -10,14 +10,6 @@ struct invpcid_desc { unsigned long addr : 64; }; -static int write_cr0_checking (unsigned long val) -{ - asm volatile(ASM_TRY("1f") - "mov %0, %%cr0\n\t" - "1:": : "r" (val)); -return exception_vector (); -} -static int invpcid_checking (unsigned long type,void *desc) { asm volatile (ASM_TRY("1f")
x86/unittests.cfg +4 -0
@@ -245,6 +245,10 @@ arch = x86_64 file = umip.flat extra_params = -cpu qemu64,+umip +[cr_pin] +file = cr_pin.flat +extra_params = -cpu qemu64,+umip,+smap,+smep + [vmx] file = vmx.flat extra_params = -cpu host,+vmx -append "-exit_monitor_from_l2_test -ept_access* -vmx_smp* -vmx_vmcs_shadow_test -atomic_switch_overflow_msrs_test -vmx_init_signal_test -vmx_apic_passthrough_tpr_threshold_test"
Signature · 1 line
2.21.0