path: root/mm/sparse-vmemmap.c
diff options
authorBaoquan He <>2018-08-17 15:48:42 -0700
committerLinus Torvalds <>2018-08-17 16:20:31 -0700
commit07a34a8c36521c37119259d937d1389c3f5f6db9 (patch)
treec1378da8a9aef210acfa79f54d8c3258960f69bf /mm/sparse-vmemmap.c
parentf2fc10e0b3fe7d1aecbd2cab6bf0007b6771e16d (diff)
mm/sparsemem.c: defer the ms->section_mem_map clearing
In sparse_init(), if CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y, system will allocate one continuous memory chunk for mem maps on one node and populate the relevant page tables to map memory section one by one. If fail to populate for a certain mem section, print warning and its ->section_mem_map will be cleared to cancel the marking of being present. Like this, the number of mem sections marked as present could become less during sparse_init() execution. Here just defer the ms->section_mem_map clearing if failed to populate its page tables until the last for_each_present_section_nr() loop. This is in preparation for later optimizing the mem map allocation. [ remove now-unused local `ms', per Oscar] Link: Signed-off-by: Baoquan He <> Acked-by: Dave Hansen <> Reviewed-by: Pavel Tatashin <> Reviewed-by: Oscar Salvador <> Cc: Pasha Tatashin <> Cc: Kirill A. Shutemov <> Cc: Pankaj Gupta <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'mm/sparse-vmemmap.c')
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
index bd0276d5f66b..68bb65b2d34d 100644
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -292,18 +292,14 @@ void __init sparse_mem_maps_populate_node(struct page **map_map,
for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
- struct mem_section *ms;
if (!present_section_nr(pnum))
map_map[pnum] = sparse_mem_map_populate(pnum, nodeid, NULL);
if (map_map[pnum])
- ms = __nr_to_section(pnum);
pr_err("%s: sparsemem memory map backing failed some memory will not be available\n",
- ms->section_mem_map = 0;
if (vmemmap_buf_start) {