[kvm-unit-tests,12/16] svm: move setup_svm to svm_lib.c

Message ID	20221020152404.283980-13-mlevitsk@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> From: Maxim Levitsky <mlevitsk@redhat.com> To: kvm@vger.kernel.org Cc: Maxim Levitsky <mlevitsk@redhat.com>, Cathy Avery <cavery@redhat.com>, Paolo Bonzini <pbonzini@redhat.com> Subject: [kvm-unit-tests PATCH 12/16] svm: move setup_svm to svm_lib.c Date: Thu, 20 Oct 2022 18:24:00 +0300 Message-Id: <20221020152404.283980-13-mlevitsk@redhat.com> In-Reply-To: <20221020152404.283980-1-mlevitsk@redhat.com> References: <20221020152404.283980-1-mlevitsk@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	kvm-unit-tests: set of fixes and new tests \| expand [kvm-unit-tests,00/16] kvm-unit-tests: set of fixes and new tests [kvm-unit-tests,01/16] x86: make irq_enable avoid the interrupt shadow [kvm-unit-tests,02/16] x86: add few helper functions for apic local timer [kvm-unit-tests,03/16] svm: use irq_enable instead of sti/nop [kvm-unit-tests,04/16] svm: make svm_intr_intercept_mix_if/gif test a bit more robust [kvm-unit-tests,05/16] svm: use apic_start_timer/apic_stop_timer instead of open coding it [kvm-unit-tests,06/16] x86: Add test for #SMI during interrupt window [kvm-unit-tests,07/16] x86: Add a simple test for SYSENTER instruction. [kvm-unit-tests,08/16] svm: add nested shutdown test. [kvm-unit-tests,09/16] svm: move svm spec definitions to lib/x86/svm.h [kvm-unit-tests,10/16] svm: move some svm support functions into lib/x86/svm_lib.h [kvm-unit-tests,11/16] svm: add svm_suported [kvm-unit-tests,12/16] svm: move setup_svm to svm_lib.c [kvm-unit-tests,13/16] svm: move vmcb_ident to svm_lib.c [kvm-unit-tests,14/16] svm: rewerite vm entry macros [kvm-unit-tests,15/16] svm: introduce svm_vcpu [kvm-unit-tests,16/16] add IPI loss stress test

