The patch titled
Subject: mm/sparsemem.c: defer the ms->section_mem_map clearing
has been added to the -mm tree. Its filename is
mm-sparsemem-defer-the-ms-section_mem_map-clearing.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-sparsemem-defer-the-ms-section_mem_map-clearing.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-sparsemem-defer-the-ms-section_mem_map-clearing.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Baoquan He <bhe@xxxxxxxxxx>
Subject: 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.
Link: http://lkml.kernel.org/r/20180228032657.32385-3-bhe@xxxxxxxxxx
Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Pankaj Gupta <pagupta@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/sparse-vmemmap.c | 1 -
mm/sparse.c | 12 ++++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff -puN mm/sparse.c~mm-sparsemem-defer-the-ms-section_mem_map-clearing mm/sparse.c
--- a/mm/sparse.c~mm-sparsemem-defer-the-ms-section_mem_map-clearing
+++ a/mm/sparse.c
@@ -490,7 +490,6 @@ void __init sparse_mem_maps_populate_nod
ms = __nr_to_section(pnum);
pr_err("%s: sparsemem memory map backing failed some memory will not be available\n",
__func__);
- ms->section_mem_map = 0;
}
}
#endif /* !CONFIG_SPARSEMEM_VMEMMAP */
@@ -518,7 +517,6 @@ static struct page __init *sparse_early_
pr_err("%s: sparsemem memory map backing failed some memory will not be available\n",
__func__);
- ms->section_mem_map = 0;
return NULL;
}
#endif
@@ -622,17 +620,23 @@ void __init sparse_init(void)
#endif
for_each_present_section_nr(0, pnum) {
+ struct mem_section *ms;
+ ms = __nr_to_section(pnum);
usemap = usemap_map[pnum];
- if (!usemap)
+ if (!usemap) {
+ ms->section_mem_map = 0;
continue;
+ }
#ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER
map = map_map[pnum];
#else
map = sparse_early_mem_map_alloc(pnum);
#endif
- if (!map)
+ if (!map) {
+ ms->section_mem_map = 0;
continue;
+ }
sparse_init_one_section(__nr_to_section(pnum), pnum, map,
usemap);
diff -puN mm/sparse-vmemmap.c~mm-sparsemem-defer-the-ms-section_mem_map-clearing mm/sparse-vmemmap.c
--- a/mm/sparse-vmemmap.c~mm-sparsemem-defer-the-ms-section_mem_map-clearing
+++ a/mm/sparse-vmemmap.c
@@ -303,7 +303,6 @@ void __init sparse_mem_maps_populate_nod
ms = __nr_to_section(pnum);
pr_err("%s: sparsemem memory map backing failed some memory will not be available\n",
__func__);
- ms->section_mem_map = 0;
}
if (vmemmap_buf_start) {
_
Patches currently in -mm which might be from bhe@xxxxxxxxxx are
mm-sparse-add-a-static-variable-nr_present_sections.patch
mm-sparsemem-defer-the-ms-section_mem_map-clearing.patch
mm-sparse-add-a-new-parameter-data_unit_size-for-alloc_usemap_and_memmap.patch
mm-sparse-optimize-memmap-allocation-during-sparse_init.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
