From patchwork Thu Feb 22 14:04:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gang Li X-Patchwork-Id: 204782 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp272821dyb; Thu, 22 Feb 2024 06:06:01 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXgMLV9KaIqyjCNET5yyeKm04p9fZvcoP/+Qwxnnn9Urv+JmSL8LJab3nDcRuiJYppPwzDgLaGq1tOzPclznjnI23jFVg== X-Google-Smtp-Source: AGHT+IFYRCAOuxVvFBoWoDQIkMoIIuYkZ1sP4WSPeGZLbTCObPPWg88HQWFvysQ+D4I06DoQ2ys6 X-Received: by 2002:a17:906:24db:b0:a3f:9df3:2a4f with SMTP id f27-20020a17090624db00b00a3f9df32a4fmr791854ejb.9.1708610761677; Thu, 22 Feb 2024 06:06:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708610761; cv=pass; d=google.com; s=arc-20160816; b=I/iY3PjV6zT1nIHOTUZ5aT5KlXvXRpZHtVqmIp5LBsNNv/tpWCzwI3kCbdp5UgrKFn 0i0S6xGfpOoyfOHlgOcedj1QBg2Q9VmBe+W0Dw26mrWNpnqOuTsk2QuHa92izFkHl0zw dEkR0hjUWW9790JWBokYtZVkWvPHwDjZlmZu+FTzWSO8UZcbsHWXlHKN0Zm73cQkC0A1 743gQNJIAaKXko0DoqLfGMoaHQnWDs3tYHqRx3CX0vEVv/+eqYp9U8hTKR5pOi3QCTYl d1xIR3YK/gqhr2rDEKMgxJNG3eGoSZLaFZOt8McdXKXsx0OgZmxhEmohumxHLWNBlSd3 TCZg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=o+8qigIYBf+CF6nmzaQESLXIfknRBaMPQJkianD0US0=; fh=yRWAnXCrDeo1JkXV9iUtee7xVlLig8radlX7vPmVxyI=; b=LtUTzjopXfo0atttQxFqNY8RwrO71onW98uyD/mm0xUQ71nWI7EYx9tRlBPICN0ukz PJ0efq12G/F/mmht952a5vVQHSxDwGObZMjfsXbK2d1TfftMRbozlHEZVKOFR0gg56UT 7rdSa+2oIfpZX81GgYwmGsOoqex7wfT0gVaayRhii9o8XW6mK9HbjFpfeyi77USMIRZ+ fTj3SwDkmwfiyxDJOO91tRwlLSrEHWqFFbmcXjJXqO7r+PAhTP2iXb/YBFZnf72vHkKd vnBGYMFPKnEono+jD02Z/gtaWkdvvAvlbi49bhUh9bJERA4kOJXpw7H67dpmjspQlgcp kkmg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=GMb+VdCD; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-76664-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76664-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id mb11-20020a170906eb0b00b00a3f8f20637fsi420426ejb.823.2024.02.22.06.06.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 06:06:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76664-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=GMb+VdCD; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-76664-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76664-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 4CCA51F28883 for ; Thu, 22 Feb 2024 14:06:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 13C3F14A096; Thu, 22 Feb 2024 14:05:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="GMb+VdCD" Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91E60148FFE for ; Thu, 22 Feb 2024 14:04:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708610697; cv=none; b=q3WlXVQ9i5sGxKTaFuWmWDF7ELpaTPfWelgQe00yMCjyT76JFCvvdGqhFciq7INihQajgVJat+s7tz6nQ3FP7FNGuNaGxEQHPMGrtPUmZ3UMYFcioIpOjI7TTKrufSfd2Kc4EpzjBE2zsdKCbYnlZ6/rPiGUQxVgyHhhUQ8dVe0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708610697; c=relaxed/simple; bh=GJdtD9vyuX0d/G7xkiT5uC/YyxLu8BmsN8PyxCBFDIM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XwvJ8TUoV7BAnu+mRfT/UpfiXTNxSq/Xons6FK9TZpgWTD+1ovJ8ER5cM96gBmZL9SPMqlK3j51Mxgk1Dp7HpKlx0U081r+GDeUEMYwEgqVrp5zYFSt0kQvd7HyemXQbyZFImfgeYazW58N8uOxRdXcdBAcBd1xar+7Rq6COCtI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=GMb+VdCD; arc=none smtp.client-ip=91.218.175.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791608238013388721 X-GMAIL-MSGID: 1791608238013388721 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);