From nobody Mon Feb 9 09:50:46 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DE971624E3; Thu, 6 Feb 2025 13:28:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738848510; cv=none; b=i8Q++8jYCPxh7xEaJoiOs9zi6FYk8asnSCOJw1qZgXhM8C9lwew1QMKn3x2rWRbpUcslgIC9VL386ajttdnRejG1zWTlS1ggQhEIyRKt8ucGST09cZl1QxUceHAdzY9kIdK2hrq3VI2EFlgjDRo8eXyFqeQnYvF7DASiPCsi+yw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738848510; c=relaxed/simple; bh=7To/iR/9rk2Ld4I6CBIN7hsqKtoOH+4meeYk+05Pg1s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YsonVbuTnr0vybmwEQKidx7rCoOWSvtVXhX9usJN55bnCbQIg92eryhntmQmazMW4x9j/MB8/4LDS+cLstaKIy3t7BcJ2pTCQkcYTJMvgdplwfEqmbV+GG5JxvAfEd0/oVvX3zF1Vz9pICY5QoksgOXu6WzZDavOc4LcRP37jDs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gX7xnL6G; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gX7xnL6G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93B3EC4CEE8; Thu, 6 Feb 2025 13:28:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738848510; bh=7To/iR/9rk2Ld4I6CBIN7hsqKtoOH+4meeYk+05Pg1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gX7xnL6GCVqc63zHzfRGBVkVXmpG/UInlzAamHp6vWIxeNSlWeMw/gWcWyc0yWTSS BWxYBGynAl51oCkZFwu7C8eswNs1UrjGbvPC+ieegpopxsbnHfj5IyryQnq70zC0FN B3VcUdPxUB9Z3qgOXAiUblAJh9z+mGkASNvE69WcxMel63Bdv7nW8Z7smXHPcooJ5B foloDgLeRj5zqgo5nMOI1Ia8x2BwRWlwVmxQFR+EFxzG+BIPcapmdTRenMIRm44tfy p6M/KDBMiWoC6IyvgbJgFAdHs+eEVS8/MJzW8ZyEVVyD7BziWY7QNBT0HGAJdoHVH7 GXtbyy+SA5x1A== From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Alexander Graf , Andrew Morton , Andy Lutomirski , Anthony Yznaga , Arnd Bergmann , Ashish Kalra , Benjamin Herrenschmidt , Borislav Petkov , Catalin Marinas , Dave Hansen , David Woodhouse , Eric Biederman , Ingo Molnar , James Gowans , Jonathan Corbet , Krzysztof Kozlowski , Mark Rutland , Mike Rapoport , Paolo Bonzini , Pasha Tatashin , "H. Peter Anvin" , Peter Zijlstra , Pratyush Yadav , Rob Herring , Rob Herring , Saravana Kannan , Stanislav Kinsburskii , Steven Rostedt , Thomas Gleixner , Tom Lendacky , Usama Arif , Will Deacon , devicetree@vger.kernel.org, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: [PATCH v4 02/14] memblock: add MEMBLOCK_RSRV_KERN flag Date: Thu, 6 Feb 2025 15:27:42 +0200 Message-ID: <20250206132754.2596694-3-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250206132754.2596694-1-rppt@kernel.org> References: <20250206132754.2596694-1-rppt@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Mike Rapoport (Microsoft)" to denote areas that were reserved for kernel use either directly with memblock_reserve_kern() or via memblock allocations. Signed-off-by: Mike Rapoport (Microsoft) --- include/linux/memblock.h | 16 +++++++++++++++- mm/memblock.c | 32 ++++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index e79eb6ac516f..65e274550f5d 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -50,6 +50,7 @@ enum memblock_flags { MEMBLOCK_NOMAP =3D 0x4, /* don't add to kernel direct mapping */ MEMBLOCK_DRIVER_MANAGED =3D 0x8, /* always detected via a driver */ MEMBLOCK_RSRV_NOINIT =3D 0x10, /* don't initialize struct pages */ + MEMBLOCK_RSRV_KERN =3D 0x20, /* memory reserved for kernel use */ }; =20 /** @@ -116,7 +117,19 @@ int memblock_add_node(phys_addr_t base, phys_addr_t si= ze, int nid, int memblock_add(phys_addr_t base, phys_addr_t size); int memblock_remove(phys_addr_t base, phys_addr_t size); int memblock_phys_free(phys_addr_t base, phys_addr_t size); -int memblock_reserve(phys_addr_t base, phys_addr_t size); +int __memblock_reserve(phys_addr_t base, phys_addr_t size, int nid, + enum memblock_flags flags); + +static __always_inline int memblock_reserve(phys_addr_t base, phys_addr_t = size) +{ + return __memblock_reserve(base, size, NUMA_NO_NODE, 0); +} + +static __always_inline int memblock_reserve_kern(phys_addr_t base, phys_ad= dr_t size) +{ + return __memblock_reserve(base, size, NUMA_NO_NODE, MEMBLOCK_RSRV_KERN); +} + #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP int memblock_physmem_add(phys_addr_t base, phys_addr_t size); #endif @@ -477,6 +490,7 @@ static inline __init_memblock bool memblock_bottom_up(v= oid) =20 phys_addr_t memblock_phys_mem_size(void); phys_addr_t memblock_reserved_size(void); +phys_addr_t memblock_reserved_kern_size(int nid); unsigned long memblock_estimated_nr_free_pages(void); phys_addr_t memblock_start_of_DRAM(void); phys_addr_t memblock_end_of_DRAM(void); diff --git a/mm/memblock.c b/mm/memblock.c index 95af35fd1389..4c33baf4d97c 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -491,7 +491,7 @@ static int __init_memblock memblock_double_array(struct= memblock_type *type, * needn't do it */ if (!use_slab) - BUG_ON(memblock_reserve(addr, new_alloc_size)); + BUG_ON(memblock_reserve_kern(addr, new_alloc_size)); =20 /* Update slab flag */ *in_slab =3D use_slab; @@ -641,7 +641,7 @@ static int __init_memblock memblock_add_range(struct me= mblock_type *type, #ifdef CONFIG_NUMA WARN_ON(nid !=3D memblock_get_region_node(rgn)); #endif - WARN_ON(flags !=3D rgn->flags); + WARN_ON(flags !=3D MEMBLOCK_NONE && flags !=3D rgn->flags); nr_new++; if (insert) { if (start_rgn =3D=3D -1) @@ -901,14 +901,15 @@ int __init_memblock memblock_phys_free(phys_addr_t ba= se, phys_addr_t size) return memblock_remove_range(&memblock.reserved, base, size); } =20 -int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) +int __init_memblock __memblock_reserve(phys_addr_t base, phys_addr_t size, + int nid, enum memblock_flags flags) { phys_addr_t end =3D base + size - 1; =20 - memblock_dbg("%s: [%pa-%pa] %pS\n", __func__, - &base, &end, (void *)_RET_IP_); + memblock_dbg("%s: [%pa-%pa] nid=3D%d flags=3D%x %pS\n", __func__, + &base, &end, nid, flags, (void *)_RET_IP_); =20 - return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0= ); + return memblock_add_range(&memblock.reserved, base, size, nid, flags); } =20 #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP @@ -1459,14 +1460,14 @@ phys_addr_t __init memblock_alloc_range_nid(phys_ad= dr_t size, again: found =3D memblock_find_in_range_node(size, align, start, end, nid, flags); - if (found && !memblock_reserve(found, size)) + if (found && !__memblock_reserve(found, size, nid, MEMBLOCK_RSRV_KERN)) goto done; =20 if (numa_valid_node(nid) && !exact_nid) { found =3D memblock_find_in_range_node(size, align, start, end, NUMA_NO_NODE, flags); - if (found && !memblock_reserve(found, size)) + if (found && !memblock_reserve_kern(found, size)) goto done; } =20 @@ -1751,6 +1752,20 @@ phys_addr_t __init_memblock memblock_reserved_size(v= oid) return memblock.reserved.total_size; } =20 +phys_addr_t __init_memblock memblock_reserved_kern_size(int nid) +{ + struct memblock_region *r; + phys_addr_t total =3D 0; + + for_each_reserved_mem_region(r) { + if (nid =3D=3D memblock_get_region_node(r) || !numa_valid_node(nid)) + if (r->flags & MEMBLOCK_RSRV_KERN) + total +=3D r->size; + } + + return total; +} + /** * memblock_estimated_nr_free_pages - return estimated number of free pages * from memblock point of view @@ -2397,6 +2412,7 @@ static const char * const flagname[] =3D { [ilog2(MEMBLOCK_NOMAP)] =3D "NOMAP", [ilog2(MEMBLOCK_DRIVER_MANAGED)] =3D "DRV_MNG", [ilog2(MEMBLOCK_RSRV_NOINIT)] =3D "RSV_NIT", + [ilog2(MEMBLOCK_RSRV_KERN)] =3D "RSV_KERN", }; =20 static int memblock_debug_show(struct seq_file *m, void *private) --=20 2.47.2