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 677C9EB64D7 for ; Sat, 24 Jun 2023 02:46:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5BB218D0002; Fri, 23 Jun 2023 22:46:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 56AEA8D0001; Fri, 23 Jun 2023 22:46:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 432A88D0002; Fri, 23 Jun 2023 22:46:42 -0400 (EDT) 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 3070D8D0001 for ; Fri, 23 Jun 2023 22:46:42 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id DE44B40B6B for ; Sat, 24 Jun 2023 02:46:41 +0000 (UTC) X-FDA: 80936103402.19.1A846C8 Received: from out-19.mta0.migadu.com (out-19.mta0.migadu.com [91.218.175.19]) by imf14.hostedemail.com (Postfix) with ESMTP id D10BE100007 for ; Sat, 24 Jun 2023 02:46:39 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=lqUpTigK; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf14.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.19 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687574800; 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:references:dkim-signature; bh=N99W1PdAr0OWUT49Ca/cf/ovMzOhIoXmt9jkyLCr7jE=; b=u+fS0N22oAdx3qln8tQWk+DdiFr5CzeRl6bprgTCD9KCL6uToBlER2+neOKzQLObfUa87L AOvAGHsyP8u2KsMgiHNS5uO5+PdEiCwbw0ce2D5/OHifYAKsIksOCA+m614kVYQjkZ6W2C nyVqoeOgr/ga09q8ZDlksUDm5s3xqRM= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=lqUpTigK; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf14.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.19 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687574800; a=rsa-sha256; cv=none; b=sPg3uDhAJMQ5WIp/4gCRjKNKmziSnOAvIryxw7w80ZbIwR22PIods1sitAqnn/SF93M5mt yi3NSJt+i0rROFQ7SHn3G5czvKPCZG6uDbBGLRRHNFMor5LAlAWtJVtKyKvGJVX5xgrahl fvXpg+mjuzeioAQwrjDGwIQIdkQRp+M= 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: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: D10BE100007 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: hf4x7piqafgx4esnextkotpg7haup7go X-HE-Tag: 1687574799-794562 X-HE-Meta: U2FsdGVkX1/4RJcCrFwcBRggCoovs/S11nTjVNyAQxdGC8RYYlbXnQgjEDCNKo1V02IrI1kJBn5loyjj7ja6WXayusVvczFuS+r7Ai9SfR1iJNIYJZir4qFNkIBDb35nKSzrf5+A1amrU9wYaCtgxYsbKBTWNnLJiaFtF3VsAAVXYsNNpbeDw7vzC2PvvfTmxrpno0xr3Vi4u0rVeMKnIaf4xvnx68BUmLXX/x3BXgwU98L1GdIxHOLIkRtu4MA4MPlORqJFXKUeEZH1fFzodBSsdF2Zo9pPQ5OX9wwFNyqg87eniwg46ZN01gyUYRRx0S5CDqlzZdZr9SO92JAuxvSUreqSkskHSSFuh+Vk1d5bYOL5Ab+GmdpbePAxQE6YLiLfTXR58j3uk3Z1YIZ5IebmLgJI39mxTZkVltC8eMhvItVDM032PUJKbpHmlr8xxy/EboSaHC0XOx01cEQZKxONtLmEK2Ff2B5HVaDWWAgmHSXknuD0wK/h/hHZu+RL3EQJQH5YO2l5vXmIvddrYz1ZRx0uffgD2+JI7ap5FnxAbC80x/P29fuFc0JLh28r34FvL7kTU92TdzqTx3rPFQlglgRyeLdnIiTIAnQtpGczHnEw8gMf3wxzzrE3gjIfEVzcbu1MitXxXWFTgnwkOayX8ZfVswPF5HWkoftDCz0Sjrb30LAkr4hYmK7+zRJEa+XIgeaiBGCX1IT3u2Y1RQfXk41q6fZUaHifKZ2PUT1uGzjQHeJURqVL3pZcHt7tdL2PoZsXkYKA+qtbzM9WM11uRAhgZNbQbRdpCkG6ILHX8L1Qo9/WMRYtvg2bQbqFqEhpZwiFGB4aNjJUmV0m8oeswFZn5eFZUy+Bottk3Ln0OzzAnj5cPrzaTKIv1jA20GJwAM8qb8BET6ghqRVXyQ+8LJ0AhFLj++Qj9r5xWYo5OxOsKHRXVNhjmLmLNFtFV8m6jbDx+MycaBrv0c1 +i+YhEIB 3NrJe1RrJyP1QNz4mJGNBH+De0hm3LbaoDQHPzpy2MYx7w1cLuHcmR4e7YMNRF2eOMIJ1+eHpvM6QyhYsGrId4f/NO8zeWbk+ompcW7LaCULWDMSzQSHjHszvT4oWWLaWyeK+ 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: 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 memblock_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 bottom-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; - 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 = clamp(this_start, start, end); this_end = clamp(this_end, start, end); @@ -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-down. * @@ -248,13 +250,13 @@ __memblock_find_range_bottom_up(phys_addr_t start, phys_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; for_each_free_mem_range_reverse(i, nid, flags, &this_start, &this_end, - NULL) { + p_nid) { this_start = clamp(this_start, start, end); this_end = clamp(this_end, start, end); @@ -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 == MEMBLOCK_ALLOC_ACCESSIBLE || @@ -300,10 +303,10 @@ static phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t size, 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); } /** @@ -328,7 +331,7 @@ static phys_addr_t __init_memblock memblock_find_in_range(phys_addr_t start, again: ret = memblock_find_in_range_node(size, align, start, end, - NUMA_NO_NODE, flags); + NUMA_NO_NODE, flags, NULL); 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 base, phys_addr_t size) return memblock_remove_range(&memblock.reserved, base, size); } +static int __init_memblock memblock_reserve_node(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] nid=%d flags=%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 = base + size - 1; @@ -1389,6 +1403,7 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, { enum memblock_flags flags = choose_memblock_flags(); phys_addr_t found; + int p_nid; if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n")) nid = NUMA_NO_NODE; @@ -1401,15 +1416,15 @@ 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)) + flags, &p_nid); + if (found && !memblock_reserve_node(found, size, p_nid, flags)) goto done; if (nid != NUMA_NO_NODE && !exact_nid) { found = 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; } -- 2.25.1