• Tang Chen's avatar
    memory-hotplug: add hot-added memory ranges to memblock before allocate node_data for a node. · 7f36e3e5
    Tang Chen authored
    Commit f9126ab9 ("memory-hotplug: fix wrong edge when hot add a new
    node") hot-added memory range to memblock, after creating pgdat for new
    node.
    
    But there is a problem:
    
      add_memory()
      |--> hotadd_new_pgdat()
           |--> free_area_init_node()
                |--> get_pfn_range_for_nid()
                     |--> find start_pfn and end_pfn in memblock
      |--> ......
      |--> memblock_add_node(start, size, nid)    --------    Here, just too late.
    
    get_pfn_range_for_nid() will find that start_pfn and end_pfn are both 0.
    As a result, when adding memory, dmesg will give the following wrong
    message.
    
      Initmem setup node 5 [mem 0x0000000000000000-0xffffffffffffffff]
      On node 5 totalpages: 0
      Built 5 zonelists in Node order, mobility grouping on.  Total pages: 32588823
      Policy zone: Normal
      init_memory_mapping: [mem 0x60000000000-0x607ffffffff]
    
    The solution is simple, just add the memory range to memblock a little
    earlier, before hotadd_new_pgdat().
    
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: default avatarTang Chen <tangchen@cn.fujitsu.com>
    Cc: Xishi Qiu <qiuxishi@huawei.com>
    Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
    Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
    Cc: Gu Zheng <guz.fnst@cn.fujitsu.com>
    Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
    Cc: Vlastimil Babka <vbabka@suse.cz>
    Cc: Mel Gorman <mgorman@techsingularity.net>
    Cc: David Rientjes <rientjes@google.com>
    Cc: <stable@vger.kernel.org>	[4.2.x]
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    7f36e3e5
memory_hotplug.c 51.8 KB