From patchwork Thu May 16 08:10:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13665820 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 9D8A3C25B79 for ; Thu, 16 May 2024 08:10:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B74A76B038A; Thu, 16 May 2024 04:10:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B25C96B038B; Thu, 16 May 2024 04:10:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C6596B038C; Thu, 16 May 2024 04:10:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7B6D36B038A for ; Thu, 16 May 2024 04:10:47 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id DC25C403E9 for ; Thu, 16 May 2024 08:10:46 +0000 (UTC) X-FDA: 82123537692.20.8E00C9E Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf08.hostedemail.com (Postfix) with ESMTP id BD6A6160003 for ; Thu, 16 May 2024 08:10:43 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=jnRotsF7; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=uJQEbuzb; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=jnRotsF7; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=uJQEbuzb; spf=pass (imf08.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715847044; 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=6pmMTvznEz1A8KucpTcWmbU5/R4qRpSkytrpW1qlvtE=; b=ltjExDf6QtewL9CS7DSCiEl6ltBDea5ANq2nHDcfzBmOvDJY6h8BCqMo7/opEqMOrM3EcX Ak78M9DJ6yop6BTE3Lt5gX5h4WpZJcvahnE5sUwnk/wsgaXAGpTW8dg3ekAGvPmdq9mdhP wriWzdtir+PudyDzzvOtqQ3r3BPkMlM= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=jnRotsF7; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=uJQEbuzb; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=jnRotsF7; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=uJQEbuzb; spf=pass (imf08.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715847044; a=rsa-sha256; cv=none; b=JQqpogbCyijbLqnV1jkIDKxNHO4teTVmRPWu0672phAUnPlR50mcsbg9KfQUgAn6gGh3kE shZw9XmSIBpMW5qALhsBieQR8VXV9xGrOp2XM9peCSdnETuievz851/yQWsWXvybVNAQZq b3qPH3bwbMy9kwRG6d4lxNwDmw0n4Yo= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0339C5BF55; Thu, 16 May 2024 08:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715847042; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6pmMTvznEz1A8KucpTcWmbU5/R4qRpSkytrpW1qlvtE=; b=jnRotsF7ozXVpzDT4qkWxo6jXbN2ughSK+YPIx22668HKl1IuC9J8j819qfLS6jiiQHEZa Yf8AUnkmXA5wTeb6O2jnbIYfgIAJAtsTHxdr23E969iCERw9+/opYBQv38r29UHqhhZZKm PI+Ls8tJo+43qKxqAr2Y+qMg/IMuvDc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715847042; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6pmMTvznEz1A8KucpTcWmbU5/R4qRpSkytrpW1qlvtE=; b=uJQEbuzbZBwubalhOVJlXZulmnaCN61R03J+SXX3ZpxUMT8+Rt8eYJl51a5wu//rpNuSIN ni3ACD9XYoQ1SZBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715847042; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6pmMTvznEz1A8KucpTcWmbU5/R4qRpSkytrpW1qlvtE=; b=jnRotsF7ozXVpzDT4qkWxo6jXbN2ughSK+YPIx22668HKl1IuC9J8j819qfLS6jiiQHEZa Yf8AUnkmXA5wTeb6O2jnbIYfgIAJAtsTHxdr23E969iCERw9+/opYBQv38r29UHqhhZZKm PI+Ls8tJo+43qKxqAr2Y+qMg/IMuvDc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715847042; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6pmMTvznEz1A8KucpTcWmbU5/R4qRpSkytrpW1qlvtE=; b=uJQEbuzbZBwubalhOVJlXZulmnaCN61R03J+SXX3ZpxUMT8+Rt8eYJl51a5wu//rpNuSIN ni3ACD9XYoQ1SZBg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 83A4E13991; Thu, 16 May 2024 08:10:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id r7djHYG/RWb0XgAAD6G6ig (envelope-from ); Thu, 16 May 2024 08:10:41 +0000 From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Muchun Song , Peter Xu , Oscar Salvador Subject: [PATCH] mm/hugetlb: Drop node_alloc_noretry from alloc_fresh_hugetlb_folio Date: Thu, 16 May 2024 10:10:35 +0200 Message-ID: <20240516081035.5651-1-osalvador@suse.de> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: BD6A6160003 X-Stat-Signature: ed8spn584d74bo8qs8j3h7qdzkmjw9km X-Rspam-User: X-HE-Tag: 1715847043-527031 X-HE-Meta: U2FsdGVkX1+ODwTZQEDM313Q+4n9yhF6l9CvDHKB2q192n3zPQMKBQ0OUYizd2L2M3SjGvdh+VL14vLBdkF1B5yuUMr3FAFiRYMwMx9s+J8uekrQNKK8bQuUu5iZjzRhuZTFEix5oCzBuDYu4qNQ+P6SK+4OY6Oh+c7gJMgDDAPifNotiBPxSZDbI1B1M58yFoqcm5d5SAoXfDESr1KjUnJ+ebnBytW3N8syWNzYreEbZJ7Tw9Wt6wA4REBSNqsStlLXrQG3el9QohkHe5pD32zxMyjR6k2JYFbVMsmZp9yGCFY8G4oOS4kjBZqrLV+P6qswxSFMypu76jQ0PyFuCHHnHD60Ask4l26JtHxrmumuWioyMZfBgy1h6PtC3s+06VPGSMbmQCWj/3Gh+5g+M6fqNFhMlKB74Wvu9tV35EQsgYQ1Fb9wmjd/lgqLzy399psJzY6GxZK06muQ+xmKgUMjbmjyi0xRroD9QGlfzTvCxRckKpBojGLyQO2hmHf84if6obNZUiy9y1wdtDg+fWVFPaRYTdaYS39VRX7NDaIz3xxuszlhDz4/7BbGgk6ZyHnNfTT19OqXp40alycmKLh5KNrBUhAR+Am5a5uko27oh1YlNmj1RkRYDLVZACpPvmfRemVoniGvay7zGgLrq6ktLFXKQGkNqn6fFOS7NxfPgZkFWkYIMApWc3BN9YzXVMROO/p4Oi8UOa9vyM0sfoQ3nZaEvLnfp82ZbPiO978RG2fI4M7RjSAjGfvrjaBQAI2wtykHmPSQS6KyK2NSz9hIZq7g1V9kJsvc9CaHD5+7YTyZ2i/RviO5nCR9RxcAVKERBSdS3IToL/mKkTYs3xUGfLwomDhglF/Lo//cWxyjKHMKuG90xwu8KqSCL/ivCsj1RdEVPYcaCnSGnQFCu1AIXf8XREksQnJ9XfYrIwub4VEvXtgjEtzRG/FIgkgPW77IkdRj027YXr6+VDI saQzgydL CGAXLPFXzzw5b/kN4p5oOwQFWgDD4ivqSk0vyOFf+9wRAikBWtWic0nwHTEnFX85jMTH5LXlA9o7r7msfg+U9OAz2XYQZDi8odwfYe3U3IqQgaDAdjW4aUheeFUqnRPpFFRb5iFh9H0ohtxmYojgDI5cTig5tiEGrf3g+rDfT1H5v57hV7ruxC+lpJihFdWAWc5n7lrd3JJOaDjivaW6rGcxGsIVj15+f8uv3woedTe3c1ixSHwr5FWhALSP7Tmur6Zh+e6jN6WPk2vkMGfYM2/Bw7Q== 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: Since commit d67e32f26713 ("hugetlb: restructure pool allocations"), the parameter node_alloc_noretry from alloc_fresh_hugetlb_folio() is not used, so drop it. Signed-off-by: Oscar Salvador Reviewed-by: Sidhartha Kumar Reviewed-by: Anshuman Khandual Reviewed-by: Vishal Moola (Oracle) Reviewed-by: Muchun Song --- mm/hugetlb.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 6be78e7d4f6e..fedce00ff839 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2289,13 +2289,11 @@ static struct folio *only_alloc_fresh_hugetlb_folio(struct hstate *h, * pages is zero. */ static struct folio *alloc_fresh_hugetlb_folio(struct hstate *h, - gfp_t gfp_mask, int nid, nodemask_t *nmask, - nodemask_t *node_alloc_noretry) + gfp_t gfp_mask, int nid, nodemask_t *nmask) { struct folio *folio; - folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, - node_alloc_noretry); + folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL); if (!folio) return NULL; @@ -2513,7 +2511,7 @@ static struct folio *alloc_surplus_hugetlb_folio(struct hstate *h, goto out_unlock; spin_unlock_irq(&hugetlb_lock); - folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL); + folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask); if (!folio) return NULL; @@ -2549,7 +2547,7 @@ static struct folio *alloc_migrate_hugetlb_folio(struct hstate *h, gfp_t gfp_mas if (hstate_is_gigantic(h)) return NULL; - folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL); + folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask); if (!folio) return NULL; @@ -3474,7 +3472,7 @@ static void __init hugetlb_hstate_alloc_pages_onenode(struct hstate *h, int nid) gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE; folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, - &node_states[N_MEMORY], NULL); + &node_states[N_MEMORY]); if (!folio) break; free_huge_folio(folio); /* free it into the hugepage allocator */