From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33B20C43217 for ; Thu, 1 Dec 2022 16:15:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231987AbiLAQPR (ORCPT ); Thu, 1 Dec 2022 11:15:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231803AbiLAQPQ (ORCPT ); Thu, 1 Dec 2022 11:15:16 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2CDD18E17 for ; Thu, 1 Dec 2022 08:14:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669911256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OBph0U0z1/ZHj5I7LH9NFy4cuZNdZMdr1NUcXvBbfaQ=; b=KyEt0fXbDfyClx3fI0O2xBr+oPIEwo+fEAn2G3eQLRUON/621kHnCKXZWFzqvvnVuJjzK4 no+msfHmZnDUdBghDD86ti2j7lSF8FU6j9r9EcKv+cmr2IuzSi0VsebnTbaXdoVgCq5MdY +BXjGTaGl24KVGFFt0cdr7lyibKSz5w= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-386-6p5BDR_oMCyruMwyTIX4EQ-1; Thu, 01 Dec 2022 11:14:14 -0500 X-MC-Unique: 6p5BDR_oMCyruMwyTIX4EQ-1 Received: by mail-wm1-f69.google.com with SMTP id j2-20020a05600c1c0200b003cf7397fc9bso1043553wms.5 for ; Thu, 01 Dec 2022 08:14:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OBph0U0z1/ZHj5I7LH9NFy4cuZNdZMdr1NUcXvBbfaQ=; b=Jh/N5zM3OIK+plLnjE2Bs5iY6QhEOhi88XH7xQppaAYgx+h0x9mbc30lIrieb/I/nD YWhtx2yE4C1aXR4iY3FVMtl5a2WnQZF0LPbC5ko5N/kUBwZnbIFomFsYSJpGJwZt2Yhg HvAeSNQ2nQslYL+SoMrnDiXY5pVBqBzRw+vgRRrYMY+D/TW97qVGCg3kAAc8xsFh9rUQ vsuDYcFHdWILz3dK/i8rm5fPiG81d5UbROF9gWYLeiTZ10jL4GgJOhlWoLkrVKc8/mBm PqxC9YfEpySkXs2ajz0eMs7KVm8qxt7jKaf3YUsYof/rqX91nXWSuBhTdDrpxNqzEZpE zKBQ== X-Gm-Message-State: ANoB5pmS/CnB5l1kzZYGof8v64imeCLxN+F/MWCqMnNooGdh2eh3w4iC lGCh+UVI3Q6DXicfgNWH0TQct2pA8UEBp/lH8D/SoiBkEjnW1Vz+ncSPcNRPLqGZKrEgpSFfHXm 0HrK/nXD8aAGp X-Received: by 2002:adf:f6c3:0:b0:241:ffd4:d128 with SMTP id y3-20020adff6c3000000b00241ffd4d128mr22162129wrp.234.1669911253104; Thu, 01 Dec 2022 08:14:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf6t3hU4lhcV357KzBbQ7qmGDg6K3LuMVd9pJxxGomNuUs5dAzDSRBBIOOJJsWxQNTdHPJR7Xg== X-Received: by 2002:adf:f6c3:0:b0:241:ffd4:d128 with SMTP id y3-20020adff6c3000000b00241ffd4d128mr22162109wrp.234.1669911252861; Thu, 01 Dec 2022 08:14:12 -0800 (PST) Received: from [192.168.149.123] (58.254.164.109.static.wline.lns.sme.cust.swisscom.ch. [109.164.254.58]) by smtp.gmail.com with ESMTPSA id v24-20020a05600c4d9800b003cfbe1da539sm5532661wmp.36.2022.12.01.08.14.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 01 Dec 2022 08:14:12 -0800 (PST) Message-ID: <407805ae-e07a-ac3b-38b5-03494f141dbe@redhat.com> Date: Thu, 1 Dec 2022 17:14:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [kvm-unit-tests PATCH v3 16/27] svm: move setup_svm() to svm_lib.c Content-Language: en-US To: Maxim Levitsky , kvm@vger.kernel.org Cc: Andrew Jones , Alexandru Elisei , Paolo Bonzini , Claudio Imbrenda , Thomas Huth , =?UTF-8?Q?Alex_Benn=c3=a9e?= , Nico Boehr , Cathy Avery , Janosch Frank References: <20221122161152.293072-1-mlevitsk@redhat.com> <20221122161152.293072-17-mlevitsk@redhat.com> From: Emanuele Giuseppe Esposito In-Reply-To: <20221122161152.293072-17-mlevitsk@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Am 22/11/2022 um 17:11 schrieb Maxim Levitsky: > Signed-off-by: Maxim Levitsky > --- Reviewed-by: Emanuele Giuseppe Esposito > lib/x86/svm.h | 2 + > lib/x86/svm_lib.c | 107 ++++++++++++++++++++++++++++++++++++++++++++ > lib/x86/svm_lib.h | 12 +++++ > x86/Makefile.x86_64 | 2 + > x86/svm.c | 90 ++----------------------------------- > x86/svm.h | 6 +-- > x86/svm_tests.c | 18 +++++--- > 7 files changed, 138 insertions(+), 99 deletions(-) > create mode 100644 lib/x86/svm_lib.c > > diff --git a/lib/x86/svm.h b/lib/x86/svm.h > index 8b836c13..d714dac9 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..cb80f08f > --- /dev/null > +++ b/lib/x86/svm_lib.c > @@ -0,0 +1,107 @@ > + > +#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 04910281..b491eee6 100644 > --- a/lib/x86/svm_lib.h > +++ b/lib/x86/svm_lib.h > @@ -49,5 +49,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 f76ff18a..5e4c4cc0 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)/idt_test.$(exe) \ > diff --git a/x86/svm.c b/x86/svm.c > index 8d90a242..9edf5500 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 7cb1b898..67f3205d 100644 > --- a/x86/svm.h > +++ b/x86/svm.h > @@ -5,7 +5,6 @@ > #include > > > -#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 f86c2fa4..712d24e2 100644 > --- a/x86/svm_tests.c > +++ b/x86/svm_tests.c > @@ -307,14 +307,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) > @@ -425,7 +424,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); > } > > @@ -537,10 +536,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); > @@ -549,6 +548,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); > @@ -612,7 +613,6 @@ static void test_ioio(struct svm_test *test) > goto fail; > > return; > - > fail: > report_fail("stage %d", get_test_stage(test)); > test->scratch = -1; > @@ -621,6 +621,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) > @@ -645,6 +646,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; > } > @@ -2316,7 +2319,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, >