github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mm/hugetlb: defer vmemmap population for bootmem hugepages

Browse Source 
Currently, the vmemmap for bootmem-allocated gigantic pages is populated
early in hugetlb_vmemmap_init_early().  However, the zone information is
only available after zones are initialized.  If it is later discovered
that a page spans multiple zones, the HVO mapping must be undone and
replaced with a normal mapping using vmemmap_undo_hvo().

Defer the actual vmemmap population to hugetlb_vmemmap_init_late().  At
this stage, zones are already initialized, so it can be checked if the
page is valid for HVO before deciding how to populate the vmemmap.

This allows us to remove vmemmap_undo_hvo() and the complex logic required
to rollback HVO mappings.

In hugetlb_vmemmap_init_late(), if HVO population fails or if the zones
are invalid, fall back to a normal vmemmap population.

Postponing population until hugetlb_vmemmap_init_late() also makes zone
information available from within vmemmap_populate_hvo().

Link: https://lkml.kernel.org/r/20260227194302.274384-10-kas@kernel.org
Signed-off-by: Kiryl Shutsemau (Meta) <kas@kernel.org>
Acked-by: David Hildenbrand (Arm) <david@kernel.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Baoquan He <bhe@redhat.com>
Cc: Christoph Lameter <cl@gentwo.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Frank van der Linden <fvdl@google.com>
Cc: Harry Yoo <harry.yoo@oracle.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Usama Arif <usamaarif642@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Kiryl Shutsemau (Meta) 2026-02-27 19:42:47 +00:00 committed by Andrew Morton
parent 9f94db4c7e
commit 209e6d9eb1
3 changed files with 18 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/mm.h
View File

@ -4481,8 +4481,6 @@ int vmemmap_populate(unsigned long start, unsigned long end, int node,
struct vmem_altmap *altmap);
int vmemmap_populate_hvo(unsigned long start, unsigned long end, int node,
unsigned long headsize);
int vmemmap_undo_hvo(unsigned long start, unsigned long end, int node,
unsigned long headsize);
void vmemmap_wrprotect_hvo(unsigned long start, unsigned long end, int node,
unsigned long headsize);
void vmemmap_populate_print_last(void);

37
mm/hugetlb_vmemmap.c
View File

@ -790,7 +790,6 @@ void __init hugetlb_vmemmap_init_early(int nid)
{
unsigned long psize, paddr, section_size;
unsigned long ns, i, pnum, pfn, nr_pages;
unsigned long start, end;
struct huge_bootmem_page *m = NULL;
void *map;
@ -808,14 +807,6 @@ void __init hugetlb_vmemmap_init_early(int nid)
paddr = virt_to_phys(m);
pfn = PHYS_PFN(paddr);
map = pfn_to_page(pfn);
start = (unsigned long)map;
end = start + nr_pages * sizeof(struct page);
if (vmemmap_populate_hvo(start, end, nid,
HUGETLB_VMEMMAP_RESERVE_SIZE) < 0)
continue;
memmap_boot_pages_add(HUGETLB_VMEMMAP_RESERVE_SIZE / PAGE_SIZE);
pnum = pfn_to_section_nr(pfn);
ns = psize / section_size;
@ -850,28 +841,36 @@ void __init hugetlb_vmemmap_init_late(int nid)
h = m->hstate;
pfn = PHYS_PFN(phys);
nr_pages = pages_per_huge_page(h);
map = pfn_to_page(pfn);
start = (unsigned long)map;
end = start + nr_pages * sizeof(struct page);
if (!hugetlb_bootmem_page_zones_valid(nid, m)) {
/*
* Oops, the hugetlb page spans multiple zones.
* Remove it from the list, and undo HVO.
* Remove it from the list, and populate it normally.
*/
list_del(&m->list);
map = pfn_to_page(pfn);
start = (unsigned long)map;
end = start + nr_pages * sizeof(struct page);
vmemmap_undo_hvo(start, end, nid,
HUGETLB_VMEMMAP_RESERVE_SIZE);
nr_mmap = end - start - HUGETLB_VMEMMAP_RESERVE_SIZE;
vmemmap_populate(start, end, nid, NULL);
nr_mmap = end - start;
memmap_boot_pages_add(DIV_ROUND_UP(nr_mmap, PAGE_SIZE));
memblock_phys_free(phys, huge_page_size(h));
continue;
} else
}
if (vmemmap_populate_hvo(start, end, nid,
HUGETLB_VMEMMAP_RESERVE_SIZE) < 0) {
/* Fallback if HVO population fails */
vmemmap_populate(start, end, nid, NULL);
nr_mmap = end - start;
} else {
m->flags |= HUGE_BOOTMEM_ZONES_VALID;
nr_mmap = HUGETLB_VMEMMAP_RESERVE_SIZE;
}
memmap_boot_pages_add(DIV_ROUND_UP(nr_mmap, PAGE_SIZE));
}
}
#endif

53
mm/sparse-vmemmap.c
View File

@ -302,59 +302,6 @@ int __meminit vmemmap_populate_basepages(unsigned long start, unsigned long end,
return vmemmap_populate_range(start, end, node, altmap, -1, 0);
}
/*
* Undo populate_hvo, and replace it with a normal base page mapping.
* Used in memory init in case a HVO mapping needs to be undone.
*
* This can happen when it is discovered that a memblock allocated
* hugetlb page spans multiple zones, which can only be verified
* after zones have been initialized.
*
* We know that:
* 1) The first @headsize / PAGE_SIZE vmemmap pages were individually
* allocated through memblock, and mapped.
*
* 2) The rest of the vmemmap pages are mirrors of the last head page.
*/
int __meminit vmemmap_undo_hvo(unsigned long addr, unsigned long end,
int node, unsigned long headsize)
{
unsigned long maddr, pfn;
pte_t *pte;
int headpages;
/*
* Should only be called early in boot, so nothing will
* be accessing these page structures.
*/
WARN_ON(!early_boot_irqs_disabled);
headpages = headsize >> PAGE_SHIFT;
/*
* Clear mirrored mappings for tail page structs.
*/
for (maddr = addr + headsize; maddr < end; maddr += PAGE_SIZE) {
pte = virt_to_kpte(maddr);
pte_clear(&init_mm, maddr, pte);
}
/*
* Clear and free mappings for head page and first tail page
* structs.
*/
for (maddr = addr; headpages-- > 0; maddr += PAGE_SIZE) {
pte = virt_to_kpte(maddr);
pfn = pte_pfn(ptep_get(pte));
pte_clear(&init_mm, maddr, pte);
memblock_phys_free(PFN_PHYS(pfn), PAGE_SIZE);
}
flush_tlb_kernel_range(addr, end);
return vmemmap_populate(addr, end, node, NULL);
}
/*
* Write protect the mirrored tail page structs for HVO. This will be
* called from the hugetlb code when gathering and initializing the