+ x86_64-set-node_possible_map-at-runtime-fix.patch added to -mm tree

+ x86_64-set-node_possible_map-at-runtime-fix.patch added to -mm tree

[akpm]

The patch titled
     x86_64-set-node_possible_map-at-runtime fix
has been added to the -mm tree.  Its filename is
     x86_64-set-node_possible_map-at-runtime-fix.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: x86_64-set-node_possible_map-at-runtime fix
From: David Rientjes <rientjes@google.com>

Clear node_possible_map if numa_emulation() fails for some reason, such as
a failed hash shift, but setup_node_range() has already set some fake nodes
as online.

Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Eric Dumazet <dada1@cosmosbay.com>
Cc: Christoph Lameter <clameter@engr.sgi.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86_64/mm/numa.c |    1 +
 1 files changed, 1 insertion(+)

diff -puN arch/x86_64/mm/numa.c~x86_64-set-node_possible_map-at-runtime-fix arch/x86_64/mm/numa.c
--- a/arch/x86_64/mm/numa.c~x86_64-set-node_possible_map-at-runtime-fix
+++ a/arch/x86_64/mm/numa.c
@@ -500,6 +500,7 @@ void __init numa_initmem_init(unsigned l
 #ifdef CONFIG_NUMA_EMU
 	if (cmdline && !numa_emulation(start_pfn, end_pfn))
  		return;
+	nodes_clear(node_possible_map);
 #endif
 
 #ifdef CONFIG_ACPI_NUMA
_

Patches currently in -mm which might be from rientjes@google.com are

x86_64-set-node_possible_map-at-runtime.patch
x86_64-set-node_possible_map-at-runtime-fix.patch
slab-x86_64-skip-cache_free_alien-on-non-numa.patch
i386-add-ptep_test_and_clear_dirtyyoung.patch
i386-use-pte_update_defer-in-ptep_test_and_clear_dirtyyoung.patch
i386-use-pte_update_defer-in-ptep_test_and_clear_dirtyyoung-fix.patch
smaps-extract-pmd-walker-from-smaps-code.patch
smaps-add-pages-referenced-count-to-smaps.patch
smaps-add-clear_refs-file-to-clear-reference.patch
smaps-add-clear_refs-file-to-clear-reference-fix.patch
smaps-add-clear_refs-file-to-clear-reference-fix-fix.patch
smaps-add-clear_refs-file-to-clear-reference-fix-fix-2.patch
smaps-add-clear_refs-file-to-clear-reference-cleanup.patch
smaps-use-ptep_test_and_clear_young.patch
smaps-add-clear_refs-file-to-clear-reference-docs.patch
maps2-uninline-some-functions-in-the-page-walker.patch
maps2-eliminate-the-pmd_walker-struct-in-the-page-walker.patch
maps2-remove-vma-from-args-in-the-page-walker.patch
maps2-propagate-errors-from-callback-in-page-walker.patch
maps2-add-callbacks-for-each-level-to-page-walker.patch
maps2-move-the-page-walker-code-to-lib.patch
maps2-move-the-page-walker-code-to-lib-fix.patch
maps2-simplify-interdependence-of-proc-pid-maps-and-smaps.patch
maps2-move-clear_refs-code-to-task_mmuc.patch
maps2-regroup-task_mmu-by-interface.patch
maps2-make-proc-pid-smaps-optional-under-config_embedded.patch
maps2-make-proc-pid-clear_refs-option-under-config_embedded.patch
maps2-add-proc-pid-pagemap-interface.patch
maps2-add-proc-kpagemap-interface.patch

[patch] x86_64: more fixes to node_possible_map runtime setup

[Siddha, Suresh B]

On Mon, Apr 09, 2007 at 04:13:28PM -0700, Siddha, Suresh B wrote:
> On Mon, Apr 09, 2007 at 03:05:01PM -0700, akpm@linux-foundation.org wrote:
> > Subject: x86_64-set-node_possible_map-at-runtime fix
> > From: David Rientjes <rientjes@google.com>
> > 
> > Clear node_possible_map if numa_emulation() fails for some reason, such as
> > a failed hash shift, but setup_node_range() has already set some fake nodes
> > as online.
> 
> David, Looking at your fix, I think we require more fixes in this area.
> Please review the appended patch. Thanks.

Andrew, Please apply the appended patch. Goes on top of the
x86_64-set-node_possible_map-at-runtime-fix.patch

thanks, suresh
---

Subject: [patch] x86_64: more fixes to node_possible_map runtime setup
From: Suresh Siddha <suresh.b.siddha@intel.com>

More fixes in the failure cases and a small cleanup in numa emulation case.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Acked-by: David Rientjes <rientjes@google.com>
---

--- linux-2.6.21-rc6/arch/x86_64/mm/numa.c~	2007-04-09 15:59:03.000000000 -0700
+++ linux-2.6.21-rc6/arch/x86_64/mm/numa.c	2007-04-09 17:44:38.000000000 -0700
@@ -298,7 +298,6 @@ 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,
@@ -483,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);
@@ -510,11 +509,13 @@ void __init numa_initmem_init(unsigned l
 	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");