[PATCH] wait_table and zonelist initializing for memory hotadd: update zonelists
In current code, zonelist is considered to be build once, no modification. But MemoryHotplug can add new zone/pgdat. It must be updated. This patch modifies build_all_zonelists(). By this, build_all_zonelist() can reconfig pgdat's zonelists. To update them safety, this patch use stop_machine_run(). Other cpus don't touch among updating them by using it. In old version (V2 of node hotadd), kernel updated them after zone initialization. But present_page of its new zone is still 0, because online_page() is not called yet at this time. Build_zonelists() checks present_pages to find present zone. It was too early. So, I changed it after online_pages(). Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
cca448fe92
commit
6811378e7d
@ -37,6 +37,7 @@
|
||||
#include <linux/nodemask.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/mempolicy.h>
|
||||
#include <linux/stop_machine.h>
|
||||
|
||||
#include <asm/tlbflush.h>
|
||||
#include <asm/div64.h>
|
||||
@ -1704,14 +1705,29 @@ static void __meminit build_zonelists(pg_data_t *pgdat)
|
||||
|
||||
#endif /* CONFIG_NUMA */
|
||||
|
||||
void __init build_all_zonelists(void)
|
||||
/* return values int ....just for stop_machine_run() */
|
||||
static int __meminit __build_all_zonelists(void *dummy)
|
||||
{
|
||||
int i;
|
||||
int nid;
|
||||
for_each_online_node(nid)
|
||||
build_zonelists(NODE_DATA(nid));
|
||||
return 0;
|
||||
}
|
||||
|
||||
void __meminit build_all_zonelists(void)
|
||||
{
|
||||
if (system_state == SYSTEM_BOOTING) {
|
||||
__build_all_zonelists(0);
|
||||
cpuset_init_current_mems_allowed();
|
||||
} else {
|
||||
/* we have to stop all cpus to guaranntee there is no user
|
||||
of zonelist */
|
||||
stop_machine_run(__build_all_zonelists, NULL, NR_CPUS);
|
||||
/* cpuset refresh routine should be here */
|
||||
}
|
||||
|
||||
for_each_online_node(i)
|
||||
build_zonelists(NODE_DATA(i));
|
||||
printk("Built %i zonelists\n", num_online_nodes());
|
||||
cpuset_init_current_mems_allowed();
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user