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 AB548C433F5 for ; Wed, 1 Jun 2022 13:43:11 +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=GcRfcYqih7C2iUi5vNjwtF0SIHnKL/bk3liedmp5lKA=; b=lWKqtPRJMPWRUD 1Ji1gAHxTdzqod5ZVrohCUBfjBzTQs6ZCCUbuNT0pbcamoSg0FxfSTa26uggs1ZjjgWhWzJqm425T KONLHktRAqBMLzydNPd5iFUJc36OAcamfNVn7b2kxgHK4EBIUKIYjjvKMBMh8ZMs8GmwqQRi3JB2p EYUkaDeX8u5/sJ8OGC/9BJQFfLLmB2apuri9AI3LNU1+tvUyYRAGs3bNvJ1fkG9OPBoirTYqaZUqB jaSuhMWQiKZOKUZGyuLlpmfiFjnaX7syluqTXZsjnN+/ta0OhGd+J8vOfSmdrMaTSMDSmO6PhGqDf ebn92n7iC6ZVWYVWeWGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwObj-00GKQr-OH; Wed, 01 Jun 2022 13:41:55 +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 1nwOaX-00GJvT-5K for linux-arm-kernel@lists.infradead.org; Wed, 01 Jun 2022 13:40:43 +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 2D1CCED1; Wed, 1 Jun 2022 06:40:40 -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 B38273F73D; Wed, 1 Jun 2022 06:40:38 -0700 (PDT) Date: Wed, 1 Jun 2022 14:20:11 +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 11/13] arm/arm64: Consolidate RAM initialization in kvm__init_ram() Message-ID: <20220601142011.46e1f80a@donnerap.cambridge.arm.com> In-Reply-To: <20220525112345.121321-12-alexandru.elisei@arm.com> References: <20220525112345.121321-1-alexandru.elisei@arm.com> <20220525112345.121321-12-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_064041_350786_9AAF19D4 X-CRM114-Status: GOOD ( 22.92 ) 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:43 +0100 Alexandru Elisei wrote: Hi, > From: Julien Grall > > RAM initialization is unnecessarily split between kvm__init_ram() and > kvm__arch_init(). Move all code related to RAM initialization to > kvm__init_ram(), making the code easier to follow and to modify. > > One thing to note is that the initialization order is slightly altered: > kvm__arch_enable_mte() and gic__create() are now called before mmap'ing the > guest RAM. That is perfectly fine, as they don't use the host's mapping of > the guest memory. > > Signed-off-by: Julien Grall > Signed-off-by: Alexandru Elisei I can confirm that this is just a code move, also MTE and GIC init do not seem to rely on RAM in any way. Reviewed-by: Andre Przywara Cheers, Andre > --- > arm/kvm.c | 52 ++++++++++++++++++++++++++-------------------------- > 1 file changed, 26 insertions(+), 26 deletions(-) > > diff --git a/arm/kvm.c b/arm/kvm.c > index bd44aa350796..abcccfabf59e 100644 > --- a/arm/kvm.c > +++ b/arm/kvm.c > @@ -26,9 +26,34 @@ bool kvm__arch_cpu_supports_vm(void) > > void kvm__init_ram(struct kvm *kvm) > { > - int err; > u64 phys_start, phys_size; > void *host_mem; > + int err; > + > + /* > + * Allocate guest memory. We must align our buffer to 64K to > + * correlate with the maximum guest page size for virtio-mmio. > + * If using THP, then our minimal alignment becomes 2M. > + * 2M trumps 64K, so let's go with that. > + */ > + 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, > + kvm->cfg.hugetlbfs_path, > + kvm->arch.ram_alloc_size); > + > + if (kvm->arch.ram_alloc_start == MAP_FAILED) > + die("Failed to map %lld bytes for guest memory (%d)", > + kvm->arch.ram_alloc_size, errno); > + > + kvm->ram_start = (void *)ALIGN((unsigned long)kvm->arch.ram_alloc_start, > + SZ_2M); > + > + madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size, > + MADV_MERGEABLE); > + > + madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size, > + MADV_HUGEPAGE); > > phys_start = ARM_MEMORY_AREA; > phys_size = kvm->ram_size; > @@ -59,31 +84,6 @@ void kvm__arch_set_cmdline(char *cmdline, bool video) > > void kvm__arch_init(struct kvm *kvm) > { > - /* > - * Allocate guest memory. We must align our buffer to 64K to > - * correlate with the maximum guest page size for virtio-mmio. > - * If using THP, then our minimal alignment becomes 2M. > - * 2M trumps 64K, so let's go with that. > - */ > - 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, > - kvm->cfg.hugetlbfs_path, > - kvm->arch.ram_alloc_size); > - > - if (kvm->arch.ram_alloc_start == MAP_FAILED) > - die("Failed to map %lld bytes for guest memory (%d)", > - kvm->arch.ram_alloc_size, errno); > - > - kvm->ram_start = (void *)ALIGN((unsigned long)kvm->arch.ram_alloc_start, > - SZ_2M); > - > - madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size, > - MADV_MERGEABLE); > - > - madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size, > - MADV_HUGEPAGE); > - > /* Create the virtual GIC. */ > if (gic__create(kvm, kvm->cfg.arch.irqchip)) > die("Failed to create virtual GIC"); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel