From patchwork Thu Feb 6 13:27:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13963095 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20596C02196 for ; Thu, 6 Feb 2025 13:33:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B150F28000E; Thu, 6 Feb 2025 08:33:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AC2FC28000B; Thu, 6 Feb 2025 08:33:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B11328000E; Thu, 6 Feb 2025 08:33:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7C74128000B for ; Thu, 6 Feb 2025 08:33:44 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C7B554B7AF for ; Thu, 6 Feb 2025 13:33:33 +0000 (UTC) X-FDA: 83089611906.17.1E224BB Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id 2FF81100025 for ; Thu, 6 Feb 2025 13:33:31 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=gX7xnL6G; spf=pass (imf05.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738848812; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=dwgPwEXkcwGOXGQmeLgJ7EjQPMg4p6VQGy7v4D8ZRag=; b=v5Rvqq+Drkjs085dVziZ42KwLM0/FReKUA0ZbZX9EG1gbKt2bHcdcl/Wu0pojxSWjiKPq5 mxFH7PFsTzoGNNSC1fBWWfGAgaYrTLOwxQ04Y9DgoufhLjc2ADKr8Qs2FEbT1eJOtJOD1G IwIvgvK0OpS44EvpF5WUOVHfngEgIcE= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=gX7xnL6G; spf=pass (imf05.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738848812; a=rsa-sha256; cv=none; b=sMPX11Qwz8M8e4qDQZFfxVL4nqyPiaAGGNRriMsRknkmAsrx5kY7T9BhuIh/rF/r5pvg8W v8dCqpsl9dYtUbu32qIeV3L9ER1KXb8G4NKJCaOuUTY4HZ0IZZP0EsMLIHG67sBcrYELwB 9/WZW18yIQD3DIpksILjjTGEyu5v1OU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 98CB35C5036; Thu, 6 Feb 2025 13:27:50 +0000 (UTC) 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> MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2FF81100025 X-Stat-Signature: tuf15zfsyis4ny6qdzwydju3twm6r9zh X-Rspam-User: X-HE-Tag: 1738848811-479702 X-HE-Meta: U2FsdGVkX18VoZz7NIkS9tXWYoioxnbwUHI3RL/VNNluS/LwGUnTB7guYaVmsrSqTgXPTKJ8qRynLpNxgvY58/QqIGtZ7AcoR+3oP0ZRH7UgBx6Wr5cgbOOnndisnMq5oR9Mdpfr0u/YRJEsz2PKu1f9d/rfy+NEBYODRLfnT5sygM1TWFNEf6OEuyHQv0+aTcGtuoyt5iskVkWivof1LOv99y6pCnZM8PNb/aBPJQIOzgEv+aY3t1fpKdj/YuNoaQaiqGd1znayHrBVn9MqOcBbxh4/X6GKlji969qzPx5+qkZNzk1KG4AFz1vu3No6bwwZ55BuKj3dRhytkekQQezU5j6Vj9GEyyhj5uw1QeQ/opIufyfBVHSDao0oFh1pbnpiYFmXY5JaSKkO5GdGaJPVgHR3csKcqQk6Zv+Q5qOZLm6XeMHM7vUtL/Q2L4ZYNMzI2qkqjqdrHT8/SfsNlypQ12roWGGVtON89s1X8OwDsb2dwgLCpbsxREqtp+9aYjiPLMBqOp1G5fhhaCRni5S6r7Owjn1Z4kK2AdKSt1zYKyLSbLTB+uoEV6WhLFjicKuWaP5WxInWUgw8UCsSPl06FhZ+vdSf1m7b1KK6dCQvNlJit4MYAgFTJjon1770Eyo5LOMOCrWVGC/2W3N6TkjxNMNf5MOnJRQf0IF0YRBP2Qc93+F3EkGuhE6MJRscgEKk3S4D4r34mYyQF9S0JBNpp+iu315iDiZWs4uvAdpCsCAxovvWfAqj/CjB2XyhDlqBJ6tdoSTRDOvoTSr1uSR1KytGWN3DNJJVvbl6tFqZwHrC/VjX/NqoA1vpubLqAVufvzwIqR6ivOZxnyEDl3GGqGbqYiATknqflN9ZhyGLa6tDMpCWff2Eb7gfgJAE2lQjbGk4zC7lkuKXCruVvAl0CicahNKJZIftr/eHNh4gQh9QMuSfncPzU8CBeagpxnEsVrB8PQkqKZ7Uw9R i3gC3fmb cXFnI9hvNf4HvvnzM10jgzf/AkvS4ngJ7MSwAjviFbJMZjw+xpFoyoq0bcXtxAZvqeSA8TnisvmsXuDy9Kf7RJ0tzxCsSuHg1w20607Ul1JVpVNKDBywxOchitdqeuAqeapc4mbctE7hLkZontrKvAadegJsIEafNK8x2C1MFGldpun/ymcCcUUko5vX53Td+1gqMNis3urayJ6FvsrkMVUeWqsBQpT5akg+ePJOrL1rxxairMRFR01jZs/kbx4AgHAvgJre7gZgnL4tp21i056KZkj6M+Sdqyq28wJnJUYSNZwxsF/uyQeT3LH6Fno7d/BjHKRRSIDWs5LkKHZoN0aA55uB3j+6kL1ODfGxE+43raRM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 = 0x4, /* don't add to kernel direct mapping */ MEMBLOCK_DRIVER_MANAGED = 0x8, /* always detected via a driver */ MEMBLOCK_RSRV_NOINIT = 0x10, /* don't initialize struct pages */ + MEMBLOCK_RSRV_KERN = 0x20, /* memory reserved for kernel use */ }; /** @@ -116,7 +117,19 @@ int memblock_add_node(phys_addr_t base, phys_addr_t size, 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_addr_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(void) 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)); /* Update slab flag */ *in_slab = use_slab; @@ -641,7 +641,7 @@ static int __init_memblock memblock_add_range(struct memblock_type *type, #ifdef CONFIG_NUMA WARN_ON(nid != memblock_get_region_node(rgn)); #endif - WARN_ON(flags != rgn->flags); + WARN_ON(flags != MEMBLOCK_NONE && flags != rgn->flags); nr_new++; if (insert) { if (start_rgn == -1) @@ -901,14 +901,15 @@ int __init_memblock memblock_phys_free(phys_addr_t base, phys_addr_t size) return memblock_remove_range(&memblock.reserved, base, size); } -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 = base + size - 1; - memblock_dbg("%s: [%pa-%pa] %pS\n", __func__, - &base, &end, (void *)_RET_IP_); + memblock_dbg("%s: [%pa-%pa] nid=%d flags=%x %pS\n", __func__, + &base, &end, nid, flags, (void *)_RET_IP_); - return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0); + return memblock_add_range(&memblock.reserved, base, size, nid, flags); } #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP @@ -1459,14 +1460,14 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, again: found = 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; if (numa_valid_node(nid) && !exact_nid) { found = 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; } @@ -1751,6 +1752,20 @@ phys_addr_t __init_memblock memblock_reserved_size(void) return memblock.reserved.total_size; } +phys_addr_t __init_memblock memblock_reserved_kern_size(int nid) +{ + struct memblock_region *r; + phys_addr_t total = 0; + + for_each_reserved_mem_region(r) { + if (nid == memblock_get_region_node(r) || !numa_valid_node(nid)) + if (r->flags & MEMBLOCK_RSRV_KERN) + total += 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[] = { [ilog2(MEMBLOCK_NOMAP)] = "NOMAP", [ilog2(MEMBLOCK_DRIVER_MANAGED)] = "DRV_MNG", [ilog2(MEMBLOCK_RSRV_NOINIT)] = "RSV_NIT", + [ilog2(MEMBLOCK_RSRV_KERN)] = "RSV_KERN", }; static int memblock_debug_show(struct seq_file *m, void *private)