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 BC45FC433F5 for ; Wed, 1 Jun 2022 13:42:17 +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=0G6GaHkiO8AsdFQAIy1uEMpEnMGJbuBzEJE3LKJbQTQ=; b=y/2l+RP1Ojdn+h 5FA9I6NO5BXEhe+7ZoW5ExJR/XzeEdnuexwRq0SL2o3vZnNuMsIDfZfb6Xsum76Zd2Sjqu3keSsU1 sZwdr2fAm2Yfv/CaQDx/Cad2rS20b3Y7RcTwfiaF0DyWuJbEV+AkRIo8/FYgQEF4NNxg8PrrgR5IS cmzN1MNyHCSrw8oAeYw0UQQlmxaVWfdZaSmT56E+xrfCp3/KQvkJVBfWkfWkboY0UlJb8UryFldLr 30hiMYkSACcopcF2/L2D0+rF275WJuet6m8ZO5unzbxC8LJuUz+19ChUT9Ks7H9yTigQQ4/XRBP9n otLr3l480NFVDctOsKBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwOav-00GK0t-Dl; Wed, 01 Jun 2022 13:41:05 +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 1nwOaQ-00GJtE-E0 for linux-arm-kernel@lists.infradead.org; Wed, 01 Jun 2022 13:40:35 +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 D073414BF; Wed, 1 Jun 2022 06:40:32 -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 B3DD13F73D; Wed, 1 Jun 2022 06:40:31 -0700 (PDT) Date: Wed, 1 Jun 2022 12:14:30 +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 Subject: Re: [PATCH v3 kvmtool 07/13] arm/arm64: Kill the ARM_MAX_MEMORY() macro Message-ID: <20220601121430.6a24b4e6@donnerap.cambridge.arm.com> In-Reply-To: <20220525112345.121321-8-alexandru.elisei@arm.com> References: <20220525112345.121321-1-alexandru.elisei@arm.com> <20220525112345.121321-8-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_064034_570240_7D2A2E08 X-CRM114-Status: GOOD ( 16.56 ) 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:39 +0100 Alexandru Elisei wrote: > For 32-bit guests, the maximum memory size is represented by the define > ARM_LOMAP_MAX_MEMORY, which ARM_MAX_MEMORY() returns. > > For 64-bit guests, the RAM size is checked against the maximum allowed > by KVM in kvm__get_vm_type(). > > There are no users left for the ARM_MAX_MEMORY() macro, remove it. > > Signed-off-by: Alexandru Elisei Reviewed-by: Andre Przywara Thanks, Andre > --- > arm/aarch32/include/kvm/kvm-arch.h | 2 -- > arm/aarch64/include/kvm/kvm-arch.h | 16 ---------------- > 2 files changed, 18 deletions(-) > > diff --git a/arm/aarch32/include/kvm/kvm-arch.h b/arm/aarch32/include/kvm/kvm-arch.h > index 5616b27e257e..467fb09175b8 100644 > --- a/arm/aarch32/include/kvm/kvm-arch.h > +++ b/arm/aarch32/include/kvm/kvm-arch.h > @@ -8,8 +8,6 @@ > struct kvm; > static inline void kvm__arch_enable_mte(struct kvm *kvm) {} > > -#define ARM_MAX_MEMORY(...) ARM_LOMAP_MAX_MEMORY > - > #define MAX_PAGE_SIZE SZ_4K > > #include "arm-common/kvm-arch.h" > diff --git a/arm/aarch64/include/kvm/kvm-arch.h b/arm/aarch64/include/kvm/kvm-arch.h > index 9124f6919d0f..ff857ca6e7b4 100644 > --- a/arm/aarch64/include/kvm/kvm-arch.h > +++ b/arm/aarch64/include/kvm/kvm-arch.h > @@ -8,22 +8,6 @@ unsigned long long kvm__arch_get_kern_offset(struct kvm *kvm, int fd); > int kvm__arch_get_ipa_limit(struct kvm *kvm); > void kvm__arch_enable_mte(struct kvm *kvm); > > -#define ARM_MAX_MEMORY(kvm) ({ \ > - u64 max_ram; \ > - \ > - if ((kvm)->cfg.arch.aarch32_guest) { \ > - max_ram = ARM_LOMAP_MAX_MEMORY; \ > - } else { \ > - int ipabits = kvm__arch_get_ipa_limit(kvm); \ > - if (ipabits <= 0) \ > - max_ram = ARM_HIMAP_MAX_MEMORY; \ > - else \ > - max_ram = (1ULL << ipabits) - ARM_MEMORY_AREA; \ > - } \ > - \ > - max_ram; \ > -}) > - > #define MAX_PAGE_SIZE SZ_64K > > #include "arm-common/kvm-arch.h" _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel