From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 17325C2FB for ; Mon, 12 May 2025 00:52:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747011128; cv=none; b=jGtQx/cRfbRgylUsdXlC2P0VcMwCoVYCrPVFaYnaesXIB+8EA1pZdiw0fA/sJLg8ioM/iXo6qrGpWWp9BLPTjCrMAwppzyzYl9edLiVGxzwgTIYL1ZnsJClIsyzIGvOGMOO9LmL2NiRVGMSO4JrMBRbQO12vId6Q2v/4mZBpQ8E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747011128; c=relaxed/simple; bh=XwGdMyBRoYPYzxsr3hI1YOiRFydwy702L/AbFdDtvZ4=; h=Date:To:From:Subject:Message-Id; b=kV57hFK9M42HU9y+piTlepsL/HafNHeFxo39eHqr9uknP4B25XCaezKGGuZ1ehbNrGBKpaJE/4VWAqoDjloM/nCY4U62bAAdOxfB5WbAhnmeZdwAWQsTbpyS8EBL4KAbcC6RVc20Efh644UUHCmScUaDBtJQfc8K8+nB86QB3LM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=ZV5QYvnV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="ZV5QYvnV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1551C4CEE4; Mon, 12 May 2025 00:52:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1747011128; bh=XwGdMyBRoYPYzxsr3hI1YOiRFydwy702L/AbFdDtvZ4=; h=Date:To:From:Subject:From; b=ZV5QYvnVYNtgS65uJYdtocXj1obNIGqgvdqq6K6VLWwsy8mE2Nd4W3ys2w+ezWcC0 oBdsj+NzSXuF3sVeEGXx//BHv8epjPO+WXKad3clZB4EropmBSCS2yFOmD3t6eHCwI bcEL03AxBfbfoLa//Cyq4hCs8Z2W/H6VOFj0uYJk= Date: Sun, 11 May 2025 17:52:07 -0700 To: mm-commits@vger.kernel.org,vbabka@suse.cz,muchun.song@linux.dev,david@redhat.com,osalvador@suse.de,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-hugetlb-avoid-passing-a-null-nodemask-when-there-is-mbind-policy.patch removed from -mm tree Message-Id: <20250512005207.E1551C4CEE4@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm, hugetlb: avoid passing a null nodemask when there is mbind policy has been removed from the -mm tree. Its filename was mm-hugetlb-avoid-passing-a-null-nodemask-when-there-is-mbind-policy.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Oscar Salvador Subject: mm, hugetlb: avoid passing a null nodemask when there is mbind policy Date: Tue, 15 Apr 2025 14:15:03 +0200 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. Link: https://lkml.kernel.org/r/20250415121503.376811-1-osalvador@suse.de Signed-off-by: Oscar Salvador Reviewed-by: Vlastimil Babka Cc: David Hildenbrand Cc: Muchun Song Signed-off-by: Andrew Morton --- mm/hugetlb.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) --- a/mm/hugetlb.c~mm-hugetlb-avoid-passing-a-null-nodemask-when-there-is-mbind-policy +++ a/mm/hugetlb.c @@ -2419,7 +2419,6 @@ static int gather_surplus_pages(struct h 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 @@ retry: 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; _ Patches currently in -mm which might be from osalvador@suse.de are