From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 21 Jan 2026 17:29:48 +0000 (+0100)
Subject: 6.12-stable patches
X-Git-Tag: v6.12.67~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77f74e70f9bcc08257502800144e7ae4598bc075;p=thirdparty%2Fkernel%2Fstable-queue.git

6.12-stable patches

added patches:
	mm-fake-numa-handle-cases-with-no-srat-info.patch
---

diff --git a/queue-6.12/mm-fake-numa-handle-cases-with-no-srat-info.patch b/queue-6.12/mm-fake-numa-handle-cases-with-no-srat-info.patch
new file mode 100644
index 0000000000..09c5cf2b12
--- /dev/null
+++ b/queue-6.12/mm-fake-numa-handle-cases-with-no-srat-info.patch
@@ -0,0 +1,61 @@
+From 4c80187001d3e2876dfe7e011b9eac3b6270156f Mon Sep 17 00:00:00 2001
+From: Bruno Faccini <bfaccini@nvidia.com>
+Date: Mon, 27 Jan 2025 09:16:23 -0800
+Subject: mm/fake-numa: handle cases with no SRAT info
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Bruno Faccini <bfaccini@nvidia.com>
+
+commit 4c80187001d3e2876dfe7e011b9eac3b6270156f upstream.
+
+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
+
+Link: https://lkml.kernel.org/r/20250127171623.1523171-1-bfaccini@nvidia.com
+Fixes: 63db8170bf34 (“mm/fake-numa: allow later numa node hotplug”)
+Signed-off-by: Bruno Faccini <bfaccini@nvidia.com>
+Cc: David Hildenbrand <david@redhat.com>
+Cc: Hyeonggon Yoo <hyeonggon.yoo@sk.com>
+Cc: John Hubbard <jhubbard@nvidia.com>
+Cc: Len Brown <lenb@kernel.org>
+Cc: "Mike Rapoport (IBM)" <rppt@kernel.org>
+Cc: "Rafael J. Wysocki" <rafael@kernel.org>
+Cc: Zi Yan <ziy@nvidia.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/acpi/numa/srat.c |   11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+--- a/drivers/acpi/numa/srat.c
++++ b/drivers/acpi/numa/srat.c
+@@ -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;
diff --git a/queue-6.12/series b/queue-6.12/series
index 31e75cf16b..76a1dc5773 100644
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -136,3 +136,4 @@ dmaengine-fsl-edma-fix-clk-leak-on-alloc_chan_resources-failure.patch
 mm-page_alloc-vmstat-simplify-refresh_cpu_vm_stats-change-detection.patch
 mm-page_alloc-batch-page-freeing-in-decay_pcp_high.patch
 mm-page_alloc-prevent-pcp-corruption-with-smp-n.patch
+mm-fake-numa-handle-cases-with-no-srat-info.patch