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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A3FC4C433EF for ; Wed, 1 Jun 2022 13:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JfvcuQoYESjCpNE8ZkNb8f4BiBPTqN1IobHvZTYMTxc=; b=e2z2TOCZBtUre1 EjiidpKFYGS22dnNiQxWGqAh77KZFP0PacLBeq7EagQFSLDW/+S+lst6Q9+6dwiQLYY0vhAQgvrvK ShIHuP5lTjUcBG9Y599+CE/aZbg+WBF+dfSJb6kyTpPr4YyR/ORTLV1uuuge99DE2DBIbLFIFQWIJ DvPS3i8AEr6T9L4t84wNByr7a/8fuoqlEeeg5+rAnAN33n5tZlq3R6vhsYbq9/K3yM7Dvzunj6rs9 4Xk89+6+kH9bKIF5q2k9c3Cl6jFdYJ77oCpET3/6cKRYYGX72vZ6GOhBCTLQs/fMIt+E2U0Sp345s ggcWaeAeeSye1OIecpOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwOcB-00GKgU-86; Wed, 01 Jun 2022 13:42:23 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwOab-00GJwm-Vk for linux-arm-kernel@lists.infradead.org; Wed, 01 Jun 2022 13:40:48 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id ECF6EED1; Wed, 1 Jun 2022 06:40:44 -0700 (PDT) Received: from donnerap.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 985B53F73D; Wed, 1 Jun 2022 06:40:43 -0700 (PDT) Date: Wed, 1 Jun 2022 14:13:27 +0100 From: Andre Przywara To: Alexandru Elisei Cc: will@kernel.org, julien.thierry.kdev@gmail.com, maz@kernel.org, suzuki.poulose@arm.com, julien@xen.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, james.morse@arm.com, Julien Grall Subject: Re: [PATCH v3 kvmtool 10/13] kvm__arch_init: Remove hugetlbfs_path and ram_size as parameters Message-ID: <20220601141327.1d49859b@donnerap.cambridge.arm.com> In-Reply-To: <20220525112345.121321-11-alexandru.elisei@arm.com> References: <20220525112345.121321-1-alexandru.elisei@arm.com> <20220525112345.121321-11-alexandru.elisei@arm.com> Organization: ARM X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220601_064046_185404_7FA62451 X-CRM114-Status: GOOD ( 19.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 25 May 2022 12:23:42 +0100 Alexandru Elisei wrote: > From: Julien Grall > > The kvm struct already contains a pointer to the configuration, which > contains both hugetlbfs_path and ram_size, so is it not necessary to pass > them as arguments to kvm__arch_init(). > > Signed-off-by: Julien Grall > Signed-off-by: Alexandru Elisei Like that cleanup. Reviewed-by: Andre Przywara Cheers, Andre > --- > arm/kvm.c | 7 ++++--- > include/kvm/kvm.h | 2 +- > kvm.c | 2 +- > mips/kvm.c | 7 ++++--- > powerpc/kvm.c | 5 +++-- > riscv/kvm.c | 7 ++++--- > x86/kvm.c | 4 +++- > 7 files changed, 20 insertions(+), 14 deletions(-) > > diff --git a/arm/kvm.c b/arm/kvm.c > index af0feae495d7..bd44aa350796 100644 > --- a/arm/kvm.c > +++ b/arm/kvm.c > @@ -57,7 +57,7 @@ void kvm__arch_set_cmdline(char *cmdline, bool video) > { > } > > -void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) > +void kvm__arch_init(struct kvm *kvm) > { > /* > * Allocate guest memory. We must align our buffer to 64K to > @@ -65,9 +65,10 @@ void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) > * If using THP, then our minimal alignment becomes 2M. > * 2M trumps 64K, so let's go with that. > */ > - kvm->ram_size = ram_size; > + kvm->ram_size = kvm->cfg.ram_size; > kvm->arch.ram_alloc_size = kvm->ram_size + SZ_2M; > - kvm->arch.ram_alloc_start = mmap_anon_or_hugetlbfs(kvm, hugetlbfs_path, > + kvm->arch.ram_alloc_start = mmap_anon_or_hugetlbfs(kvm, > + kvm->cfg.hugetlbfs_path, > kvm->arch.ram_alloc_size); > > if (kvm->arch.ram_alloc_start == MAP_FAILED) > diff --git a/include/kvm/kvm.h b/include/kvm/kvm.h > index 9f7b2fb26e95..640b76c095f9 100644 > --- a/include/kvm/kvm.h > +++ b/include/kvm/kvm.h > @@ -189,7 +189,7 @@ void kvm__remove_socket(const char *name); > > void kvm__arch_validate_cfg(struct kvm *kvm); > void kvm__arch_set_cmdline(char *cmdline, bool video); > -void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size); > +void kvm__arch_init(struct kvm *kvm); > void kvm__arch_delete_ram(struct kvm *kvm); > int kvm__arch_setup_firmware(struct kvm *kvm); > int kvm__arch_free_firmware(struct kvm *kvm); > diff --git a/kvm.c b/kvm.c > index 952ef1fbb41c..42b881217df6 100644 > --- a/kvm.c > +++ b/kvm.c > @@ -479,7 +479,7 @@ int kvm__init(struct kvm *kvm) > goto err_vm_fd; > } > > - kvm__arch_init(kvm, kvm->cfg.hugetlbfs_path, kvm->cfg.ram_size); > + kvm__arch_init(kvm); > > INIT_LIST_HEAD(&kvm->mem_banks); > kvm__init_ram(kvm); > diff --git a/mips/kvm.c b/mips/kvm.c > index f5b137f46dff..d8610cf81b94 100644 > --- a/mips/kvm.c > +++ b/mips/kvm.c > @@ -61,12 +61,13 @@ void kvm__arch_set_cmdline(char *cmdline, bool video) > } > > /* Architecture-specific KVM init */ > -void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) > +void kvm__arch_init(struct kvm *kvm) > { > int ret; > > - kvm->ram_start = mmap_anon_or_hugetlbfs(kvm, hugetlbfs_path, ram_size); > - kvm->ram_size = ram_size; > + kvm->ram_size = kvm->cfg.ram_size; > + kvm->ram_start = mmap_anon_or_hugetlbfs(kvm, kvm->cfg.hugetlbfs_path, > + kvm->ram_size); > > if (kvm->ram_start == MAP_FAILED) > die("out of memory"); > diff --git a/powerpc/kvm.c b/powerpc/kvm.c > index 3215b579f5dc..d281b070fd0e 100644 > --- a/powerpc/kvm.c > +++ b/powerpc/kvm.c > @@ -92,12 +92,13 @@ void kvm__arch_set_cmdline(char *cmdline, bool video) > } > > /* Architecture-specific KVM init */ > -void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) > +void kvm__arch_init(struct kvm *kvm) > { > + const char *hugetlbfs_path = kvm->cfg.hugetlbfs_path; > int cap_ppc_rma; > unsigned long hpt; > > - kvm->ram_size = ram_size; > + kvm->ram_size = kvm->cfg.ram_size; > > /* Map "default" hugetblfs path to the standard 16M mount point */ > if (hugetlbfs_path && !strcmp(hugetlbfs_path, "default")) > diff --git a/riscv/kvm.c b/riscv/kvm.c > index 7fb496282f4c..c46660772aa0 100644 > --- a/riscv/kvm.c > +++ b/riscv/kvm.c > @@ -56,7 +56,7 @@ void kvm__arch_set_cmdline(char *cmdline, bool video) > { > } > > -void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) > +void kvm__arch_init(struct kvm *kvm) > { > /* > * Allocate guest memory. We must align our buffer to 64K to > @@ -64,9 +64,10 @@ void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) > * If using THP, then our minimal alignment becomes 2M. > * 2M trumps 64K, so let's go with that. > */ > - kvm->ram_size = min(ram_size, (u64)RISCV_MAX_MEMORY(kvm)); > + kvm->ram_size = min(kvm->cfg.ram_size, (u64)RISCV_MAX_MEMORY(kvm)); > kvm->arch.ram_alloc_size = kvm->ram_size + SZ_2M; > - kvm->arch.ram_alloc_start = mmap_anon_or_hugetlbfs(kvm, hugetlbfs_path, > + kvm->arch.ram_alloc_start = mmap_anon_or_hugetlbfs(kvm, > + kvm->cfg.hugetlbfs_path, > kvm->arch.ram_alloc_size); > > if (kvm->arch.ram_alloc_start == MAP_FAILED) > diff --git a/x86/kvm.c b/x86/kvm.c > index 6683a5c81d49..24b0305a1841 100644 > --- a/x86/kvm.c > +++ b/x86/kvm.c > @@ -134,9 +134,11 @@ void kvm__arch_set_cmdline(char *cmdline, bool video) > } > > /* Architecture-specific KVM init */ > -void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size) > +void kvm__arch_init(struct kvm *kvm) > { > + const char *hugetlbfs_path = kvm->cfg.hugetlbfs_path; > struct kvm_pit_config pit_config = { .flags = 0, }; > + u64 ram_size = kvm->cfg.ram_size; > int ret; > > ret = ioctl(kvm->vm_fd, KVM_SET_TSS_ADDR, 0xfffbd000); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel