From patchwork Tue Apr 15 12:15:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 14052165 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 4044EC369AB for ; Tue, 15 Apr 2025 12:20:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB6C82800F1; Tue, 15 Apr 2025 08:20:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D429B2800DB; Tue, 15 Apr 2025 08:20:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6A7B2800F1; Tue, 15 Apr 2025 08:20:55 -0400 (EDT) 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 902012800DB for ; Tue, 15 Apr 2025 08:20:55 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C140C5D604 for ; Tue, 15 Apr 2025 12:20:56 +0000 (UTC) X-FDA: 83336187312.03.E8FA2C9 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf10.hostedemail.com (Postfix) with ESMTP id 9975AC0006 for ; Tue, 15 Apr 2025 12:20:54 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Lj1x0WL3; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="yZcjFgy/"; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Lj1x0WL3; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="yZcjFgy/"; spf=pass (imf10.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 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=1744719654; 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=ScWbKkMiyTdcG4zwvDzcd9drTM2WJl0dxMBhM6X1TEY=; b=XWrQQuo2CtkKrc+AoyB1Jc9Wer0ZAb18fgNHv0Q8X3fd8fp9Usv+6daGWAHf2haTJuWjBW v4OwiBEoAQaBW9uRcc/2ARjOEGmiqm/w4gSZE9T7x69aVV1zWiYoK/N1wWKYXsY227MN90 0Ev18reSRn3yYQV2EuTNYAHXrlSXceQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744719654; a=rsa-sha256; cv=none; b=AC/UraoPUEXJiYsxJKpy1lEB+tTjDFeVZGHpsb3csjbahu+RRnaVGTWGLmB7RnrdkQ+Kwo eIIgU4axOQA3tn3ccDWgo5BIKB99XMzMKb9Tbnd1TlrFNlBlGnz8QMMQ6hvLyjbjbNjU5X ze4ot4GBkc6/9aY5XgpjlDpskB+c4Wk= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Lj1x0WL3; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="yZcjFgy/"; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Lj1x0WL3; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="yZcjFgy/"; spf=pass (imf10.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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-out1.suse.de (Postfix) with ESMTPS id AE76021164; Tue, 15 Apr 2025 12:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744719652; 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=ScWbKkMiyTdcG4zwvDzcd9drTM2WJl0dxMBhM6X1TEY=; b=Lj1x0WL397POmKjNMVxqV1yjeYn6RWA1iR4Zbi28457S7S/9WQnWmgbwsSyFbnAOfmdK+H J7rE8h8kgAOyKcyM44nFIpyURa5wUF4kePeLGK9LlCip0U7x8dis+PGsuy3Z7RiC30h2rw gRfVzOr2EGLQHa/kvep8bDKSYWAscXI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744719652; 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=ScWbKkMiyTdcG4zwvDzcd9drTM2WJl0dxMBhM6X1TEY=; b=yZcjFgy/JoX8SFAHCxNf0a4HDHKNboFDzAMubaFgp3j63abYa6E2cYuDn+CW+lRVc57k5I pxdTLmM2MQjJUcAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744719652; 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=ScWbKkMiyTdcG4zwvDzcd9drTM2WJl0dxMBhM6X1TEY=; b=Lj1x0WL397POmKjNMVxqV1yjeYn6RWA1iR4Zbi28457S7S/9WQnWmgbwsSyFbnAOfmdK+H J7rE8h8kgAOyKcyM44nFIpyURa5wUF4kePeLGK9LlCip0U7x8dis+PGsuy3Z7RiC30h2rw gRfVzOr2EGLQHa/kvep8bDKSYWAscXI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744719652; 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=ScWbKkMiyTdcG4zwvDzcd9drTM2WJl0dxMBhM6X1TEY=; b=yZcjFgy/JoX8SFAHCxNf0a4HDHKNboFDzAMubaFgp3j63abYa6E2cYuDn+CW+lRVc57k5I pxdTLmM2MQjJUcAA== 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 4411B139A1; Tue, 15 Apr 2025 12:20:52 +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 BRnvDSRP/mecEAAAD6G6ig (envelope-from ); Tue, 15 Apr 2025 12:20:52 +0000 From: Oscar Salvador To: Andrew Morton Cc: Muchun Song , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Vlastimil Babka , Oscar Salvador Subject: [PATCH] mm, hugetlb: Avoid passing a null nodemask when there is mbind policy Date: Tue, 15 Apr 2025 14:15:03 +0200 Message-ID: <20250415121503.376811-1-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Rspamd-Action: no action X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 9975AC0006 X-Stat-Signature: nf6u39ge8gcucmayaboy9t4h15z7piri X-HE-Tag: 1744719654-63677 X-HE-Meta: U2FsdGVkX19mvD0/tkOcE2je74d3VneIN+TzEmqriZnkhVwuK113ZiHj2A/OPWvg4tLF1BfvR5k9PSdERQEQhy9IxCtwwxcqveOMYpAJwH2RydJJSXM6KLy+lmiaPVKdg73Ad5DXhY5Aftt9Q0DW/jbU6pmRSKFcd+UeSlJ7FelmcG7fCHSWLH5/HL3hlQEGS0OA3YE9Ai2AGvfyeFx8r32ZsBhnlKFVxJ//YcNyS0wgdmHCeAm8gtYFqQ5RWgvg7Ny7yO7yl3rG6aKg9BHyK4WN+2p8fau8dPkP0H0TcYEmFLO5uP/Skr3WIVIpnX66eFt2QvYHWY5FXuH65InZNYcU4d1QvcMCVpPlNsNCP/BRcFKDniGMYE6YoTBMbWw27iJMeZhj29j0I4BZbRIbcrc/CPZDRc51tnHr59IsP3wBVsyBloIOZ3aLQ7ZjYIeDFacrZ5heg4urEIymomrmYALO/1O3zyoa1J0zAWU59t1sV1zbDUENpAMHqNzij4xCC37kvjimb+GBdsHLuhZ3Zq/8ul32RKIXEzfkDHYxKqysnVZoXLzwORCmvJCCkRiLzLi0RWtcDzQDtGyFgGDgA1P0H/NzVObwDgZXvtzyDAY6JE0gw1Xll+xNHfdmxK+BokIhcG5Trw/Gl4rDY0Syr1HFjouimMDWRAuevNZX4byJ7r9WvcjpzYxPMJUKbGcEjKDboOlWwkhmbD3yyWWgBa7T99oZeuMk0u3zrMzNJ7pzESkvcCrMiG3YBC+XCkQnWO1woXqV7QlKZfxt0zxwqQLJe4V7apOsooWG+dB00A7Om/9RGRyEhz8M9bS5r+cGO2bfmqCxK4JTfz7Ii0/MjIJJI4zSlg6tA/iXyMuj8wYnyjQZk6lmXSy7UKIomx/OHMIqb7xfqiZyZje4GfoIWGhlIs2aiKr27eI9dYFyd5RF1d/uCa/xqaTGjcWTbaCUYnQhspLO0K5294xiA8Q dTI1dDnZ 7r2FWltMuYAr30VLdQkqHS5O6r0oN0HTDjf38pQJr5Phrtv4hHDLSbb+bGM2IJk4y8Oe1eBsHutGGVAIdYKPSmHuECpsOlPF7kAmULdWpdwYLmCFVmSuXI3+L6Csz16jWVPoh46cSXN+SiBIWZG51SP60RiYilp1rTp3ypEYXJYBaIM7ECr2wcW4i1za5eEDyngjqwz50KlognRFpIwqCQ2UY8oMFt+4VGAwsrPjvEgiF34U0wdEiHgnAildCiZiHJjuP 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: Before trying to allocate a page, gather_surplus_pages() sets up a nodemask for the nodes we can allocate from, but instead of passing the nodemask down the road to the page allocator, it iterates over the nodes within that nodemask right there, meaning that the page allocator will receive a preferred_nid and a null nodemask. This is a problem when using a memory policy, because it might be that the page allocator ends up using a node as a fallback which is not represented in the policy. Avoid that by passing the nodemask directly to the page allocator, so it can filter out fallback nodes that are not part of the nodemask. Signed-off-by: Oscar Salvador Reviewed-by: Vlastimil Babka --- mm/hugetlb.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ccc4f08f8481..5e1cba0f835f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2419,7 +2419,6 @@ static int gather_surplus_pages(struct hstate *h, long delta) long i; long needed, allocated; bool alloc_ok = true; - int node; nodemask_t *mbind_nodemask, alloc_nodemask; mbind_nodemask = policy_mbind_nodemask(htlb_alloc_mask(h)); @@ -2443,21 +2442,12 @@ static int gather_surplus_pages(struct hstate *h, long delta) for (i = 0; i < needed; i++) { folio = NULL; - /* Prioritize current node */ - if (node_isset(numa_mem_id(), alloc_nodemask)) - folio = alloc_surplus_hugetlb_folio(h, htlb_alloc_mask(h), - numa_mem_id(), NULL); - - if (!folio) { - for_each_node_mask(node, alloc_nodemask) { - if (node == numa_mem_id()) - continue; - folio = alloc_surplus_hugetlb_folio(h, htlb_alloc_mask(h), - node, NULL); - if (folio) - break; - } - } + /* + * It is okay to use NUMA_NO_NODE because we use numa_mem_id() + * down the road to pick the current node if that is the case. + */ + folio = alloc_surplus_hugetlb_folio(h, htlb_alloc_mask(h), + NUMA_NO_NODE, &alloc_nodemask); if (!folio) { alloc_ok = false; break;