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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham 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 80215C5DF61 for ; Thu, 7 Nov 2019 13:46:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59FE1218AE for ; Thu, 7 Nov 2019 13:46:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388641AbfKGNqn (ORCPT ); Thu, 7 Nov 2019 08:46:43 -0500 Received: from foss.arm.com ([217.140.110.172]:56468 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727858AbfKGNqn (ORCPT ); Thu, 7 Nov 2019 08:46:43 -0500 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 4921531B; Thu, 7 Nov 2019 05:46:42 -0800 (PST) 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 339223F71A; Thu, 7 Nov 2019 05:46:41 -0800 (PST) Date: Thu, 7 Nov 2019 13:46:38 +0000 From: Andre Przywara To: Alexandru Elisei Cc: kvm@vger.kernel.org, Will Deacon , Julien Thierry , Marc Zyngier , Suzuki Poulose , Julien Grall Subject: Re: [PATCH kvmtool 08/16] arm: Move anything related to RAM initialization in kvm__init_ram Message-ID: <20191107134638.147f9712@donnerap.cambridge.arm.com> In-Reply-To: <1569245722-23375-9-git-send-email-alexandru.elisei@arm.com> References: <1569245722-23375-1-git-send-email-alexandru.elisei@arm.com> <1569245722-23375-9-git-send-email-alexandru.elisei@arm.com> Organization: ARM X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Mon, 23 Sep 2019 14:35:14 +0100 Alexandru Elisei wrote: > From: Julien Grall > > RAM initialization is currently split between kvm__init_ram and > kvm__arch_init. Move all code related to RAM initialization to > kvm__init_ram. The diff is a bit confusing to read, but indeed this just moves the code from arch_init() to init_ram() (confirmed by moving the code and comparing). One thing to note is that this changes the order of initialisation slightly: the GIC is now created before the RAM (since we call arch_init() before init_ram()). Nevertheless: > Signed-off-by: Julien Grall > Signed-off-by: Alexandru Elisei Reviewed-by: Andre Przywara Cheers, Andre. > --- > arm/kvm.c | 75 +++++++++++++++++++++++++++++++-------------------------------- > 1 file changed, 37 insertions(+), 38 deletions(-) > > diff --git a/arm/kvm.c b/arm/kvm.c > index 5decc138fd3e..3e49db7704aa 100644 > --- a/arm/kvm.c > +++ b/arm/kvm.c > @@ -29,44 +29,6 @@ void kvm__init_ram(struct kvm *kvm) > int err; > u64 phys_start, phys_size; > void *host_mem; > - > - phys_start = ARM_MEMORY_AREA; > - phys_size = kvm->ram_size; > - host_mem = kvm->ram_start; > - > - err = kvm__register_ram(kvm, phys_start, phys_size, host_mem); > - if (err) > - die("Failed to register %lld bytes of memory at physical " > - "address 0x%llx [err %d]", phys_size, phys_start, err); > - > - kvm->arch.memory_guest_start = phys_start; > -} > - > -void kvm__arch_delete_ram(struct kvm *kvm) > -{ > - munmap(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size); > -} > - > -void kvm__arch_read_term(struct kvm *kvm) > -{ > - serial8250__update_consoles(kvm); > - virtio_console__inject_interrupt(kvm); > -} > - > -void kvm__arch_set_cmdline(char *cmdline, bool video) > -{ > -} > - > -void kvm__arch_sanitize_cfg(struct kvm_config *cfg) > -{ > - if (cfg->ram_size > ARM_MAX_MEMORY(cfg)) { > - cfg->ram_size = ARM_MAX_MEMORY(cfg); > - pr_warning("Capping memory to %lluMB", cfg->ram_size >> 20); > - } > -} > - > -void kvm__arch_init(struct kvm *kvm) > -{ > unsigned long alignment; > /* Convenience aliases */ > const char *hugetlbfs_path = kvm->cfg.hugetlbfs_path; > @@ -115,6 +77,43 @@ void kvm__arch_init(struct kvm *kvm) > madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size, > MADV_HUGEPAGE); > > + phys_start = ARM_MEMORY_AREA; > + phys_size = kvm->ram_size; > + host_mem = kvm->ram_start; > + > + err = kvm__register_ram(kvm, phys_start, phys_size, host_mem); > + if (err) > + die("Failed to register %lld bytes of memory at physical " > + "address 0x%llx [err %d]", phys_size, phys_start, err); > + > + kvm->arch.memory_guest_start = phys_start; > +} > + > +void kvm__arch_delete_ram(struct kvm *kvm) > +{ > + munmap(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size); > +} > + > +void kvm__arch_read_term(struct kvm *kvm) > +{ > + serial8250__update_consoles(kvm); > + virtio_console__inject_interrupt(kvm); > +} > + > +void kvm__arch_set_cmdline(char *cmdline, bool video) > +{ > +} > + > +void kvm__arch_sanitize_cfg(struct kvm_config *cfg) > +{ > + if (cfg->ram_size > ARM_MAX_MEMORY(cfg)) { > + cfg->ram_size = ARM_MAX_MEMORY(cfg); > + pr_warning("Capping memory to %lluMB", cfg->ram_size >> 20); > + } > +} > + > +void kvm__arch_init(struct kvm *kvm) > +{ > /* Create the virtual GIC. */ > if (gic__create(kvm, kvm->cfg.arch.irqchip)) > die("Failed to create virtual GIC");