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 X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AC47C4743F for ; Tue, 8 Jun 2021 08:19:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 74E086128B for ; Tue, 8 Jun 2021 08:19:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230377AbhFHIV3 (ORCPT ); Tue, 8 Jun 2021 04:21:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20762 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230323AbhFHIV2 (ORCPT ); Tue, 8 Jun 2021 04:21:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623140375; 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: in-reply-to:in-reply-to:references:references; bh=VYofGLMdJz0x7TQAB9W/n0hJPFjc2qioUswn197Rpmg=; b=fcwJ51ogu2v/4V8rCdemcc7+gBOsjIlxPEcmK+dphrRJk0D2fUiZ4fd7FZYCJQBbm3+O+0 MSMps7k5hEKUaoupAfp2Yhr+n+oNsetfPMQUpjVF5QDfWcJg+V1yfX2GSCyhoei/WEIO37 pLwWuceElg74MeK1NdDt/NITO1qaoQ4= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-188-Qapne7ugOrSGltGyu8aqFg-1; Tue, 08 Jun 2021 04:19:34 -0400 X-MC-Unique: Qapne7ugOrSGltGyu8aqFg-1 Received: by mail-wm1-f72.google.com with SMTP id y129-20020a1c32870000b029016920cc7087so380166wmy.4 for ; Tue, 08 Jun 2021 01:19:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=VYofGLMdJz0x7TQAB9W/n0hJPFjc2qioUswn197Rpmg=; b=kgF3y7mDDJggYhABTXlbiHv1RTgXTSBObGT4FPFmUxBZDjxYdQ86tSbRUEvDUPY45s L25llVQzPYS1WmKqLoZJwESvNxvWqKsuP7I+9xpcyEUgCZdKhepQFmZXfqosuGUhrSUQ pGFFkP2b22V3mrPbMtxy30YkPxk1eNaw5AJv4VcmpbntU0ICOUAAmk2F/sxHAyLPGWnu /6WvTEw4Y7P21mamnLaosqXKULPRy4hnOc2N8n3LG4WL5jI5U7PM4Oi6fX+lLnJz+7PR jvXU1yw6mHUx41ZNUZup99Rk1kNhatfPca+mWTQSWxY6Xp4bTkw+qmmlcP4BOE/vrFHX RQaw== X-Gm-Message-State: AOAM530d06OvCaKH1xTsy5SCX6nxt5qKpHo8921GkCP+/+fHXp6swwDj z1lX9euPuIkOgw755U/c3mHZFO8Qdq8hUR2gx+uvrTqIRKVaiTuFwxR3slhdegVp9OpwjQksUY4 5ExV6t+T09Coq6LEBmdK1wrwx X-Received: by 2002:a1c:dcd7:: with SMTP id t206mr20193292wmg.121.1623140372905; Tue, 08 Jun 2021 01:19:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxi8gxqmjvw40rudPWWCg7DHIKvxwJzLSnbmTUYj9lv4cEdff36HtynMr0vaDuuGYT4gT3EzA== X-Received: by 2002:a1c:dcd7:: with SMTP id t206mr20193275wmg.121.1623140372579; Tue, 08 Jun 2021 01:19:32 -0700 (PDT) Received: from gator (93-137-73-41.adsl.net.t-com.hr. [93.137.73.41]) by smtp.gmail.com with ESMTPSA id h9sm2099406wmm.33.2021.06.08.01.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 01:19:32 -0700 (PDT) Date: Tue, 8 Jun 2021 10:19:29 +0200 From: Andrew Jones To: Zhenzhong Duan Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kvm@vger.kernel.org, maciej.szmigiero@oracle.com, pbonzini@redhat.com, shuah@kernel.org Subject: Re: [PATCH 3/3] selftests: kvm: Add support for customized slot0 memory size Message-ID: <20210608081929.6jyzcv4y4e7aqxa3@gator> References: <20210608233816.423958-1-zhenzhong.duan@intel.com> <20210608233816.423958-4-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210608233816.423958-4-zhenzhong.duan@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 09, 2021 at 07:38:16AM +0800, Zhenzhong Duan wrote: > Current implementatiion only create VM with slot0 memory size > of fixed 512 pages plus page tables and per-cpu memory. > > Add a new parameter slot0_mem_pages to vm_create_with_vcpus() and > some comments to clarify the meaning of slot0_mem_pages and > extra_mem_pages. > > Signed-off-by: Zhenzhong Duan > --- > .../testing/selftests/kvm/include/kvm_util.h | 7 +-- > .../selftests/kvm/kvm_page_table_test.c | 2 +- > tools/testing/selftests/kvm/lib/kvm_util.c | 47 +++++++++++++++---- > .../selftests/kvm/lib/perf_test_util.c | 2 +- > 4 files changed, 44 insertions(+), 14 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h > index fcd8e3855111..8bcadfa8cea5 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -285,10 +285,11 @@ struct kvm_vm *vm_create_default_with_vcpus(uint32_t nr_vcpus, uint64_t extra_me > uint32_t num_percpu_pages, void *guest_code, > uint32_t vcpuids[]); > > -/* Like vm_create_default_with_vcpus, but accepts mode as a parameter */ > +/* Like vm_create_default_with_vcpus, but accepts mode and slot0 memory as a parameter */ > struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, > - uint64_t extra_mem_pages, uint32_t num_percpu_pages, > - void *guest_code, uint32_t vcpuids[]); > + uint64_t slot0_mem_pages, uint64_t extra_mem_pages, > + uint32_t num_percpu_pages, void *guest_code, > + uint32_t vcpuids[]); > > /* > * Adds a vCPU with reasonable defaults (e.g. a stack) > diff --git a/tools/testing/selftests/kvm/kvm_page_table_test.c b/tools/testing/selftests/kvm/kvm_page_table_test.c > index 1c4753fff19e..82171f17c1d7 100644 > --- a/tools/testing/selftests/kvm/kvm_page_table_test.c > +++ b/tools/testing/selftests/kvm/kvm_page_table_test.c > @@ -268,7 +268,7 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg) > > /* Create a VM with enough guest pages */ > guest_num_pages = test_mem_size / guest_page_size; > - vm = vm_create_with_vcpus(mode, nr_vcpus, > + vm = vm_create_with_vcpus(mode, nr_vcpus, DEFAULT_GUEST_PHY_PAGES, > guest_num_pages, 0, guest_code, NULL); > > /* Align down GPA of the testing memslot */ > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index 63418df921f0..d86422a119fd 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -308,21 +308,50 @@ struct kvm_vm *vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) > return vm; > } > > +/* > + * VM Create with customized parameters > + * > + * Input Args: > + * mode - VM Mode (e.g. VM_MODE_P52V48_4K) > + * nr_vcpus - VCPU count > + * slot0_mem_pages - Slot0 physical memory size > + * extra_mem_pages - Non-slot0 physical memory total size > + * num_percpu_pages - Per-cpu physical memory pages > + * guest_code - Guest entry point > + * vcpuids - VCPU IDs > + * > + * Output Args: None > + * > + * Return: > + * Pointer to opaque structure that describes the created VM. > + * > + * Creates a VM with the mode specified by mode (e.g. VM_MODE_P52V48_4K), > + * with customized slot0 memory size, at least 512 pages currently. > + * extra_mem_pages is only used to calculate the maximum page table size, > + * no real memory allocation for non-slot0 memory in this function. > + */ > struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, > - uint64_t extra_mem_pages, uint32_t num_percpu_pages, > - void *guest_code, uint32_t vcpuids[]) > + uint64_t slot0_mem_pages, uint64_t extra_mem_pages, > + uint32_t num_percpu_pages, void *guest_code, > + uint32_t vcpuids[]) > { > + uint64_t vcpu_pages, extra_pg_pages, pages; > + struct kvm_vm *vm; > + int i; > + > + /* Force slot0 memory size not small than DEFAULT_GUEST_PHY_PAGES */ > + if (slot0_mem_pages < DEFAULT_GUEST_PHY_PAGES) > + slot0_mem_pages = DEFAULT_GUEST_PHY_PAGES; > + > /* The maximum page table size for a memory region will be when the > * smallest pages are used. Considering each page contains x page > * table descriptors, the total extra size for page tables (for extra > * N pages) will be: N/x+N/x^2+N/x^3+... which is definitely smaller > * than N/x*2. > */ > - uint64_t vcpu_pages = (DEFAULT_STACK_PGS + num_percpu_pages) * nr_vcpus; > - uint64_t extra_pg_pages = (extra_mem_pages + vcpu_pages) / PTES_PER_MIN_PAGE * 2; > - uint64_t pages = DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages; > - struct kvm_vm *vm; > - int i; > + vcpu_pages = (DEFAULT_STACK_PGS + num_percpu_pages) * nr_vcpus; > + extra_pg_pages = (slot0_mem_pages + extra_mem_pages + vcpu_pages) / PTES_PER_MIN_PAGE * 2; We weren't including the slot0 memory (which was DEFAULT_GUEST_PHY_PAGES) in the extra_pg_pages calculation before, since they weren't considered "extra". It's probably a good idea to do this calculation for the caller, but it's making a change not called out in the commit message. > + pages = slot0_mem_pages + vcpu_pages + extra_pg_pages; > > TEST_ASSERT(nr_vcpus <= kvm_check_cap(KVM_CAP_MAX_VCPUS), > "nr_vcpus = %d too large for host, max-vcpus = %d", > @@ -354,8 +383,8 @@ struct kvm_vm *vm_create_default_with_vcpus(uint32_t nr_vcpus, uint64_t extra_me > uint32_t num_percpu_pages, void *guest_code, > uint32_t vcpuids[]) > { > - return vm_create_with_vcpus(VM_MODE_DEFAULT, nr_vcpus, extra_mem_pages, > - num_percpu_pages, guest_code, vcpuids); > + return vm_create_with_vcpus(VM_MODE_DEFAULT, nr_vcpus, DEFAULT_GUEST_PHY_PAGES, > + extra_mem_pages, num_percpu_pages, guest_code, vcpuids); > } > > struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages, > diff --git a/tools/testing/selftests/kvm/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c > index abf381800a59..7397ca299835 100644 > --- a/tools/testing/selftests/kvm/lib/perf_test_util.c > +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c > @@ -69,7 +69,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus, > TEST_ASSERT(vcpu_memory_bytes % perf_test_args.guest_page_size == 0, > "Guest memory size is not guest page size aligned."); > > - vm = vm_create_with_vcpus(mode, vcpus, > + vm = vm_create_with_vcpus(mode, vcpus, DEFAULT_GUEST_PHY_PAGES, > (vcpus * vcpu_memory_bytes) / perf_test_args.guest_page_size, > 0, guest_code, NULL); > > -- > 2.25.1 > Besides the extra_pg_pages comment Reviewed-by: Andrew Jones Thanks, drew