Skip to content

Commit a1e565a

Browse files
tang-chentorvalds
authored andcommitted
memory-hotplug: do not allocate pgdat if it was not freed when offline.
Since there is no way to guarentee the address of pgdat/zone is not on stack of any kernel threads or used by other kernel objects without reference counting or other symchronizing method, we cannot reset node_data and free pgdat when offlining a node. Just reset pgdat to 0 and reuse the memory when the node is online again. The problem is suggested by Kamezawa Hiroyuki. The idea is from Wen Congyang. NOTE: If we don't reset pgdat to 0, the WARN_ON in free_area_init_node() will be triggered. [akpm@linux-foundation.org: fix warning when CONFIG_NEED_MULTIPLE_NODES=n] [akpm@linux-foundation.org: fix the warning again again] Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> Reviewed-by: Wen Congyang <wency@cn.fujitsu.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Jiang Liu <jiang.liu@huawei.com> Cc: Jianguo Wu <wujianguo@huawei.com> Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Lai Jiangshan <laijs@cn.fujitsu.com> Cc: Wu Jianguo <wujianguo@huawei.com> Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent d822b86 commit a1e565a

1 file changed

Lines changed: 16 additions & 8 deletions

File tree

mm/memory_hotplug.c

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,11 +1017,14 @@ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start)
10171017
unsigned long zholes_size[MAX_NR_ZONES] = {0};
10181018
unsigned long start_pfn = start >> PAGE_SHIFT;
10191019

1020-
pgdat = arch_alloc_nodedata(nid);
1021-
if (!pgdat)
1022-
return NULL;
1020+
pgdat = NODE_DATA(nid);
1021+
if (!pgdat) {
1022+
pgdat = arch_alloc_nodedata(nid);
1023+
if (!pgdat)
1024+
return NULL;
10231025

1024-
arch_refresh_nodedata(nid, pgdat);
1026+
arch_refresh_nodedata(nid, pgdat);
1027+
}
10251028

10261029
/* we can use NODE_DATA(nid) from here */
10271030

@@ -1074,7 +1077,8 @@ int mem_online_node(int nid)
10741077
int __ref add_memory(int nid, u64 start, u64 size)
10751078
{
10761079
pg_data_t *pgdat = NULL;
1077-
int new_pgdat = 0;
1080+
bool new_pgdat;
1081+
bool new_node;
10781082
struct resource *res;
10791083
int ret;
10801084

@@ -1085,12 +1089,16 @@ int __ref add_memory(int nid, u64 start, u64 size)
10851089
if (!res)
10861090
goto out;
10871091

1088-
if (!node_online(nid)) {
1092+
{ /* Stupid hack to suppress address-never-null warning */
1093+
void *p = NODE_DATA(nid);
1094+
new_pgdat = !p;
1095+
}
1096+
new_node = !node_online(nid);
1097+
if (new_node) {
10891098
pgdat = hotadd_new_pgdat(nid, start);
10901099
ret = -ENOMEM;
10911100
if (!pgdat)
10921101
goto error;
1093-
new_pgdat = 1;
10941102
}
10951103

10961104
/* call arch's memory hotadd */
@@ -1102,7 +1110,7 @@ int __ref add_memory(int nid, u64 start, u64 size)
11021110
/* we online node here. we can't roll back from here. */
11031111
node_set_online(nid);
11041112

1105-
if (new_pgdat) {
1113+
if (new_node) {
11061114
ret = register_one_node(nid);
11071115
/*
11081116
* If sysfs file of new node can't create, cpu on the node

0 commit comments

Comments
 (0)