[PATCH] [5/7] x86_64: Handle empty node zero

Andi Kleen ak at suse.de
Mon May 29 00:18:02 CEST 2006


From: Daniel Yeisley <dan.yeisley at unisys.com>

It is possible to boot a Unisys ES7000 with CPUs from multiple cells, and not
also include the memory from those cells.  This can create a scenario where
node 0 has cpus, but no associated memory.  The system will boot fine in a
configuration where node 0 has memory, but nodes 2 and 3 do not.

[AK: I rechecked the code and generic code seems to indeed handle that already.
Dan's original patch had a change for mm/slab.c that seems to be already in now.]

Signed-off-by: Andi Kleen <ak at suse.de>

---
 arch/x86_64/kernel/pci-dma.c |    4 ++++
 arch/x86_64/kernel/setup.c   |    2 +-
 arch/x86_64/mm/srat.c        |    4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

Index: linux-2.6.17-rc5/arch/x86_64/kernel/pci-dma.c
===================================================================
--- linux-2.6.17-rc5.orig/arch/x86_64/kernel/pci-dma.c
+++ linux-2.6.17-rc5/arch/x86_64/kernel/pci-dma.c
@@ -54,6 +54,10 @@ dma_alloc_pages(struct device *dev, gfp_
 	else
 #endif
 		node = numa_node_id();
+
+	if (node < first_node(node_online_map))
+		node = first_node(node_online_map);
+
 	page = alloc_pages_node(node, gfp, order);
 	return page ? page_address(page) : NULL;
 }
Index: linux-2.6.17-rc5/arch/x86_64/kernel/setup.c
===================================================================
--- linux-2.6.17-rc5.orig/arch/x86_64/kernel/setup.c
+++ linux-2.6.17-rc5/arch/x86_64/kernel/setup.c
@@ -1051,7 +1051,7 @@ static void srat_detect_node(void)
 	   for now. */
 	node = apicid_to_node[hard_smp_processor_id()];
 	if (node == NUMA_NO_NODE)
-		node = 0;
+		node = first_node(node_online_map);
 	numa_set_node(cpu, node);
 
 	if (acpi_numa > 0)
Index: linux-2.6.17-rc5/arch/x86_64/mm/srat.c
===================================================================
--- linux-2.6.17-rc5.orig/arch/x86_64/mm/srat.c
+++ linux-2.6.17-rc5/arch/x86_64/mm/srat.c
@@ -399,8 +399,10 @@ int __init acpi_scan_nodes(unsigned long
 	/* First clean up the node list */
 	for (i = 0; i < MAX_NUMNODES; i++) {
  		cutoff_node(i, start, end);
-		if ((nodes[i].end - nodes[i].start) < NODE_MIN_SIZE)
+		if ((nodes[i].end - nodes[i].start) < NODE_MIN_SIZE) {
 			unparse_node(i);
+			node_set_offline(i);
+		}
 	}
 
 	if (acpi_numa <= 0)



More information about the discuss mailing list