diff --git a/lib/x86/svm.h b/lib/x86/svm.h index df57122e..106e15bf 100644 --- a/lib/x86/svm.h +++ b/lib/x86/svm.h @@ -2,6 +2,8 @@ #ifndef SRC_LIB_X86_SVM_H_ #define SRC_LIB_X86_SVM_H_ +#include "libcflat.h" + enum { INTERCEPT_INTR, INTERCEPT_NMI, diff --git a/lib/x86/svm_lib.c b/lib/x86/svm_lib.c new file mode 100644 index 00000000..9e82e363 --- /dev/null +++ b/lib/x86/svm_lib.c @@ -0,0 +1,105 @@ + +#include "svm_lib.h" +#include "libcflat.h" +#include "processor.h" +#include "desc.h" +#include "msr.h" +#include "vm.h" +#include "smp.h" +#include "alloc_page.h" +#include "fwcfg.h" + +/* for the nested page table*/ +static u64 *pml4e; + +static u8 *io_bitmap; +static u8 io_bitmap_area[16384]; + +static u8 *msr_bitmap; +static u8 msr_bitmap_area[MSR_BITMAP_SIZE + PAGE_SIZE]; + + +u64 *npt_get_pte(u64 address) +{ + return get_pte(npt_get_pml4e(), (void*)address); +} + +u64 *npt_get_pde(u64 address) +{ + struct pte_search search; + search = find_pte_level(npt_get_pml4e(), (void*)address, 2); + return search.pte; +} + +u64 *npt_get_pdpe(u64 address) +{ + struct pte_search search; + search = find_pte_level(npt_get_pml4e(), (void*)address, 3); + return search.pte; +} + +u64 *npt_get_pml4e(void) +{ + return pml4e; +} + +u8* svm_get_msr_bitmap(void) +{ + return msr_bitmap; +} + +u8* svm_get_io_bitmap(void) +{ + return io_bitmap; +} + +static void set_additional_vcpu_msr(void *msr_efer) +{ + void *hsave = alloc_page(); + + wrmsr(MSR_VM_HSAVE_PA, virt_to_phys(hsave)); + wrmsr(MSR_EFER, (ulong)msr_efer | EFER_SVME); +} + +static void setup_npt(void) +{ + u64 size = fwcfg_get_u64(FW_CFG_RAM_SIZE); + + /* Ensure all <4gb is mapped, e.g. if there's no RAM above 4gb. */ + if (size < BIT_ULL(32)) + size = BIT_ULL(32); + + pml4e = alloc_page(); + + /* NPT accesses are treated as "user" accesses. */ + __setup_mmu_range(pml4e, 0, size, X86_MMU_MAP_USER); +} + +void setup_svm(void) +{ + void *hsave = alloc_page(); + int i; + + wrmsr(MSR_VM_HSAVE_PA, virt_to_phys(hsave)); + wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_SVME); + + io_bitmap = (void *) ALIGN((ulong)io_bitmap_area, PAGE_SIZE); + + msr_bitmap = (void *) ALIGN((ulong)msr_bitmap_area, PAGE_SIZE); + + if (!npt_supported()) + return; + + for (i = 1; i < cpu_count(); i++) + on_cpu(i, (void *)set_additional_vcpu_msr, (void *)rdmsr(MSR_EFER)); + + printf("NPT detected - running all tests with NPT enabled\n"); + + /* + * Nested paging supported - Build a nested page table + * Build the page-table bottom-up and map everything with 4k + * pages to get enough granularity for the NPT unit-tests. + */ + + setup_npt(); +} diff --git a/lib/x86/svm_lib.h b/lib/x86/svm_lib.h index 2d13b066..50664b24 100644 --- a/lib/x86/svm_lib.h +++ b/lib/x86/svm_lib.h @@ -54,5 +54,17 @@ static inline void clgi(void) asm volatile ("clgi"); } +void setup_svm(void); + +u64 *npt_get_pte(u64 address); +u64 *npt_get_pde(u64 address); +u64 *npt_get_pdpe(u64 address); +u64 *npt_get_pml4e(void); + +u8* svm_get_msr_bitmap(void); +u8* svm_get_io_bitmap(void); + +#define MSR_BITMAP_SIZE 8192 + #endif /* SRC_LIB_X86_SVM_LIB_H_ */ diff --git a/x86/Makefile.x86_64 b/x86/Makefile.x86_64 index 8ce53650..7e902551 100644 --- a/x86/Makefile.x86_64 +++ b/x86/Makefile.x86_64 @@ -19,6 +19,8 @@ COMMON_CFLAGS += -mno-red-zone -mno-sse -mno-sse2 $(fcf_protection_full) cflatobjs += lib/x86/setjmp64.o cflatobjs += lib/x86/intel-iommu.o cflatobjs += lib/x86/usermode.o +cflatobjs += lib/x86/svm_lib.o + tests = $(TEST_DIR)/apic.$(exe) \ $(TEST_DIR)/emulator.$(exe) $(TEST_DIR)/idt_test.$(exe) \ diff --git a/x86/svm.c b/x86/svm.c index 43791546..bf8caf54 100644 --- a/x86/svm.c +++ b/x86/svm.c @@ -16,35 +16,8 @@ #include "apic.h" #include "svm_lib.h" -/* for the nested page table*/ -u64 *pml4e; - struct vmcb *vmcb; -u64 *npt_get_pte(u64 address) -{ - return get_pte(npt_get_pml4e(), (void*)address); -} - -u64 *npt_get_pde(u64 address) -{ - struct pte_search search; - search = find_pte_level(npt_get_pml4e(), (void*)address, 2); - return search.pte; -} - -u64 *npt_get_pdpe(u64 address) -{ - struct pte_search search; - search = find_pte_level(npt_get_pml4e(), (void*)address, 3); - return search.pte; -} - -u64 *npt_get_pml4e(void) -{ - return pml4e; -} - bool smp_supported(void) { return cpu_count() > 1; @@ -112,12 +85,6 @@ static void test_thunk(struct svm_test *test) vmmcall(); } -u8 *io_bitmap; -u8 io_bitmap_area[16384]; - -u8 *msr_bitmap; -u8 msr_bitmap_area[MSR_BITMAP_SIZE + PAGE_SIZE]; - void vmcb_ident(struct vmcb *vmcb) { u64 vmcb_phys = virt_to_phys(vmcb); @@ -153,12 +120,12 @@ void vmcb_ident(struct vmcb *vmcb) ctrl->intercept = (1ULL << INTERCEPT_VMRUN) | (1ULL << INTERCEPT_VMMCALL) | (1ULL << INTERCEPT_SHUTDOWN); - ctrl->iopm_base_pa = virt_to_phys(io_bitmap); - ctrl->msrpm_base_pa = virt_to_phys(msr_bitmap); + ctrl->iopm_base_pa = virt_to_phys(svm_get_io_bitmap()); + ctrl->msrpm_base_pa = virt_to_phys(svm_get_msr_bitmap()); if (npt_supported()) { ctrl->nested_ctl = 1; - ctrl->nested_cr3 = (u64)pml4e; + ctrl->nested_cr3 = (u64)npt_get_pml4e(); ctrl->tlb_ctl = TLB_CONTROL_FLUSH_ALL_ASID; } } @@ -247,57 +214,6 @@ static noinline void test_run(struct svm_test *test) test->on_vcpu_done = true; } -static void set_additional_vcpu_msr(void *msr_efer) -{ - void *hsave = alloc_page(); - - wrmsr(MSR_VM_HSAVE_PA, virt_to_phys(hsave)); - wrmsr(MSR_EFER, (ulong)msr_efer | EFER_SVME); -} - -static void setup_npt(void) -{ - u64 size = fwcfg_get_u64(FW_CFG_RAM_SIZE); - - /* Ensure all <4gb is mapped, e.g. if there's no RAM above 4gb. */ - if (size < BIT_ULL(32)) - size = BIT_ULL(32); - - pml4e = alloc_page(); - - /* NPT accesses are treated as "user" accesses. */ - __setup_mmu_range(pml4e, 0, size, X86_MMU_MAP_USER); -} - -static void setup_svm(void) -{ - void *hsave = alloc_page(); - int i; - - wrmsr(MSR_VM_HSAVE_PA, virt_to_phys(hsave)); - wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_SVME); - - io_bitmap = (void *) ALIGN((ulong)io_bitmap_area, PAGE_SIZE); - - msr_bitmap = (void *) ALIGN((ulong)msr_bitmap_area, PAGE_SIZE); - - if (!npt_supported()) - return; - - for (i = 1; i < cpu_count(); i++) - on_cpu(i, (void *)set_additional_vcpu_msr, (void *)rdmsr(MSR_EFER)); - - printf("NPT detected - running all tests with NPT enabled\n"); - - /* - * Nested paging supported - Build a nested page table - * Build the page-table bottom-up and map everything with 4k - * pages to get enough granularity for the NPT unit-tests. - */ - - setup_npt(); -} - int matched; static bool diff --git a/x86/svm.h b/x86/svm.h index 075ac566..f4343883 100644 --- a/x86/svm.h +++ b/x86/svm.h @@ -5,7 +5,6 @@ #include <x86/svm.h> -#define MSR_BITMAP_SIZE 8192 #define LBR_CTL_ENABLE_MASK BIT_ULL(0) struct svm_test { @@ -47,10 +46,7 @@ struct regs { typedef void (*test_guest_func)(struct svm_test *); int run_svm_tests(int ac, char **av, struct svm_test *svm_tests); -u64 *npt_get_pte(u64 address); -u64 *npt_get_pde(u64 address); -u64 *npt_get_pdpe(u64 address); -u64 *npt_get_pml4e(void); + bool smp_supported(void); bool default_supported(void); void default_prepare(struct svm_test *test); diff --git a/x86/svm_tests.c b/x86/svm_tests.c index bbf64af2..57b5b572 100644 --- a/x86/svm_tests.c +++ b/x86/svm_tests.c @@ -306,14 +306,13 @@ static bool check_next_rip(struct svm_test *test) return address == vmcb->control.next_rip; } -extern u8 *msr_bitmap; static void prepare_msr_intercept(struct svm_test *test) { default_prepare(test); vmcb->control.intercept |= (1ULL << INTERCEPT_MSR_PROT); vmcb->control.intercept_exceptions |= (1ULL << GP_VECTOR); - memset(msr_bitmap, 0xff, MSR_BITMAP_SIZE); + memset(svm_get_msr_bitmap(), 0xff, MSR_BITMAP_SIZE); } static void test_msr_intercept(struct svm_test *test) @@ -424,7 +423,7 @@ static bool msr_intercept_finished(struct svm_test *test) static bool check_msr_intercept(struct svm_test *test) { - memset(msr_bitmap, 0, MSR_BITMAP_SIZE); + memset(svm_get_msr_bitmap(), 0, MSR_BITMAP_SIZE); return (test->scratch == -2); } @@ -536,10 +535,10 @@ static bool check_mode_switch(struct svm_test *test) return test->scratch == 2; } -extern u8 *io_bitmap; - static void prepare_ioio(struct svm_test *test) { + u8 *io_bitmap = svm_get_io_bitmap(); + vmcb->control.intercept |= (1ULL << INTERCEPT_IOIO_PROT); test->scratch = 0; memset(io_bitmap, 0, 8192); @@ -548,6 +547,8 @@ static void prepare_ioio(struct svm_test *test) static void test_ioio(struct svm_test *test) { + u8 *io_bitmap = svm_get_io_bitmap(); + // stage 0, test IO pass inb(0x5000); outb(0x0, 0x5000); @@ -611,7 +612,6 @@ static void test_ioio(struct svm_test *test) goto fail; return; - fail: report_fail("stage %d", get_test_stage(test)); test->scratch = -1; @@ -620,6 +620,7 @@ fail: static bool ioio_finished(struct svm_test *test) { unsigned port, size; + u8 *io_bitmap = svm_get_io_bitmap(); /* Only expect IOIO intercepts */ if (vmcb->control.exit_code == SVM_EXIT_VMMCALL) @@ -644,6 +645,8 @@ static bool ioio_finished(struct svm_test *test) static bool check_ioio(struct svm_test *test) { + u8 *io_bitmap = svm_get_io_bitmap(); + memset(io_bitmap, 0, 8193); return test->scratch != -1; } @@ -2325,7 +2328,8 @@ static void test_msrpm_iopm_bitmap_addrs(void) { u64 saved_intercept = vmcb->control.intercept; u64 addr_beyond_limit = 1ull << cpuid_maxphyaddr(); - u64 addr = virt_to_phys(msr_bitmap) & (~((1ull << 12) - 1)); + u64 addr = virt_to_phys(svm_get_msr_bitmap()) & (~((1ull << 12) - 1)); + u8 *io_bitmap = svm_get_io_bitmap(); TEST_BITMAP_ADDR(saved_intercept, INTERCEPT_MSR_PROT, addr_beyond_limit - 2 * PAGE_SIZE, SVM_EXIT_ERR,

[kvm-unit-tests,12/16] svm: move setup_svm to svm_lib.c

Commit Message

Patch