section_nr_vmemmap_pages() no longer needs altmap- or pgmap-specific state to decide whether a section uses the optimized vmemmap layout.
Now that the optimization state is recorded in struct mem_section, use section_vmemmap_optimizable() and section_order() directly and drop the redundant arguments from the helper and its callers. Signed-off-by: Muchun Song <[email protected]> --- mm/internal.h | 3 +-- mm/sparse-vmemmap.c | 7 +++---- mm/sparse.c | 19 ++++++------------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 18276cd15622..06022074ebcb 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -997,8 +997,7 @@ static inline void __section_mark_present(struct mem_section *ms, ms->section_mem_map |= SECTION_MARKED_PRESENT; } -int section_nr_vmemmap_pages(unsigned long pfn, unsigned long nr_pages, - struct vmem_altmap *altmap, struct dev_pagemap *pgmap); +int section_nr_vmemmap_pages(unsigned long pfn, unsigned long nr_pages); #else static inline void sparse_memblocks_present(void) {} static inline void sparse_init(void) {} diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index ce1cf5cdf613..793fd4ce1393 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -468,7 +468,7 @@ static struct page * __meminit populate_section_memmap(unsigned long pfn, struct page *page = __populate_section_memmap(pfn, nr_pages, nid, altmap, pgmap); - memmap_pages_add(section_nr_vmemmap_pages(pfn, nr_pages, altmap, pgmap)); + memmap_pages_add(section_nr_vmemmap_pages(pfn, nr_pages)); return page; } @@ -479,7 +479,7 @@ static void depopulate_section_memmap(unsigned long pfn, unsigned long nr_pages, unsigned long start = (unsigned long) pfn_to_page(pfn); unsigned long end = start + nr_pages * sizeof(struct page); - memmap_pages_add(-section_nr_vmemmap_pages(pfn, nr_pages, altmap, pgmap)); + memmap_pages_add(-section_nr_vmemmap_pages(pfn, nr_pages)); vmemmap_free(start, end, altmap); } @@ -489,8 +489,7 @@ static void free_map_bootmem(struct page *memmap) unsigned long end = (unsigned long)(memmap + PAGES_PER_SECTION); unsigned long pfn = page_to_pfn(memmap); - memmap_boot_pages_add(-section_nr_vmemmap_pages(pfn, PAGES_PER_SECTION, - NULL, NULL)); + memmap_boot_pages_add(-section_nr_vmemmap_pages(pfn, PAGES_PER_SECTION)); vmemmap_free(start, end, NULL); } diff --git a/mm/sparse.c b/mm/sparse.c index 6878f8941b4c..3390cb82f114 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -237,32 +237,26 @@ void __weak __meminit vmemmap_populate_print_last(void) { } -int __meminit section_nr_vmemmap_pages(unsigned long pfn, unsigned long nr_pages, - struct vmem_altmap *altmap, struct dev_pagemap *pgmap) +int __meminit section_nr_vmemmap_pages(unsigned long pfn, unsigned long nr_pages) { - const struct mem_section *ms = __pfn_to_section(pfn); - const unsigned int order = pgmap ? pgmap->vmemmap_shift : section_order(ms); + const unsigned int order = pfn_to_section_order(pfn); const unsigned long pages_per_compound = 1UL << order; - unsigned int vmemmap_pages = OPTIMIZED_FOLIO_VMEMMAP_PAGES; VM_WARN_ON_ONCE(!IS_ALIGNED(pfn | nr_pages, PAGES_PER_SUBSECTION)); VM_WARN_ON_ONCE(nr_pages > PAGES_PER_SECTION); - if (vmemmap_can_optimize(altmap, pgmap)) - vmemmap_pages = VMEMMAP_RESERVE_NR; - - if (!section_vmemmap_optimizable(ms)) + if (!order_vmemmap_optimizable(order)) return DIV_ROUND_UP(nr_pages * sizeof(struct page), PAGE_SIZE); if (order < PFN_SECTION_SHIFT) { VM_WARN_ON_ONCE(!IS_ALIGNED(pfn | nr_pages, pages_per_compound)); - return vmemmap_pages * nr_pages / pages_per_compound; + return OPTIMIZED_FOLIO_VMEMMAP_PAGES * nr_pages / pages_per_compound; } VM_WARN_ON_ONCE(!IS_ALIGNED(pfn | nr_pages, PAGES_PER_SECTION)); if (IS_ALIGNED(pfn, pages_per_compound)) - return vmemmap_pages; + return OPTIMIZED_FOLIO_VMEMMAP_PAGES; return 0; } @@ -294,8 +288,7 @@ static void __init sparse_init_nid(int nid, unsigned long pnum_begin, nid, NULL, NULL); if (!map) panic("Failed to allocate memmap for section %lu\n", pnum); - memmap_boot_pages_add(section_nr_vmemmap_pages(pfn, PAGES_PER_SECTION, - NULL, NULL)); + memmap_boot_pages_add(section_nr_vmemmap_pages(pfn, PAGES_PER_SECTION)); sparse_init_one_section(__nr_to_section(pnum), pnum, map, usage, SECTION_IS_EARLY); usage = (void *)usage + mem_section_usage_size(); -- 2.54.0
