sparsemem record nid during memory present Record the node id as we mark sections for instantiation. Use this nid during instantiation to direct allocations. Signed-off-by: Andy Whitcroft --- sparse.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff -upN reference/mm/sparse.c current/mm/sparse.c --- reference/mm/sparse.c +++ current/mm/sparse.c @@ -102,6 +102,20 @@ int __section_nr(struct mem_section* ms) return (root_nr * SECTIONS_PER_ROOT) + (ms - root); } +/* + * During early boot we need to record the nid from which we will + * later allocate the section mem_map. Encode this into the section + * pointer. Overload the section_mem_map with this information. + */ +static inline unsigned long sparse_encode_early_nid(int nid) + return (nid << SECTION_MAP_LAST_BIT); +} + +static inline int sparse_early_nid(struct mem_section *section) + unsigned long nid = section->section_mem_map; + return (nid >> SECTION_MAP_LAST_BIT); +} + /* Record a memory area against a node. */ void memory_present(int nid, unsigned long start, unsigned long end) { @@ -116,7 +130,8 @@ void memory_present(int nid, unsigned lo ms = __nr_to_section(section); if (!ms->section_mem_map) - ms->section_mem_map = SECTION_MARKED_PRESENT; + ms->section_mem_map = sparse_encode_early_nid(nid) | + SECTION_MARKED_PRESENT; } } @@ -175,8 +190,8 @@ static int sparse_init_one_section(struc static struct page *sparse_early_mem_map_alloc(unsigned long pnum) { struct page *map; - int nid = early_pfn_to_nid(section_nr_to_pfn(pnum)); struct mem_section *ms = __nr_to_section(pnum); + int nid = sparse_early_nid(ms); map = alloc_remap(nid, sizeof(struct page) * PAGES_PER_SECTION); if (map)