Skip to contentSkip to conversation

mm-fake-numa-handle-cases-with-no-srat-info.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Feb 1, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/fake-numa: handle cases with no SRAT info
has been removed from the -mm tree. Its filename was
mm-fake-numa-handle-cases-with-no-srat-info.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Bruno Faccini <[email protected]>
Subject: mm/fake-numa: handle cases with no SRAT info
Date: Mon, 27 Jan 2025 09:16:23 -0800

Handle more gracefully cases where no SRAT information is available, like in VMs with no Numa support, and allow fake-numa configuration to complete successfully in these cases

Fixes 63db8170bf34 (“mm/fake-numa: allow later numa node hotplug”)
Cc David Hildenbrand <[email protected]>
Cc Hyeonggon Yoo <[email protected]>
Cc John Hubbard <[email protected]>
Cc Len Brown <[email protected]>
Cc "Mike Rapoport (IBM)" <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Cc Zi Yan <[email protected]>

---

 drivers/acpi/numa/srat.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/acpi/numa/srat.c renamed from drivers/acpi/numa/srat.c~mm-fake-numa-handle-cases-with-no-srat-info +10 -1
@@ -95,9 +95,13 @@ int __init fix_pxm_node_maps(int max_nid
 	int i, j, index = -1, count = 0;
 	nodemask_t nodes_to_enable;
 
-	if (numa_off || srat_disabled())
+	if (numa_off)
 		return -1;
 
+	/* no or incomplete node/PXM mapping set, nothing to do */
+	if (srat_disabled())
+		return 0;
+
 	/* find fake nodes PXM mapping */
 	for (i = 0; i < MAX_NUMNODES; i++) {
 		if (node_to_pxm_map[i] != PXM_INVAL) {
@@ -117,6 +121,11 @@ int __init fix_pxm_node_maps(int max_nid
 			}
 		}
 	}
+	if (index == -1) {
+		pr_debug("No node/PXM mapping has been set\n");
+		/* nothing more to be done */
+		return 0;
+	}
 	if (WARN(index != max_nid, "%d max nid  when expected %d\n",
 		      index, max_nid))
 		return -1;

_

Patches currently in -mm which might be from [email protected] are