diff options
| author | Tang Chen <tangchen@cn.fujitsu.com> | 2014-11-14 02:19:41 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-27 14:21:51 +0300 |
| commit | c8d462c8db042692c6d5b252f3b724db282eeb5a (patch) | |
| tree | 860101a02ed29866e351f7396a681bc319677289 /mm/memory_hotplug.c | |
| parent | 0cc5277d2ff22cd760f411fa9e19fb725d36344f (diff) | |
| download | linux-c8d462c8db042692c6d5b252f3b724db282eeb5a.tar.xz | |
mem-hotplug: reset node present pages when hot-adding a new pgdat
commit 0bd854200873894a76f32603ff2c4c988ad6b5b5 upstream.
When memory is hot-added, all the memory is in offline state. So clear
all zones' present_pages because they will be updated in online_pages()
and offline_pages(). Otherwise, /proc/zoneinfo will corrupt:
When the memory of node2 is offline:
# cat /proc/zoneinfo
......
Node 2, zone Movable
......
spanned 8388608
present 8388608
managed 0
When we online memory on node2:
# cat /proc/zoneinfo
......
Node 2, zone Movable
......
spanned 8388608
present 16777216
managed 8388608
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'mm/memory_hotplug.c')
| -rw-r--r-- | mm/memory_hotplug.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 2fcc1a2e8ab2..845ca44ee5ab 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1064,6 +1064,16 @@ out: } #endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ +static void reset_node_present_pages(pg_data_t *pgdat) +{ + struct zone *z; + + for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++) + z->present_pages = 0; + + pgdat->node_present_pages = 0; +} + /* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) { @@ -1102,6 +1112,13 @@ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) */ reset_node_managed_pages(pgdat); + /* + * When memory is hot-added, all the memory is in offline state. So + * clear all zones' present_pages because they will be updated in + * online_pages() and offline_pages(). + */ + reset_node_present_pages(pgdat); + return pgdat; } |