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 8E6F0C47422 for ; Fri, 26 Jan 2024 15:25:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F1E96B0095; Fri, 26 Jan 2024 10:25:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A08A6B0096; Fri, 26 Jan 2024 10:25:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0418E6B0098; Fri, 26 Jan 2024 10:25:29 -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 E49796B0095 for ; Fri, 26 Jan 2024 10:25:29 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B9FAD1408FE for ; Fri, 26 Jan 2024 15:25:29 +0000 (UTC) X-FDA: 81721836378.19.257B41D Received: from out-181.mta1.migadu.com (out-181.mta1.migadu.com [95.215.58.181]) by imf27.hostedemail.com (Postfix) with ESMTP id 0BEB040005 for ; Fri, 26 Jan 2024 15:25:27 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="gXsmiu/Z"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf27.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.181 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=1706282728; 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=DgUhGSnAajARz2sR8zEsgOZsTNsgDGT2+wOJsJvBtFE=; b=3Il8eV8L/nbSdLZjotrsH0+xC9e66m7oLWkin3ZxaqmIi1ePNDcsTwblTeU4M/UHPLHFQ8 M9kBo787AxpBOS39fILq8waqxDVWRejbBwWjsIuqIw8nXIhwFr+8t2WNEDeAbNWYoC/hxN 2RyPjLKv1CSO6miaEyGPtBbokXy74jg= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="gXsmiu/Z"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf27.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.181 as permitted sender) smtp.mailfrom=gang.li@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706282728; a=rsa-sha256; cv=none; b=DH9qhfdKusUCHOPjrsa56cWk1sivzJCOfQaZ/mGbIkXxUFuPy8r1xHJQaHVpZBxdooPa2C 7yfk8/P4OPX0k08HymJyOmbH3UUg0dlsTXGoXwrr6rTQsIDRh8Qt+emHeowg5nTFtjG4NV uAf9aZfBpF715an3/reAUCc5ZzpqawY= 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=1706282726; 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=DgUhGSnAajARz2sR8zEsgOZsTNsgDGT2+wOJsJvBtFE=; b=gXsmiu/ZCf1nMQFyOdSPcIWiSFw45L9E3U4xHBNZLrlxxSNlwx6qWum6Nk/BZJ5TD6kyb2 jZji4uY+b0TrkNYU777z3nkzvP+RZPRiUs6uA84GSunLLr+1e8DmhHiDWLWBdX0usDWBhv Au8J+F364De+i5U9tAHRO6qcgDJNC1o= 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 v5 4/7] hugetlb: pass *next_nid_to_alloc directly to for_each_node_mask_to_alloc Date: Fri, 26 Jan 2024 23:24:08 +0800 Message-Id: <20240126152411.1238072-5-gang.li@linux.dev> In-Reply-To: <20240126152411.1238072-1-gang.li@linux.dev> References: <20240126152411.1238072-1-gang.li@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 0BEB040005 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: qoda4s7hkn3nye37dkcjg941qbjyrxii X-HE-Tag: 1706282727-128505 X-HE-Meta: U2FsdGVkX1+a8SmM2gzvf1/2Iil0Pm+wBVWR6nI/7yEJWEDer9dmfenoO3OHU9mrG/vixtQAKsOTLGI0y8mzRHyrJDyVKePIpl8dTONEO1CP9wp3+dQMAfB8Q6FxjfsQfV8cJ61qg2J8ZQYRcVaKJ8FI7SZh9HOfP1eFUpjI084hHIFEqd//ROyeFDabONI8VC55rw67Y07yuyyBIuE3RNqp1FbVJtzeZVdUf/Pexc10qQ1tfrihMdp6N+rABUHzVd1K3G58ClI1AOU/czGFOiLDAnmr3eN0DhrWo7fWB4Jzf+ONFJdmwZVMD6P+7knQAiK8cZ9AyD/L489NaP3UKtOpiN2y2KlkFQoK/oFF0ZsJtvL3mp+VFgSVwFKc/1vMadeJhuqnDaA4P39rNDdUaDimByowlnznzr1Lwy+qdIWi8RqHAtifpIG1qYWQe0nQRwWlFKhmTJ1xBidzyr4otP8SUkb7Mty8K4HckhLXq9HWRY1zYb1c26VyoNB+Yv4BF4FzA5rulE7DuH9J+MWG0LgUIQJkbEWAgzhwGKuQMTXnLxhsGTOjqN7L7QXLdOvRyHQw1BsxbGyktCQa219gDos1EFuMzxdhfkfB5CAAUbQnOp8bFzjyEIJpkFQEpEmJj+JIBUHCDW5OHFz2JsHExb1Fbwb+oCbx83maHQHQ/38DuJlJx4qxpwGeBHnpCSBj4myZFILBGosL3VFJLAsFZ9yxclW6Q8fUkGSV/a/W8r6ctvPpcOeREFkx3QKnrZLVzrnMOBR7RhKi/ae2Rn+WtF8ixWyWlmM4z/G6U+3iRZkyOw1olnOyalXPhRJuqB+jcjlcPts1FoPS+oHEFa31yJqgqgYSMlxbZxdlSSxjX4zki+N9MT5LYzk4vDjlkNZDlhDa12wodZhXitzOGaBRq5FJOM98+frOXj8j/BxNcoqyUrxINaMB4W1RY094AdLnsKLfuhdPXVOOnvp5XwR yfukiwRa XC8ULI+HTfT1BbFXtVAN+xSkyZMYr/gHc0MAX/fCJk+hPkuw+yOY6Jj/hQyuu1PkzrreQ2P692FOw72H9sR93ij03D/0ZexzS3wy5RRYW9DECSul0HSTXryjDcnDYVvF3wrq+TFz0+qtU0PtjhpP+n+sVaQVV7fnrGdeF9+uaa1aiWSGVGP5nL0Zy53+SL1xA482VREWxvQtfwbeO1gA5vZRzv8jIAzqfK5hDGVPgYFj/eGk= 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 00bbf7442eb6c..e4e8ffa1c145a 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