* [PATCH mm-unstable 1/2] mm/mm_init: rename __init_reserved_page_zone to __init_page_from_nid
2025-02-25 8:30 [PATCH mm-unstable 0/2] mm_init: rename *init_reserved_page* functions Mike Rapoport
@ 2025-02-25 8:30 ` Mike Rapoport
2025-02-26 1:52 ` Wei Yang
2025-02-25 8:30 ` [PATCH mm-unstable 2/2] mm/mm_init: rename init_reserved_page to init_deferred_page Mike Rapoport
1 sibling, 1 reply; 5+ messages in thread
From: Mike Rapoport @ 2025-02-25 8:30 UTC (permalink / raw)
To: Andrew Morton
Cc: Frank van der Linden, Mike Rapoport, Muchun Song, Wei Yang,
linux-mm, linux-kernel
From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
__init_reserved_page_zone() function finds the zone for pfn and nid and
performs initialization of a struct page with that zone and nid.
There is nothing in that function about reserved pages and it is
misnamed.
Rename it to __init_page_from_nid() to better reflect what the function
does.
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
mm/hugetlb.c | 2 +-
mm/internal.h | 2 +-
mm/mm_init.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 9faa1034704f..778c21da22f0 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3392,7 +3392,7 @@ static void __init hugetlb_bootmem_free_invalid_page(int nid, struct page *page,
while (npages--) {
pfn = page_to_pfn(page);
- __init_reserved_page_zone(pfn, nid);
+ __init_page_from_nid(pfn, nid);
free_reserved_page(page);
page++;
}
diff --git a/mm/internal.h b/mm/internal.h
index b07550db2bfd..5c0b81abbc1b 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1465,7 +1465,7 @@ static inline bool pte_needs_soft_dirty_wp(struct vm_area_struct *vma, pte_t pte
void __meminit __init_single_page(struct page *page, unsigned long pfn,
unsigned long zone, int nid);
-void __meminit __init_reserved_page_zone(unsigned long pfn, int nid);
+void __meminit __init_page_from_nid(unsigned long pfn, int nid);
/* shrinker related functions */
unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg,
diff --git a/mm/mm_init.c b/mm/mm_init.c
index 133640a93d1d..f9a02b1e2fce 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -653,7 +653,7 @@ static inline void fixup_hashdist(void) {}
/*
* Initialize a reserved page unconditionally, finding its zone first.
*/
-void __meminit __init_reserved_page_zone(unsigned long pfn, int nid)
+void __meminit __init_page_from_nid(unsigned long pfn, int nid)
{
pg_data_t *pgdat;
int zid;
@@ -733,7 +733,7 @@ static void __meminit init_reserved_page(unsigned long pfn, int nid)
if (early_page_initialised(pfn, nid))
return;
- __init_reserved_page_zone(pfn, nid);
+ __init_page_from_nid(pfn, nid);
}
#else
static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {}
--
2.47.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH mm-unstable 2/2] mm/mm_init: rename init_reserved_page to init_deferred_page
2025-02-25 8:30 [PATCH mm-unstable 0/2] mm_init: rename *init_reserved_page* functions Mike Rapoport
2025-02-25 8:30 ` [PATCH mm-unstable 1/2] mm/mm_init: rename __init_reserved_page_zone to __init_page_from_nid Mike Rapoport
@ 2025-02-25 8:30 ` Mike Rapoport
2025-02-26 1:54 ` Wei Yang
1 sibling, 1 reply; 5+ messages in thread
From: Mike Rapoport @ 2025-02-25 8:30 UTC (permalink / raw)
To: Andrew Morton
Cc: Frank van der Linden, Mike Rapoport, Muchun Song, Wei Yang,
linux-mm, linux-kernel
From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
When CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled, init_reserved_page()
function performs initialization of a struct page that would have been
deferred normally.
Rename it to init_deferred_page() to better reflect what the function does.
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
---
mm/mm_init.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/mm_init.c b/mm/mm_init.c
index f9a02b1e2fce..abb24aedfc96 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -728,7 +728,7 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn)
return false;
}
-static void __meminit init_reserved_page(unsigned long pfn, int nid)
+static void __meminit init_deferred_page(unsigned long pfn, int nid)
{
if (early_page_initialised(pfn, nid))
return;
@@ -748,7 +748,7 @@ static inline bool defer_init(int nid, unsigned long pfn, unsigned long end_pfn)
return false;
}
-static inline void init_reserved_page(unsigned long pfn, int nid)
+static inline void init_deferred_page(unsigned long pfn, int nid)
{
}
#endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */
@@ -769,7 +769,7 @@ void __meminit reserve_bootmem_region(phys_addr_t start,
if (pfn_valid(start_pfn)) {
struct page *page = pfn_to_page(start_pfn);
- init_reserved_page(start_pfn, nid);
+ init_deferred_page(start_pfn, nid);
/*
* no need for atomic set_bit because the struct
--
2.47.2
^ permalink raw reply [flat|nested] 5+ messages in thread