[PATCH v2 01/14] mm/mm_init: factor out memmap_init_page_from_template()
From: Muchun Song
Date: Thu Nov 12 2026 - 23:28:27 EST
From: Li Zhe <lizhe.67@xxxxxxxxxxxxx>
ZONE_DEVICE memmap initialization already uses a reusable struct page
template when initializing compound tail pages. The template mostly
contains invariant state, but a few fields still depend on the target PFN
and must be refreshed before copying the template into each destination
struct page.
Factor that operation into memmap_init_page_from_template() so other
boot-time memmap initialization paths can reuse the same helper.
No functional change intended.
Signed-off-by: Li Zhe <lizhe.67@xxxxxxxxxxxxx>
Reviewed-by: Muchun Song (ByteDance) <muchun.song@xxxxxxxxx>
Signed-off-by: Muchun Song <songmuchun@xxxxxxxxxxxxx>
---
mm/mm_init.c | 33 +++++++++++++++++++--------------
mm/mm_init.h | 2 ++
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/mm/mm_init.c b/mm/mm_init.c
index 2367af05570b..3988c19699bc 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -707,6 +707,22 @@ static __meminit void pageblock_migratetype_init_range(unsigned long pfn,
}
}
+void __meminit memmap_init_page_from_template(struct page *page,
+ unsigned long pfn, const struct zone *zone, struct page *template)
+{
+ /*
+ * Refresh PFN-dependent fields in the template before the
+ * non-temporal copy, so the destination page does not need cached
+ * stores after memcpy_nontemporal().
+ */
+ set_page_section_from_pfn(template, pfn);
+#ifdef WANT_PAGE_VIRTUAL
+ if (!is_highmem_idx(zone_idx(zone)))
+ set_page_address(template, __va(pfn << PAGE_SHIFT));
+#endif
+ memcpy_nontemporal(page, template, sizeof(*page));
+}
+
struct zone __meminit *pfn_to_zone(unsigned long pfn, int nid)
{
pg_data_t *pgdat = NODE_DATA(nid);
@@ -1074,17 +1090,6 @@ static void __ref __init_zone_device_page(struct page *page, unsigned long pfn,
}
}
-static void zone_device_page_init_from_template(struct page *page,
- unsigned long pfn, struct page *template)
-{
- set_page_section_from_pfn(template, pfn);
-#ifdef WANT_PAGE_VIRTUAL
- if (!is_highmem_idx(ZONE_DEVICE))
- set_page_address(template, __va(pfn << PAGE_SHIFT));
-#endif
- memcpy_nontemporal(page, template, sizeof(*page));
-}
-
/*
* With compound page geometry and when struct pages are stored in ram most
* tail pages are reused. Consequently, the amount of unique struct pages to
@@ -1137,8 +1142,8 @@ static void __ref memmap_init_compound(struct page *head,
/* Initialize the remaining tail pages from template. */
for (pfn = head_pfn + 2; pfn < end_pfn; pfn++)
- zone_device_page_init_from_template(pfn_to_page(pfn), pfn,
- &template);
+ memmap_init_page_from_template(pfn_to_page(pfn), pfn,
+ device_zone(nid), &template);
prep_compound_head(head, order);
}
@@ -1193,7 +1198,7 @@ void __ref memmap_init_zone_device(struct zone *zone,
for (; pfn < end_pfn; pfn += pfns_per_compound) {
page = pfn_to_page(pfn);
- zone_device_page_init_from_template(page, pfn, &template);
+ memmap_init_page_from_template(page, pfn, zone, &template);
if (IS_ALIGNED(pfn, PAGES_PER_SECTION))
cond_resched();
diff --git a/mm/mm_init.h b/mm/mm_init.h
index 0034e37dbabd..4478419f0bb9 100644
--- a/mm/mm_init.h
+++ b/mm/mm_init.h
@@ -111,5 +111,7 @@ void memblock_free_all(void);
void __meminit __init_single_page(struct page *page, unsigned long pfn,
unsigned long zone, int nid);
+void __meminit memmap_init_page_from_template(struct page *page,
+ unsigned long pfn, const struct zone *zone, struct page *template);
#endif /* __MM_MM_INIT_H */
--
2.54.0