mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-30 14:33:24 -04:00
mm/hugetlb: initialize gigantic bootmem hugepage struct pages earlier
Gigantic bootmem HugeTLB pages are currently initialized from
hugetlb_init(), but page_alloc_init_late() runs earlier and walks
pageblocks to determine zone contiguity.
If a bootmem HugeTLB region is marked noinit, set_zone_contiguous() can
observe still-uninitialized struct pages through
__pageblock_pfn_to_page(). This may not trigger an immediate failure, but
it can make set_zone_contiguous() compute the wrong zone contiguity state.
If extra poisoned-page checks are added in this path, such as
PF_POISONED_CHECK() in page_zone_id(), it can also trigger an early boot
panic.
Initialize gigantic bootmem HugeTLB struct pages from
page_alloc_init_late(), before zone contiguity is evaluated, so later page
allocator setup only sees valid struct page state. This also makes the
initialization order more natural, as struct pages should be initialized
before later code inspects them.
Link: https://lore.kernel.org/20260612035903.2468601-5-songmuchun@bytedance.com
Fixes: fde1c4ecf9 ("mm: hugetlb: skip initialization of gigantic tail struct pages if freed by HVO")
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: Oscar Salvador <osalvador@suse.de>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Cc: David Hildenbrand <david@kernel.org>
Cc: Frank van der Linden <fvdl@google.com>
Cc: Liam R. Howlett <liam@infradead.org>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Oscar Salvador (SUSE) <osalvador@kernel.org>
Cc: "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Cc: Usama Arif <usama.arif@linux.dev>
Cc: Vlastimil Babka <vbabka@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
committed by
Andrew Morton
parent
89a4ae3276
commit
b1b7c045e8
@@ -172,6 +172,7 @@ extern int movable_gigantic_pages __read_mostly;
|
||||
extern int sysctl_hugetlb_shm_group __read_mostly;
|
||||
extern struct list_head huge_boot_pages[MAX_NUMNODES];
|
||||
|
||||
void hugetlb_bootmem_struct_page_init(void);
|
||||
void hugetlb_bootmem_alloc(void);
|
||||
extern nodemask_t hugetlb_bootmem_nodes;
|
||||
void hugetlb_bootmem_set_nodes(void);
|
||||
@@ -1294,6 +1295,10 @@ static inline bool hugetlbfs_pagecache_present(
|
||||
static inline void hugetlb_bootmem_alloc(void)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void hugetlb_bootmem_struct_page_init(void)
|
||||
{
|
||||
}
|
||||
#endif /* CONFIG_HUGETLB_PAGE */
|
||||
|
||||
static inline spinlock_t *huge_pte_lock(struct hstate *h,
|
||||
|
||||
@@ -3353,7 +3353,7 @@ static void __init gather_bootmem_prealloc_parallel(unsigned long start,
|
||||
gather_bootmem_prealloc_node(nid);
|
||||
}
|
||||
|
||||
static void __init gather_bootmem_prealloc(void)
|
||||
void __init hugetlb_bootmem_struct_page_init(void)
|
||||
{
|
||||
struct padata_mt_job job = {
|
||||
.thread_fn = gather_bootmem_prealloc_parallel,
|
||||
@@ -3582,7 +3582,7 @@ static unsigned long __init hugetlb_pages_alloc_boot(struct hstate *h)
|
||||
* - For gigantic pages, this is called early in the boot process and
|
||||
* pages are allocated from memblock allocated or something similar.
|
||||
* Gigantic pages are actually added to pools later with the routine
|
||||
* gather_bootmem_prealloc.
|
||||
* hugetlb_bootmem_struct_page_init.
|
||||
* - For non-gigantic pages, this is called later in the boot process after
|
||||
* all of mm is up and functional. Pages are allocated from buddy and
|
||||
* then added to hugetlb pools.
|
||||
@@ -4152,7 +4152,6 @@ static int __init hugetlb_init(void)
|
||||
}
|
||||
|
||||
hugetlb_init_hstates();
|
||||
gather_bootmem_prealloc();
|
||||
report_hugepages();
|
||||
|
||||
hugetlb_sysfs_init();
|
||||
|
||||
@@ -2330,6 +2330,7 @@ void __init page_alloc_init_late(void)
|
||||
/* Reinit limits that are based on free pages after the kernel is up */
|
||||
files_maxfiles_init();
|
||||
#endif
|
||||
hugetlb_bootmem_struct_page_init();
|
||||
|
||||
/* Accounting of total+free memory is stable at this point. */
|
||||
mem_init_print_info();
|
||||
|
||||
@@ -342,8 +342,8 @@ static __meminit struct page *vmemmap_get_tail(unsigned int order, struct zone *
|
||||
*
|
||||
* Any initialization done here will be overwritten by memmap_init().
|
||||
*
|
||||
* gather_bootmem_prealloc() will take care of initialization after
|
||||
* memmap_init().
|
||||
* hugetlb_bootmem_struct_page_init() will take care of initialization
|
||||
* after memmap_init().
|
||||
*/
|
||||
|
||||
p = vmemmap_alloc_block_zero(PAGE_SIZE, node);
|
||||
|
||||
Reference in New Issue
Block a user