The patch titled x86: srat: do not register nodes beyond e820 map has been added to the -mm tree. Its filename is x86-srat-do-not-register-nodes-beyond-e820-map.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: x86: srat: do not register nodes beyond e820 map From: David Rientjes <rientjes@xxxxxxxxxx> "Zhang, Yanmin" <yanmin_zhang@xxxxxxxxxxxxxxx> said: : Kernel 2.6.30-rc4 panic with boot parameter mem=2G on Nehalem machine. : The machines has 2 nodes and every node has about 3G memory. : : Alex Shi did a good bisect and located the bad patch. : : commit dc098551918093901d8ac8936e9d1a1b891b56ed : Author: Jack Steiner <steiner@xxxxxxx> : Date: Fri Apr 17 09:22:42 2009 -0500 : : x86/uv: fix init of memory-less nodes The mem= option will truncate the memory map at a specified address so it's not possible to register nodes with memory beyond the e820 upper bound. unparse_node() is only called when then node had memory associated with it, although with the mem= option it is no longer addressable. Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx> Reported-by: "Zhang, Yanmin" <yanmin_zhang@xxxxxxxxxxxxxxx> Cc: Jack Steiner <steiner@xxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Andi Kleen <andi@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/mm/srat_64.c | 1 + 1 file changed, 1 insertion(+) diff -puN arch/x86/mm/srat_64.c~x86-srat-do-not-register-nodes-beyond-e820-map arch/x86/mm/srat_64.c --- a/arch/x86/mm/srat_64.c~x86-srat-do-not-register-nodes-beyond-e820-map +++ a/arch/x86/mm/srat_64.c @@ -361,6 +361,7 @@ static void __init unparse_node(int node { int i; node_clear(node, nodes_parsed); + node_clear(node, cpu_nodes_parsed); for (i = 0; i < MAX_LOCAL_APIC; i++) { if (apicid_to_node[i] == node) apicid_to_node[i] = NUMA_NO_NODE; _ Patches currently in -mm which might be from rientjes@xxxxxxxxxx are origin.patch linux-next.patch sched-emit-thread-info-flags-with-stack-trace.patch oom-prevent-livelock-when-oom_kill_allocating_task-is-set.patch cpusets-restructure-the-function-cpuset_update_task_memory_state.patch cpusets-update-tasks-page-slab-spread-flags-in-time.patch cpusetmm-update-tasks-mems_allowed-in-time.patch cpusetmm-update-tasks-mems_allowed-in-time-fix.patch cpusetmm-update-tasks-mems_allowed-in-time-cleanup.patch page-allocator-use-a-pre-calculated-value-instead-of-num_online_nodes-in-fast-paths-do-not-override-definition-of-node_set_online-with-macro.patch memcg-add-file-based-rss-accounting.patch memcg-add-file-based-rss-accounting-fix-mem_cgroup_update_mapped_file_stat-oops.patch x86-srat-do-not-register-nodes-beyond-e820-map.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html