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 D7BD6C5DF7D for ; Tue, 18 Aug 2026 14:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jHzFJCC+M8tqZnin41JZgMMbwSSc+ifNVeas8AixPfs=; b=XfKRAwWRto13veZPhOzqf7/AMq f2pyOLlU4XHHGC+sEpd9S/COSRJiG6K9GQJwwqv+8yQtkZcrRAsm+fZuCvoS2plDnzMJfOZGhfSFA v8R4hiZ9PJMDdPlQA3q4M/RJo6Hnipl2ZtECoBQDHNLPaPuBeVWf/U6JBfElJmukPNemhiKb0Bbd9 NlX+14PjVQH9mWI44woaxPuRFSshADmrKkJIY5moKZu1SjCgTnY4buksd172k+0cMmPGhVcUzbTB/ +Gz9ZpJ+fEclSf8NfJKOCcWnIRZ8Bv6UtBJghcO53mdfAyiWpoH+1VrHe1mzk3Ie/WStRgs7I401q qLiEM5Hg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wwKY8-000000087A9-0f3P; Tue, 18 Aug 2026 14:12:20 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wwKY0-0000000872k-27sq for linux-arm-kernel@lists.infradead.org; Tue, 18 Aug 2026 14:12:15 +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 F297B19F0; Tue, 18 Aug 2026 07:12:07 -0700 (PDT) Received: from localhost.localdomain (e123572-lin.cambridge.arm.com [10.2.208.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3A4813F85F; Tue, 18 Aug 2026 07:12:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1787062331; bh=nU3eiDcO03IFOkcW/QGHHUOPCdH6UYiP9fWY6Wc22aE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TpDgui9MEP/DBiWOyzoEFsB1lSyWL8ccgweMm+voZxhnjOnFlIV32WzriZZ5/oRPo tnPqXku3XwOXWsK2MZqvD6H70hyFxKWRJQOQL3X5cxyVCg0oEn6vItIQoDoecGu6vE 9voczrix6U4Ain8AcgwnMaD8FjPPJkqWUfsxemAw= From: Kevin Brodsky Date: Tue, 18 Aug 2026 15:08:52 +0100 Subject: [PATCH RFC v9 10/25] memblock: Move INIT_MEMBLOCK_* macros to header MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260818-kpkeys-v9-10-743ad31b2c8f@arm.com> References: <20260818-kpkeys-v9-0-743ad31b2c8f@arm.com> In-Reply-To: <20260818-kpkeys-v9-0-743ad31b2c8f@arm.com> To: linux-hardening@vger.kernel.org Cc: Kevin Brodsky , Andrew Morton , Andy Lutomirski , Catalin Marinas , Dave Hansen , "David Hildenbrand (Arm)" , Jann Horn , Jeff Xu , Joey Gouly , Kees Cook , Linu Cherian , Linus Walleij , Marc Zyngier , Mark Brown , Matthew Wilcox , Maxwell Bland , "Mike Rapoport (IBM)" , Peter Zijlstra , Pierre Langlois , =?utf-8?q?Pierre-Cl=C3=A9ment_Tosi?= , Quentin Perret , Rick Edgecombe , Ryan Roberts , Vlastimil Babka , Will Deacon , Yang Shi , Yeoreum Yun , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, x86@kernel.org, Ira Weiny , Lorenzo Stoakes , Thomas Gleixner X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787062276; l=1850; i=kevin.brodsky@arm.com; s=20260427; h=from:subject:message-id; bh=nU3eiDcO03IFOkcW/QGHHUOPCdH6UYiP9fWY6Wc22aE=; b=B0yfVHLm7lbOmhzKoBAFNdH82AYQgzd/UVKdZtKYaNAexZho70FVP/w0siiGh33OJI1gNWTC/ Brpeg+LeXnWDRFfn/jmPmIAPVCw79DvJkgh9fVeFcjJUTg7KeQ0CBKn X-Developer-Key: i=kevin.brodsky@arm.com; a=ed25519; pk=N2QG+eJKrvkNovwhhwJhnJ4+ScVfsGCHldmqLfcMTFs= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260818_071213_064686_D65BD5F3 X-CRM114-Status: GOOD ( 11.79 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The upcoming page table allocator for the kpkeys_hardened_pgtables feature will need to know the maximum number of memblock regions. Move the corresponding macros to to allow that. INIT_MEMBLOCK_{RESERVED,MEMORY}_REGIONS may be overridden, but this should be fine as only arm64 and loong currently do that and the relevant header is already (indirectly) included by . Signed-off-by: Kevin Brodsky --- include/linux/memblock.h | 11 +++++++++++ mm/memblock.c | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 5afcd99aa8c1..c61f80e31cc1 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -24,6 +24,17 @@ extern unsigned long max_pfn; */ extern unsigned long long max_possible_pfn; +#define INIT_MEMBLOCK_REGIONS 128 +#define INIT_PHYSMEM_REGIONS 4 + +#ifndef INIT_MEMBLOCK_RESERVED_REGIONS +#define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS +#endif + +#ifndef INIT_MEMBLOCK_MEMORY_REGIONS +#define INIT_MEMBLOCK_MEMORY_REGIONS INIT_MEMBLOCK_REGIONS +#endif + /** * enum memblock_flags - definition of memory region attributes * @MEMBLOCK_NONE: no special request diff --git a/mm/memblock.c b/mm/memblock.c index 6349c48154f4..3b497d3556bb 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -30,17 +30,6 @@ #include "internal.h" -#define INIT_MEMBLOCK_REGIONS 128 -#define INIT_PHYSMEM_REGIONS 4 - -#ifndef INIT_MEMBLOCK_RESERVED_REGIONS -# define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS -#endif - -#ifndef INIT_MEMBLOCK_MEMORY_REGIONS -#define INIT_MEMBLOCK_MEMORY_REGIONS INIT_MEMBLOCK_REGIONS -#endif - /** * DOC: memblock overview * -- 2.51.2