Re: 2.6.21-rc7-mm2 -- x86_64 blade hard hangs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 

On Fri, 27 Apr 2007, Siddha, Suresh B wrote:


On Fri, Apr 27, 2007 at 12:07:10PM +0100, Mel Gorman wrote:

On (26/04/07 16:40), Siddha, Suresh B didst pronounce:

oops. Appended patch should fix this. Can you please check this and Ack it?


This patch does not apply cleanly to 2.6.21-rc7-mm2.


Mel, Please backout the existing  x86_64-set-node_possible_map-at-runtime.patch
in rc7-mm2  and apply the appended patch instead.



I backed out

broken-out/x86_64-set-node_possible_map-at-runtime.patch
broken-out/x86_64-set-node_possible_map-at-runtime-fix.patch
broken-out/x86_64-set-node_possible_map-at-runtime-fix-2.patch
and dropped in your new patch. It passed boot tests on the machine in question, so just from a testing perspective 

Acked-by: Mel Gorman <[email protected]>


Andrew, as you already backedout x86_64-set-node_possible_map-at-runtime.patch
from your -mm series, please include the appended patch (as try 2), after
Mel confirms that it works fine on his setup.

Thanks!



Thank you.


---
From: Suresh Siddha <[email protected]>
[patch] x86_64: set node_possible_map at runtime - try 2

Set the node_possible_map at runtime on x86_64.  On a non NUMA system,
num_possible_nodes() will now say '1'.

Signed-off-by: Suresh Siddha <[email protected]>
Cc: Andi Kleen <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: Christoph Lameter <[email protected]>
---

diff -pNru linux/arch/x86_64/mm/k8topology.c linux~/arch/x86_64/mm/k8topology.c
--- linux/arch/x86_64/mm/k8topology.c	2007-04-27 10:37:19.000000000 -0700
+++ linux~/arch/x86_64/mm/k8topology.c	2007-04-27 10:34:10.000000000 -0700
@@ -49,11 +49,8 @@ int __init k8_scan_nodes(unsigned long s
	int found = 0;
	u32 reg;
	unsigned numnodes;
-	nodemask_t nodes_parsed;
	unsigned dualcore = 0;

-	nodes_clear(nodes_parsed);
-
	if (!early_pci_allowed())
		return -1;

@@ -102,7 +99,7 @@ int __init k8_scan_nodes(unsigned long s
			       nodeid, (base>>8)&3, (limit>>8) & 3);
			return -1;
		}
-		if (node_isset(nodeid, nodes_parsed)) {
+		if (node_isset(nodeid, node_possible_map)) {
			printk(KERN_INFO "Node %d already present. Skipping\n",
			       nodeid);
			continue;
@@ -155,7 +152,7 @@ int __init k8_scan_nodes(unsigned long s

		prevbase = base;

-		node_set(nodeid, nodes_parsed);
+		node_set(nodeid, node_possible_map);
	}

	if (!found)
diff -pNru linux/arch/x86_64/mm/numa.c linux~/arch/x86_64/mm/numa.c
--- linux/arch/x86_64/mm/numa.c	2007-04-27 10:37:19.000000000 -0700
+++ linux~/arch/x86_64/mm/numa.c	2007-04-27 10:34:10.000000000 -0700
@@ -298,7 +298,7 @@ static int __init setup_node_range(int n
		ret = -1;
	}
	nodes[nid].end = *addr;
-	node_set_online(nid);
+	node_set(nid, node_possible_map);
	printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n", nid,
	       nodes[nid].start, nodes[nid].end,
	       (nodes[nid].end - nodes[nid].start) >> 20);
@@ -482,7 +482,7 @@ out:
	 * SRAT.
	 */
	remove_all_active_ranges();
-	for_each_online_node(i) {
+	for_each_node_mask(i, node_possible_map) {
		e820_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,
						nodes[i].end >> PAGE_SHIFT);
 		setup_node_bootmem(i, nodes[i].start, nodes[i].end);
@@ -497,20 +497,25 @@ void __init numa_initmem_init(unsigned l
{
	int i;

+	nodes_clear(node_possible_map);
+
#ifdef CONFIG_NUMA_EMU
	if (cmdline && !numa_emulation(start_pfn, end_pfn))
 		return;
+	nodes_clear(node_possible_map);
#endif

#ifdef CONFIG_ACPI_NUMA
	if (!numa_off && !acpi_scan_nodes(start_pfn << PAGE_SHIFT,
					  end_pfn << PAGE_SHIFT))
 		return;
+	nodes_clear(node_possible_map);
#endif

#ifdef CONFIG_K8_NUMA
	if (!numa_off && !k8_scan_nodes(start_pfn<<PAGE_SHIFT, end_pfn<<PAGE_SHIFT))
		return;
+	nodes_clear(node_possible_map);
#endif
	printk(KERN_INFO "%s\n",
	       numa_off ? "NUMA turned off" : "No NUMA configuration found");
@@ -524,6 +529,7 @@ void __init numa_initmem_init(unsigned l
	memnodemap[0] = 0;
	nodes_clear(node_online_map);
	node_set_online(0);
+	node_set(0, node_possible_map);
	for (i = 0; i < NR_CPUS; i++)
		numa_set_node(i, 0);
	node_to_cpumask[0] = cpumask_of_cpu(0);
diff -pNru linux/arch/x86_64/mm/srat.c linux~/arch/x86_64/mm/srat.c
--- linux/arch/x86_64/mm/srat.c	2007-04-27 10:37:19.000000000 -0700
+++ linux~/arch/x86_64/mm/srat.c	2007-04-27 10:34:10.000000000 -0700
@@ -419,19 +419,21 @@ int __init acpi_scan_nodes(unsigned long
		return -1;
	}

+	node_possible_map = nodes_parsed;
+
	/* Finally register nodes */
-	for_each_node_mask(i, nodes_parsed)
+	for_each_node_mask(i, node_possible_map)
		setup_node_bootmem(i, nodes[i].start, nodes[i].end);
	/* Try again in case setup_node_bootmem missed one due
	   to missing bootmem */
-	for_each_node_mask(i, nodes_parsed)
+	for_each_node_mask(i, node_possible_map)
		if (!node_online(i))
			setup_node_bootmem(i, nodes[i].start, nodes[i].end);

	for (i = 0; i < NR_CPUS; i++) {
		if (cpu_to_node[i] == NUMA_NO_NODE)
			continue;
-		if (!node_isset(cpu_to_node[i], nodes_parsed))
+		if (!node_isset(cpu_to_node[i], node_possible_map))
			numa_set_node(i, NUMA_NO_NODE);
	}
	numa_init_array();



--
Mel Gorman
Part-time Phd Student                          Linux Technology Center
University of Limerick                         IBM Dublin Software Lab
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux