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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73DFCC46CD2 for ; Tue, 2 Jan 2024 13:13:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D5BB6B007B; Tue, 2 Jan 2024 08:13:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 085A06B0081; Tue, 2 Jan 2024 08:13:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E40716B00A2; Tue, 2 Jan 2024 08:13:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CFEB56B007B for ; Tue, 2 Jan 2024 08:13:35 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A10E01C1017 for ; Tue, 2 Jan 2024 13:13:35 +0000 (UTC) X-FDA: 81634412790.17.2C435A4 Received: from out-189.mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.189]) by imf11.hostedemail.com (Postfix) with ESMTP id E3C4140015 for ; Tue, 2 Jan 2024 13:13:33 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="qcQ/Nui/"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf11.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.189 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704201214; 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=1vziwaehcp4Mlf2+5m5PWlp5vkO7nD1McNxi9fSvMFU=; b=O11NN2x5NK6fhMKsSccA/oLVcxR5YGU52qBvIoDAJu41dUM7XDrw62iRZOJDEn0mSyClCQ WgbLgA/VOCImdVRwgJog0ZCp3mAeMlth9FUYmk1eLd9Pxc//bk2GTfj0+ltsU39PnuCg69 +RMOrFv7MYueq5FgsrldCRTFFPUaVYE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="qcQ/Nui/"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf11.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.189 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704201214; a=rsa-sha256; cv=none; b=Frx6nn+W4ykXvbP33LTba9lRAuAVQbzY3/skEPPR8BRulugR4BO2kR/mP7lsWFUcp6t1PT A9VYIrIALGJFOtmwmjHaSJO5uJwjB9L0KgrxKjfRBJt/040zGASgMkRL5M4rr38WiFrK5W IQJkC6SWXilUolb8siSN+vOdEg4BlLg= 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=1704201212; 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: in-reply-to:in-reply-to:references:references; bh=1vziwaehcp4Mlf2+5m5PWlp5vkO7nD1McNxi9fSvMFU=; b=qcQ/Nui/5Ddo4hq2TnILxFLnHXPOYrnuSz5qK6UAQm45+GQS+0RyxWTYvckmzZSTJRgHK6 y8iYkcup7wCN7qn8SKZwnf6eds3fWGGP/aglezu4KP6rMrK/MznoUTelkMah5ZTP2EvQrM uC8anNSTIvbFRJYUaxaebIz6ZnbBmiE= From: Gang Li To: David Hildenbrand , David Rientjes , Mike Kravetz , Muchun Song , Andrew Morton , Tim Chen Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, ligang.bdlg@bytedance.com, Gang Li Subject: [PATCH v3 4/7] hugetlb: pass *next_nid_to_alloc directly to for_each_node_mask_to_alloc Date: Tue, 2 Jan 2024 21:12:46 +0800 Message-Id: <20240102131249.76622-5-gang.li@linux.dev> In-Reply-To: <20240102131249.76622-1-gang.li@linux.dev> References: <20240102131249.76622-1-gang.li@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: E3C4140015 X-Stat-Signature: tyfrdnxtgjua8he5gjw1aqw5g8wbeehy X-Rspam-User: X-HE-Tag: 1704201213-953261 X-HE-Meta: U2FsdGVkX1+sB8xA9kaKNnhRMUR+AUrb7tiWe0ugDnAfNKyNr2Z/Ae6cu8iZXqY4+QqQtIKv/2LIwcJQ1HKZWVUuxM5V/Wh5ZbA7y/XEjmeq42TV3nntLwS1Io1tly3VRJhOuYGQgkkXejh/nFe7ma19CvJW2CqeuPU72K92CqohRPPPi+wM7bZqIEk4qdERcvuuD93bpAX+B2HvWnQhRSWB8wF9nMEonYTPDDkbo4nL+OFSUwnTuS7e4Gl2Zrst4pH4aPQljgMHNbgw6UGgY0ZUG12oj0h8ThtUNwztxvIRdyLBCTiWrJ8kWSHTyW6N0uDdOGyoIVaRZGKNSEdDsmOvwF0FxAZJAHFk/ZtoxCu5Bd7Rasm96t0ghzTkj7Yk/wC55RYjET3IWKpNY7ekbgqgwSmE7Rwuz3rPn3t4ryjW6xvcnx1KY1ikfqReJOs+yI6f08PdDsTM5OjnjHGNe4yomOq98BifasJdttQpf+yp3+EuPJHmRIP+09wFn6T5v6gJ4TkH5wxSFfxFZAyH8Rsglgi7h6Zp1Xp3mEaKQKOoyBBj3z3QqPamMXCwukgoePJE97ud7+9ih2Gtc+D5wnxEGQn8OaKgc75hwcuR3OTb2UfZgxFyrFq9z3eaJmLDUsuXzYP6K7yzTI+tcpoUB6zfCQQsj6g4n5ko0DBAE/xHDCt9sFxFuoS3hEBcjt/ApoBn/mKuAXkhvR4wvui60SC1LFwrDZucjR0cTiVjGiZIcooOHKqWLNJ6w4c/lI6bthuyVr+t1FqlNQaIxBtdHfrvGWpw5Gnq4KXOvDHzCNI3AIsQKTGugyHrroKFYPYCFjTO49kn6gjuAGvzrnBrx3osqIOF3CS5BG5COvC4BJHFCAPhisUPOTFtnkatsSzRWU9LFvs5ok46aPDRSP8/iujutTDtH4JDT8wG5qqijQM0p/1gltjJtE2ykArCMWwCXL3NfrNytbHPNoJY2rd W51Hq60Z hTErc7xXz70K37AnquGnFds5GwxQ3nIRXQ3CtoguTn883ozyjLXKUqQhDOGkRYMU3y0pswI8PLPhxXV9KF4M5LcYE3hA7HnFcdv9VX0CairEejaN/eWLLZjIYAwTU78oPfyRp 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: The parallelization of hugetlb allocation leads to errors when sharing h->next_nid_to_alloc across different threads. To address this, it's necessary to assign a separate next_nid_to_alloc for each thread. Consequently, the hstate_next_node_to_alloc and for_each_node_mask_to_alloc have been modified to directly accept a *next_nid_to_alloc parameter, ensuring thread-specific allocation and avoiding concurrent access issues. Signed-off-by: Gang Li --- This patch seems not elegant, but I can't come up with anything better. Any suggestions will be highly appreciated! --- mm/hugetlb.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 92448e747991d..a71bc1622b53b 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1464,15 +1464,15 @@ static int get_valid_node_allowed(int nid, nodemask_t *nodes_allowed) * next node from which to allocate, handling wrap at end of node * mask. */ -static int hstate_next_node_to_alloc(struct hstate *h, +static int hstate_next_node_to_alloc(int *next_nid_to_alloc, nodemask_t *nodes_allowed) { int nid; VM_BUG_ON(!nodes_allowed); - nid = get_valid_node_allowed(h->next_nid_to_alloc, nodes_allowed); - h->next_nid_to_alloc = next_node_allowed(nid, nodes_allowed); + nid = get_valid_node_allowed(*next_nid_to_alloc, nodes_allowed); + *next_nid_to_alloc = next_node_allowed(nid, nodes_allowed); return nid; } @@ -1495,10 +1495,10 @@ static int hstate_next_node_to_free(struct hstate *h, nodemask_t *nodes_allowed) return nid; } -#define for_each_node_mask_to_alloc(hs, nr_nodes, node, mask) \ +#define for_each_node_mask_to_alloc(next_nid_to_alloc, nr_nodes, node, mask) \ for (nr_nodes = nodes_weight(*mask); \ nr_nodes > 0 && \ - ((node = hstate_next_node_to_alloc(hs, mask)) || 1); \ + ((node = hstate_next_node_to_alloc(next_nid_to_alloc, mask)) || 1); \ nr_nodes--) #define for_each_node_mask_to_free(hs, nr_nodes, node, mask) \ @@ -2350,12 +2350,13 @@ static void prep_and_add_allocated_folios(struct hstate *h, */ static struct folio *alloc_pool_huge_folio(struct hstate *h, nodemask_t *nodes_allowed, - nodemask_t *node_alloc_noretry) + nodemask_t *node_alloc_noretry, + int *next_nid_to_alloc) { gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE; int nr_nodes, node; - for_each_node_mask_to_alloc(h, nr_nodes, node, nodes_allowed) { + for_each_node_mask_to_alloc(next_nid_to_alloc, nr_nodes, node, nodes_allowed) { struct folio *folio; folio = only_alloc_fresh_hugetlb_folio(h, gfp_mask, node, @@ -3310,7 +3311,7 @@ int __alloc_bootmem_huge_page(struct hstate *h, int nid) goto found; } /* allocate from next node when distributing huge pages */ - for_each_node_mask_to_alloc(h, nr_nodes, node, &node_states[N_MEMORY]) { + for_each_node_mask_to_alloc(&h->next_nid_to_alloc, nr_nodes, node, &node_states[N_MEMORY]) { m = memblock_alloc_try_nid_raw( huge_page_size(h), huge_page_size(h), 0, MEMBLOCK_ALLOC_ACCESSIBLE, node); @@ -3684,7 +3685,7 @@ static int adjust_pool_surplus(struct hstate *h, nodemask_t *nodes_allowed, VM_BUG_ON(delta != -1 && delta != 1); if (delta < 0) { - for_each_node_mask_to_alloc(h, nr_nodes, node, nodes_allowed) { + for_each_node_mask_to_alloc(&h->next_nid_to_alloc, nr_nodes, node, nodes_allowed) { if (h->surplus_huge_pages_node[node]) goto found; } @@ -3799,7 +3800,8 @@ static int set_max_huge_pages(struct hstate *h, unsigned long count, int nid, cond_resched(); folio = alloc_pool_huge_folio(h, nodes_allowed, - node_alloc_noretry); + node_alloc_noretry, + &h->next_nid_to_alloc); if (!folio) { prep_and_add_allocated_folios(h, &page_list); spin_lock_irq(&hugetlb_lock); -- 2.20.1