mm_init: rename *init_reserved_page* functions
Mike Rapoport
maintainercover mm_init: rename *init_reserved_page* functions
From: "Mike Rapoport (Microsoft)" <[email protected]>
Hi,
Following Wei's comments on my patch that renamed init_reserved_page() to init_deferred_page(), I think it makes sense to pull that patch out of KHO series and merge it now.
To take into account the refactoring of that function in mm-unstable there is also a patch that renames __init_reserved_page_zone() to __init_page_from_nid().
[1] https://lore.kernel.org/linux-mm/[email protected]/
Mike Rapoport (Microsoft) (2):
mm/mm_init: rename __init_reserved_page_zone to __init_page_from_nid mm/mm_init: rename init_reserved_page to init_deferred_page
mm/hugetlb.c | 2 +- mm/internal.h | 2 +- mm/mm_init.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-)
Signature · 1 line
2.47.2
Mike Rapoport
maintainerPATCH 1/2 mm/mm_init: rename __init_reserved_page_zone to __init_page_from_nid
From: "Mike Rapoport (Microsoft)" <[email protected]>
__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.
--- mm/hugetlb.c | 2 +- mm/internal.h | 2 +- mm/mm_init.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
mm/hugetlb.c +1 -1
@@ -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++; }
mm/internal.h +1 -1
@@ -1465,7 +1465,7 @@ static inline bool pte_needs_soft_dirty_wp(struct vm_area_struct *vma, pte_t ptevoid __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,
mm/mm_init.c +2 -2
@@ -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) {}
Signature · 1 line
2.47.2
Re: [PATCH mm-unstable 1/2] mm/mm_init: rename __init_reserved_page_zone to __init_page_from_nid
Quoted 11 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
__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) <[email protected]>
Signature · 2 lines
Wei Yang Help you, Help me
Mike Rapoport
maintainerPATCH 2/2 mm/mm_init: rename init_reserved_page to init_deferred_page
In reply to Mike RapoportFrom: "Mike Rapoport (Microsoft)" <[email protected]>
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.
--- mm/mm_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/mm_init.c +3 -3
@@ -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
Signature · 1 line
2.47.2
Re: [PATCH mm-unstable 2/2] mm/mm_init: rename init_reserved_page to init_deferred_page
Quoted 9 lines · Mike Rapoport
From: "Mike Rapoport (Microsoft)" <[email protected]>
When
CONFIG_DEFERRED_STRUCT_PAGE_INITis 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) <[email protected]>
Signature · 2 lines
Wei Yang Help you, Help me