aboutsummaryrefslogtreecommitdiffstats
path: root/mm/sparse.c
diff options
context:
space:
mode:
authorPavel Tatashin <pasha.tatashin@oracle.com>2018-08-17 18:49:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-17 19:20:32 -0400
commit35fd1eb1e8212c02f6eae24335a9e5b80f9519b4 (patch)
tree623e76f9707e5535a74f74dce659ef6782467fe4 /mm/sparse.c
parent330d6e489a0ab49136561d7f792b1d81bcdbb83c (diff)
mm/sparse: abstract sparse buffer allocations
Patch series "sparse_init rewrite", v6. In sparse_init() we allocate two large buffers to temporary hold usemap and memmap for the whole machine. However, we can avoid doing that if we changed sparse_init() to operated on per-node bases instead of doing it on the whole machine beforehand. As shown by Baoquan http://lkml.kernel.org/r/20180628062857.29658-1-bhe@redhat.com The buffers are large enough to cause machine stop to boot on small memory systems. Another benefit of these changes is that they also obsolete CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER. This patch (of 5): When struct pages are allocated for sparse-vmemmap VA layout, we first try to allocate one large buffer, and than if that fails allocate struct pages for each section as we go. The code that allocates buffer is uses global variables and is spread across several call sites. Cleanup the code by introducing three functions to handle the global buffer: sparse_buffer_init() initialize the buffer sparse_buffer_fini() free the remaining part of the buffer sparse_buffer_alloc() alloc from the buffer, and if buffer is empty return NULL Define these functions in sparse.c instead of sparse-vmemmap.c because later we will use them for non-vmemmap sparse allocations as well. [akpm@linux-foundation.org: use PTR_ALIGN()] [akpm@linux-foundation.org: s/BUG_ON/WARN_ON/] Link: http://lkml.kernel.org/r/20180712203730.8703-2-pasha.tatashin@oracle.com Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com> Tested-by: Michael Ellerman <mpe@ellerman.id.au> [powerpc] Reviewed-by: Oscar Salvador <osalvador@suse.de> Tested-by: Oscar Salvador <osalvador@suse.de> Cc: Pasha Tatashin <Pavel.Tatashin@microsoft.com> Cc: Steven Sistare <steven.sistare@oracle.com> Cc: Daniel Jordan <daniel.m.jordan@oracle.com> Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Cc: Michal Hocko <mhocko@kernel.org> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Jan Kara <jack@suse.cz> Cc: Jérôme Glisse <jglisse@redhat.com> Cc: Souptick Joarder <jrdr.linux@gmail.com> Cc: Baoquan He <bhe@redhat.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Wei Yang <richard.weiyang@gmail.com> Cc: Dave Hansen <dave.hansen@intel.com> Cc: David Rientjes <rientjes@google.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Abdul Haleem <abdhalee@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/sparse.c')
-rw-r--r--mm/sparse.c45
1 files changed, 44 insertions, 1 deletions
diff --git a/mm/sparse.c b/mm/sparse.c
index 2ea8b3dbd0df..9a0a5f598469 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -400,7 +400,14 @@ static void __init sparse_early_usemaps_alloc_node(void *data,
400 } 400 }
401} 401}
402 402
403#ifndef CONFIG_SPARSEMEM_VMEMMAP 403#ifdef CONFIG_SPARSEMEM_VMEMMAP
404unsigned long __init section_map_size(void)
405
406{
407 return ALIGN(sizeof(struct page) * PAGES_PER_SECTION, PMD_SIZE);
408}
409
410#else
404struct page __init *sparse_mem_map_populate(unsigned long pnum, int nid, 411struct page __init *sparse_mem_map_populate(unsigned long pnum, int nid,
405 struct vmem_altmap *altmap) 412 struct vmem_altmap *altmap)
406{ 413{
@@ -457,6 +464,42 @@ void __init sparse_mem_maps_populate_node(struct page **map_map,
457} 464}
458#endif /* !CONFIG_SPARSEMEM_VMEMMAP */ 465#endif /* !CONFIG_SPARSEMEM_VMEMMAP */
459 466
467static void *sparsemap_buf __meminitdata;
468static void *sparsemap_buf_end __meminitdata;
469
470void __init sparse_buffer_init(unsigned long size, int nid)
471{
472 WARN_ON(sparsemap_buf); /* forgot to call sparse_buffer_fini()? */
473 sparsemap_buf =
474 memblock_virt_alloc_try_nid_raw(size, PAGE_SIZE,
475 __pa(MAX_DMA_ADDRESS),
476 BOOTMEM_ALLOC_ACCESSIBLE, nid);
477 sparsemap_buf_end = sparsemap_buf + size;
478}
479
480void __init sparse_buffer_fini(void)
481{
482 unsigned long size = sparsemap_buf_end - sparsemap_buf;
483
484 if (sparsemap_buf && size > 0)
485 memblock_free_early(__pa(sparsemap_buf), size);
486 sparsemap_buf = NULL;
487}
488
489void * __meminit sparse_buffer_alloc(unsigned long size)
490{
491 void *ptr = NULL;
492
493 if (sparsemap_buf) {
494 ptr = PTR_ALIGN(sparsemap_buf, size);
495 if (ptr + size > sparsemap_buf_end)
496 ptr = NULL;
497 else
498 sparsemap_buf = ptr + size;
499 }
500 return ptr;
501}
502
460#ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER 503#ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER
461static void __init sparse_early_mem_maps_alloc_node(void *data, 504static void __init sparse_early_mem_maps_alloc_node(void *data,
462 unsigned long pnum_begin, 505 unsigned long pnum_begin,