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 1ECBAC48BF8 for ; Thu, 22 Feb 2024 14:05:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A09326B0089; Thu, 22 Feb 2024 09:05:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 990F46B008A; Thu, 22 Feb 2024 09:05:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8329E6B008C; Thu, 22 Feb 2024 09:05:09 -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 6A86B6B0089 for ; Thu, 22 Feb 2024 09:05:09 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0E34AC0D9C for ; Thu, 22 Feb 2024 14:05:09 +0000 (UTC) X-FDA: 81819611538.15.CF9C282 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) by imf27.hostedemail.com (Postfix) with ESMTP id 72E054001D for ; Thu, 22 Feb 2024 14:04:55 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=GMb+VdCD; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf27.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.172 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=1708610695; 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=o+8qigIYBf+CF6nmzaQESLXIfknRBaMPQJkianD0US0=; b=sJFGVxsPOpOVUlbBwxllm36A0i49ryJr0nyhoP1BI1hKe46U7uSUYDgrt/HfdbPEh8bF+8 aYuKYdVacVJFqLZjU/f9kZ86CksCvlbPKkZF9di1p3/spLb4HXH2qDnOmBe7lJ+fTIfN+0 QDe6bD9btvUxYXfqWYk6ZU6Gw3lwVi0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=GMb+VdCD; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf27.hostedemail.com: domain of gang.li@linux.dev designates 91.218.175.172 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708610695; a=rsa-sha256; cv=none; b=6/TlZ0akIJfNqkKG2dGq7A/VoLQHCquWSys4MIte9cnp91k/GDStoPwVhUPCcDhbQYPTu7 eY99yBM8XX3j8H3iCcj26c8A20rYx/VK95i0x+O8zxW3p3ibpO8Aa9f4n7lXHTiQo19LJ3 ihVqMn2aJQw6EwWzlqikkFV2rLtG1Bs= 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=1708610693; 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=o+8qigIYBf+CF6nmzaQESLXIfknRBaMPQJkianD0US0=; b=GMb+VdCDD/mQRiGk4B7cYFJq6Uvre0TApLBB9BKJ+sRd1zHzqt/ccv8JB7NwYBykKXKcVg yGsJtPCbMDS2g3UmDUDyGkzjAGtoVsFp1hOGY9p3OVE2ZXd6DuJMgkbwGJhkPF9OGmvazP YrigqBnLGrT2H9Joq7NpfDGHlVTmvWM= From: Gang Li To: Andrew Morton Cc: David Hildenbrand , David Rientjes , Muchun Song , Tim Chen , Steffen Klassert , Daniel Jordan , Jane Chu , "Paul E . McKenney" , Randy Dunlap , linux-mm@kvack.org, linux-kernel@vger.kernel.org, ligang.bdlg@bytedance.com, Gang Li Subject: [PATCH v6 3/8] hugetlb: pass *next_nid_to_alloc directly to for_each_node_mask_to_alloc Date: Thu, 22 Feb 2024 22:04:16 +0800 Message-Id: <20240222140422.393911-4-gang.li@linux.dev> In-Reply-To: <20240222140422.393911-1-gang.li@linux.dev> References: <20240222140422.393911-1-gang.li@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 72E054001D X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: tur346noyrcwndzgzsh1ew7kxjqca14r X-HE-Tag: 1708610695-57286 X-HE-Meta: U2FsdGVkX180RY/2t4fWBr7ttkOqAMfbSUd1/uDnUE4+mMmbGN2PpAA405ijuRnOzQE6Jwy/mDNFl02blD9CUe5LstQSzf6sdqdm8RZLj6+IhyEk5astQi1oufk/Q0xxRGJ+oGSKgKB457mN2BE7v9v6dWpPertAxB8qc8eLyqnICN+XIERop2fj0Z6ekfSU3qlph2cxwBPI+7bNyeeRFvqEahzS7QBOLmX+snGN6GRYFT56A8ddLg480/arL1OWiVXAog28ExG35PoQsCRHKu7QVqgRS+lAMOndP9kEG177rtIVbG2J1gq2oN9s1Xq6PhnRPLpeN+nORXexbDyT96ESGgw89JZkmvc0DHDQoop3D5LLS+GctyhnC+CwZNhgDmvRJd9LFomnvvZc8la3LomHXlpN7m4cUCYf5pjTYZ5R5UT7fbsPR0dmgTT55/47o2fFhBYxiuefAL0tUdXi5X/ervaZnOOQxeriL9AX+S8nM6A234dLjb+u/pTUC2UdGdB0wGSX4gFn8TNGDsECD0BYoZB3ThQVVV141uIGdojV3ITd4S5nLBc1zxr9GwN89ujDsmeUPxbLJMRq31RMMvVXNXZwuje+n4AwCvRmHYPxZ0pRM39KB7B0uiIiyw1pSfUs5ddR8eqwGwDLn0/grvgeBAfxrjl+c4oXHPleZOW+fc2jjb/cU8fOpZOazNRMmPfHEBerDrCpZ823z3wU90BwCxKaNtvaOKIGHnW46ue6ljeXar2is0VKP6Zoy55K1n4jJrvZu0DYxbogXaqrKcF27mj5fg9HH4nrblS1GmOA3rEDpaMvqFlotlIzG/OnK7Yt76i5yvzE6Mo5L97+b0rP3ZXHn9rBBtqmUDikUPT/SM2umjTjBb3NhwKtGkNX6yoryNNzcW8= 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: With parallelization of hugetlb allocation across different threads, each thread works on a differnet node to allocate pages from, instead of all allocating from a common node h->next_nid_to_alloc. 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 Tested-by: David Rientjes Reviewed-by: Tim Chen Reviewed-by: Muchun Song --- mm/hugetlb.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 647e52596e2da..d1ce1a52ad504 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_node, 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_node, nodes_allowed); + *next_node = 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_node, 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_node, 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_node) { 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_node, 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); @@ -3679,7 +3680,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; } @@ -3794,7 +3795,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