From nobody Sat Feb 7 15:15:32 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 479EDC001B0 for ; Sat, 24 Jun 2023 02:46:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229864AbjFXCqn (ORCPT ); Fri, 23 Jun 2023 22:46:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229494AbjFXCql (ORCPT ); Fri, 23 Jun 2023 22:46:41 -0400 Received: from out-62.mta0.migadu.com (out-62.mta0.migadu.com [91.218.175.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62328E1 for ; Fri, 23 Jun 2023 19:46:39 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1687574797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=N99W1PdAr0OWUT49Ca/cf/ovMzOhIoXmt9jkyLCr7jE=; b=lqUpTigKQWW+JM3OWisaO4ZycziI/PYiu2SZKvQXrXnlrDSgLjvdEo3KwjuH5AcLXGJHWv BkY3n32PECh8mZToUHXKjqT68SXKlX/cQWVBjZWsZu44JKcq2CHMJxp/qaKQ8nmpKIsVRg hxHYwyeCsNcBYyaY+xwHnWyKeSNqTnw= From: Yajun Deng To: rppt@kernel.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH] memblock: Introduce memblock_reserve_node() Date: Sat, 24 Jun 2023 10:46:22 +0800 Message-Id: <20230624024622.2959376-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It only returns address now in memblock_find_in_range_node(), we can add a parameter pointing to integer for node id of the range, which can be used to pass the node id to the new reserve region. Introduce memblock_reserve_node() so that the node id can be passed to the reserve region in memblock_alloc_range_nid(). Signed-off-by: Yajun Deng --- mm/memblock.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index f9e61e565a53..6b5f6c246458 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -204,6 +204,7 @@ bool __init_memblock memblock_overlaps_region(struct me= mblock_type *type, * @align: alignment of free area to find * @nid: nid of the free area to find, %NUMA_NO_NODE for any node * @flags: pick from blocks based on memory attributes + * @p_nid: ptr to int for nid of the range, can be %NULL * * Utility called from memblock_find_in_range_node(), find free area botto= m-up. * @@ -213,12 +214,12 @@ bool __init_memblock memblock_overlaps_region(struct = memblock_type *type, static phys_addr_t __init_memblock __memblock_find_range_bottom_up(phys_addr_t start, phys_addr_t end, phys_addr_t size, phys_addr_t align, int nid, - enum memblock_flags flags) + enum memblock_flags flags, int *p_nid) { phys_addr_t this_start, this_end, cand; u64 i; =20 - for_each_free_mem_range(i, nid, flags, &this_start, &this_end, NULL) { + for_each_free_mem_range(i, nid, flags, &this_start, &this_end, p_nid) { this_start =3D clamp(this_start, start, end); this_end =3D clamp(this_end, start, end); =20 @@ -239,6 +240,7 @@ __memblock_find_range_bottom_up(phys_addr_t start, phys= _addr_t end, * @align: alignment of free area to find * @nid: nid of the free area to find, %NUMA_NO_NODE for any node * @flags: pick from blocks based on memory attributes + * @p_nid: ptr to int for nid of the range, can be %NULL * * Utility called from memblock_find_in_range_node(), find free area top-d= own. * @@ -248,13 +250,13 @@ __memblock_find_range_bottom_up(phys_addr_t start, ph= ys_addr_t end, static phys_addr_t __init_memblock __memblock_find_range_top_down(phys_addr_t start, phys_addr_t end, phys_addr_t size, phys_addr_t align, int nid, - enum memblock_flags flags) + enum memblock_flags flags, int *p_nid) { phys_addr_t this_start, this_end, cand; u64 i; =20 for_each_free_mem_range_reverse(i, nid, flags, &this_start, &this_end, - NULL) { + p_nid) { this_start =3D clamp(this_start, start, end); this_end =3D clamp(this_end, start, end); =20 @@ -278,6 +280,7 @@ __memblock_find_range_top_down(phys_addr_t start, phys_= addr_t end, * %MEMBLOCK_ALLOC_ACCESSIBLE * @nid: nid of the free area to find, %NUMA_NO_NODE for any node * @flags: pick from blocks based on memory attributes + * @p_nid: ptr to int for nid of the range, can be %NULL * * Find @size free area aligned to @align in the specified range and node. * @@ -287,7 +290,7 @@ __memblock_find_range_top_down(phys_addr_t start, phys_= addr_t end, static phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t= size, phys_addr_t align, phys_addr_t start, phys_addr_t end, int nid, - enum memblock_flags flags) + enum memblock_flags flags, int *p_nid) { /* pump up @end */ if (end =3D=3D MEMBLOCK_ALLOC_ACCESSIBLE || @@ -300,10 +303,10 @@ static phys_addr_t __init_memblock memblock_find_in_r= ange_node(phys_addr_t size, =20 if (memblock_bottom_up()) return __memblock_find_range_bottom_up(start, end, size, align, - nid, flags); + nid, flags, p_nid); else return __memblock_find_range_top_down(start, end, size, align, - nid, flags); + nid, flags, p_nid); } =20 /** @@ -328,7 +331,7 @@ static phys_addr_t __init_memblock memblock_find_in_ran= ge(phys_addr_t start, =20 again: ret =3D memblock_find_in_range_node(size, align, start, end, - NUMA_NO_NODE, flags); + NUMA_NO_NODE, flags, NULL); =20 if (!ret && (flags & MEMBLOCK_MIRROR)) { pr_warn_ratelimited("Could not allocate %pap bytes of mirrored memory\n", @@ -863,6 +866,17 @@ int __init_memblock memblock_phys_free(phys_addr_t bas= e, phys_addr_t size) return memblock_remove_range(&memblock.reserved, base, size); } =20 +static int __init_memblock memblock_reserve_node(phys_addr_t base, phys_ad= dr_t size, + int nid, enum memblock_flags flags) +{ + phys_addr_t end =3D base + size - 1; + + memblock_dbg("%s: [%pa-%pa] nid=3D%d flags=3D%x %pS\n", __func__, + &base, &end, nid, flags, (void *)_RET_IP_); + + return memblock_add_range(&memblock.reserved, base, size, nid, flags); +} + int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) { phys_addr_t end =3D base + size - 1; @@ -1389,6 +1403,7 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr= _t size, { enum memblock_flags flags =3D choose_memblock_flags(); phys_addr_t found; + int p_nid; =20 if (WARN_ONCE(nid =3D=3D MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecat= ed. Use NUMA_NO_NODE instead\n")) nid =3D NUMA_NO_NODE; @@ -1401,15 +1416,15 @@ phys_addr_t __init memblock_alloc_range_nid(phys_ad= dr_t size, =20 again: found =3D memblock_find_in_range_node(size, align, start, end, nid, - flags); - if (found && !memblock_reserve(found, size)) + flags, &p_nid); + if (found && !memblock_reserve_node(found, size, p_nid, flags)) goto done; =20 if (nid !=3D NUMA_NO_NODE && !exact_nid) { found =3D memblock_find_in_range_node(size, align, start, end, NUMA_NO_NODE, - flags); - if (found && !memblock_reserve(found, size)) + flags, &p_nid); + if (found && !memblock_reserve_node(found, size, p_nid, flags)) goto done; } =20 --=20 2.25.1