mm: clean up names and parameters of memmap_init_xxxx functions
Subsystems (4)
v3 cover mm: clean up names and parameters of memmap_init_xxxx functions
This patchset is correcting inappropriate function names of memmap_init_xxx, and simplify parameters of functions in the code flow when I tried to fix a regression bug in memmap defer init. These are taken from the v2 patchset, the bug fixing patch has bee sent alone and merged. So send the rest as v3.
No any change comparing with v2, except of adding Mike's 'Reviewed-by' tag.
V2 post is here:
https://lore.kernel.org/linux-mm/[email protected]/
Baoquan He (4):
mm: rename memmap_init() and memmap_init_zone()
mm: simplify parater of function memmap_init_zone()
mm: simplify parameter of setup_usemap()
mm: remove unneeded local variable in free_area_init_core
arch/ia64/include/asm/pgtable.h | 3 +- arch/ia64/mm/init.c | 14 +++++---- include/linux/mm.h | 2 +- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 54 +++++++++++++++------------------ 5 files changed, 36 insertions(+), 39 deletions(-)
Signature · 1 line
2.17.2
PATCH v3 1/4 mm: rename memmap_init() and memmap_init_zone()
The current memmap_init_zone() only handles memory region inside one zone, actually memmap_init() does the memmap init of one zone. So rename both of them accordingly.
And also rename the function parameter 'range_start_pfn' and local variable 'range_end_pfn' of memmap_init() to zone_start_pfn/zone_end_pfn.
--- arch/ia64/include/asm/pgtable.h | 2 +- arch/ia64/mm/init.c | 6 +++--- include/linux/mm.h | 2 +- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 24 ++++++++++++------------ 5 files changed, 18 insertions(+), 18 deletions(-)
arch/ia64/include/asm/pgtable.h +1 -1
@@ -520,7 +520,7 @@ extern struct page *zero_page_memmap_ptr;# ifdef CONFIG_VIRTUAL_MEM_MAP /* arch mem_map init routine is needed due to holes in a virtual mem_map */ -extern void memmap_init (unsigned long size,int nid,unsigned long zone, +extern void memmap_init_zone (unsigned long size,int nid,unsigned long zone,unsigned long start_pfn);# endif /* CONFIG_VIRTUAL_MEM_MAP */ # endif /* !__ASSEMBLY__ */
arch/ia64/mm/init.c +3 -3
@@ -535,18 +535,18 @@ virtual_memmap_init(u64 start, u64 end, void *arg) / sizeof(struct page));if (map_start < map_end) -memmap_init_zone ((unsigned long )(map_end - map_start), +memmap_init_range ((unsigned long )(map_end - map_start), args->nid, args->zone,page_to_pfn (map_start),page_to_pfn (map_end),MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE );return 0 ; }void __meminit -memmap_init (unsigned long size,int nid,unsigned long zone, +memmap_init_zone (unsigned long size,int nid,unsigned long zone,unsigned long start_pfn) {if (!vmem_map) { -memmap_init_zone (size, nid, zone, start_pfn, start_pfn + size, +memmap_init_range (size, nid, zone, start_pfn, start_pfn + size,MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE ); }else {struct page *start;
include/linux/mm.h +1 -1
@@ -2439,7 +2439,7 @@ extern int __meminit early_pfn_to_nid(unsigned long pfn);#endif extern void set_dma_reserve (unsigned long new_dma_reserve); -extern void memmap_init_zone (unsigned long ,int ,unsigned long , +extern void memmap_init_range (unsigned long ,int ,unsigned long ,unsigned long ,unsigned long ,enum meminit_context ,struct vmem_altmap *,int migratetype);extern void setup_per_zone_wmarks (void );
mm/memory_hotplug.c +1 -1
@@ -713,7 +713,7 @@ void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,* expects the zone spans the pfn range. All the pages in the range * are reserved so nobody should be touching them so we should be safe */ -memmap_init_zone (nr_pages, nid,zone_idx (zone), start_pfn,0 , +memmap_init_range (nr_pages, nid,zone_idx (zone), start_pfn,0 ,MEMINIT_HOTPLUG , altmap, migratetype);set_zone_contiguous (zone);
mm/page_alloc.c +12 -12
@@ -6117,7 +6117,7 @@ overlap_memmap_init(unsigned long zone, unsigned long *pfn)* (usually MIGRATE_MOVABLE). Besides setting the migratetype, no related * zone stats (e.g., nr_isolate_pageblock) are touched. */ -void __meminit memmap_init_zone (unsigned long size,int nid,unsigned long zone, +void __meminit memmap_init_range (unsigned long size,int nid,unsigned long zone,unsigned long start_pfn,unsigned long zone_end_pfn,enum meminit_context context,struct vmem_altmap *altmap,int migratetype)
@@ -6292,24 +6292,24 @@ static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, }#endif -void __init __weak memmap_init (unsigned long size,int nid, +void __init __weak memmap_init_zone (unsigned long size,int nid,unsigned long zone, -unsigned long range_start_pfn) +unsigned long zone_start_pfn) {unsigned long start_pfn, end_pfn, hole_start_pfn =0 ; -unsigned long range_end_pfn = range_start_pfn + size; +unsigned long zone_end_pfn = zone_start_pfn + size;u64 pgcnt =0 ;int i;for_each_mem_pfn_range (i, nid, &start_pfn, &end_pfn,NULL ) { - start_pfn =clamp (start_pfn, range_start_pfn, range_end_pfn); - end_pfn =clamp (end_pfn, range_start_pfn, range_end_pfn); - hole_start_pfn =clamp (hole_start_pfn, range_start_pfn, - range_end_pfn); + start_pfn =clamp (start_pfn, zone_start_pfn, zone_end_pfn); + end_pfn =clamp (end_pfn, zone_start_pfn, zone_end_pfn); + hole_start_pfn =clamp (hole_start_pfn, zone_start_pfn, + zone_end_pfn);if (end_pfn > start_pfn) { size = end_pfn - start_pfn; -memmap_init_zone (size, nid, zone, start_pfn, range_end_pfn, +memmap_init_range (size, nid, zone, start_pfn, zone_end_pfn,MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE ); }
@@ -6326,8 +6326,8 @@ void __init __weak memmap_init(unsigned long size, int nid,* considered initialized. Make sure that memmap has a well defined * state. */ -if (hole_start_pfn < range_end_pfn) - pgcnt +=init_unavailable_range (hole_start_pfn, range_end_pfn, +if (hole_start_pfn < zone_end_pfn) + pgcnt +=init_unavailable_range (hole_start_pfn, zone_end_pfn, zone, nid);if (pgcnt)
@@ -7039,7 +7039,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)set_pageblock_order ();setup_usemap (pgdat, zone, zone_start_pfn, size);init_currently_empty_zone (zone, zone_start_pfn, size); -memmap_init (size, nid, j, zone_start_pfn); +memmap_init_zone (size, nid, j, zone_start_pfn); } }
Signature · 1 line
2.17.2
Re: [PATCH v3 1/4] mm: rename memmap_init() and memmap_init_zone()
Quoted 141 lines · Baoquan He
The current
memmap_init_zone()only handles memory region inside one zone, actuallymemmap_init()does the memmap init of one zone. So rename both of them accordingly.And also rename the function parameter '
range_start_pfn' and local variable 'range_end_pfn' ofmemmap_init()to zone_start_pfn/zone_end_pfn.Signed-off-by Baoquan He <[email protected]>Reviewed-by Mike Rapoport <[email protected]>--- arch/ia64/include/asm/pgtable.h | 2 +- arch/ia64/mm/init.c | 6 +++--- include/linux/mm.h | 2 +- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 24 ++++++++++++------------ 5 files changed, 18 insertions(+), 18 deletions(-)arch/ia64/include/asm/pgtable.h +1
-1@@ -520,7 +520,7 @@ extern struct page *zero_page_memmap_ptr;# ifdef CONFIG_VIRTUAL_MEM_MAP /* arch mem_map init routine is needed due to holes in a virtual mem_map */ -extern void memmap_init (unsigned long size,int nid,unsigned long zone, +extern void memmap_init_zone (unsigned long size,int nid,unsigned long zone,unsigned long start_pfn);# endif /* CONFIG_VIRTUAL_MEM_MAP */ # endif /* !__ASSEMBLY__ */ arch/ia64/mm/init.c +3
-3@@ -535,18 +535,18 @@ virtual_memmap_init(u64 start, u64 end, void *arg) / sizeof(struct page));if (map_start < map_end) -memmap_init_zone ((unsigned long )(map_end - map_start), +memmap_init_range ((unsigned long )(map_end - map_start), args->nid, args->zone,page_to_pfn (map_start),page_to_pfn (map_end),MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE );return 0 ; }void __meminit -memmap_init (unsigned long size,int nid,unsigned long zone, +memmap_init_zone (unsigned long size,int nid,unsigned long zone,unsigned long start_pfn) {if (!vmem_map) { -memmap_init_zone (size, nid, zone, start_pfn, start_pfn + size, +memmap_init_range (size, nid, zone, start_pfn, start_pfn + size,MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE ); }else {struct page *start;include/linux/mm.h +1
-1@@ -2439,7 +2439,7 @@ extern int __meminit early_pfn_to_nid(unsigned long pfn);#endif extern void set_dma_reserve (unsigned long new_dma_reserve); -extern void memmap_init_zone (unsigned long ,int ,unsigned long , +extern void memmap_init_range (unsigned long ,int ,unsigned long ,unsigned long ,unsigned long ,enum meminit_context ,struct vmem_altmap *,int migratetype);extern void setup_per_zone_wmarks (void );mm/memory_hotplug.c +1
-1@@ -713,7 +713,7 @@ void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,* expects the zone spans the pfn range. All the pages in the range * are reserved so nobody should be touching them so we should be safe */ -memmap_init_zone (nr_pages, nid,zone_idx (zone), start_pfn,0 , +memmap_init_range (nr_pages, nid,zone_idx (zone), start_pfn,0 ,MEMINIT_HOTPLUG , altmap, migratetype);set_zone_contiguous (zone);mm/page_alloc.c +11
-11@@ -6117,7 +6117,7 @@ overlap_memmap_init(unsigned long zone, unsigned long *pfn)* (usually MIGRATE_MOVABLE). Besides setting the migratetype, no related * zone stats (e.g., nr_isolate_pageblock) are touched. */ -void __meminit memmap_init_zone (unsigned long size,int nid,unsigned long zone, +void __meminit memmap_init_range (unsigned long size,int nid,unsigned long zone,unsigned long start_pfn,unsigned long zone_end_pfn,enum meminit_context context,struct vmem_altmap *altmap,int migratetype)@@ -6292,24 +6292,24 @@ static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, }#endif -void __init __weak memmap_init (unsigned long size,int nid, +void __init __weak memmap_init_zone (unsigned long size,int nid,unsigned long zone, -unsigned long range_start_pfn) +unsigned long zone_start_pfn) {unsigned long start_pfn, end_pfn, hole_start_pfn =0 ; -unsigned long range_end_pfn = range_start_pfn + size; +unsigned long zone_end_pfn = zone_start_pfn + size;u64 pgcnt =0 ;int i;for_each_mem_pfn_range (i, nid, &start_pfn, &end_pfn,NULL ) { - start_pfn =clamp (start_pfn, range_start_pfn, range_end_pfn); - end_pfn =clamp (end_pfn, range_start_pfn, range_end_pfn); - hole_start_pfn =clamp (hole_start_pfn, range_start_pfn, - range_end_pfn); + start_pfn =clamp (start_pfn, zone_start_pfn, zone_end_pfn); + end_pfn =clamp (end_pfn, zone_start_pfn, zone_end_pfn); + hole_start_pfn =clamp (hole_start_pfn, zone_start_pfn, + zone_end_pfn);if (end_pfn > start_pfn) { size = end_pfn - start_pfn; -memmap_init_zone (size, nid, zone, start_pfn, range_end_pfn, +memmap_init_range (size, nid, zone, start_pfn, zone_end_pfn,MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE ); }@@ -6326,8 +6326,8 @@ void __init __weak memmap_init(unsigned long size, int nid,* considered initialized. Make sure that memmap has a well defined * state. */ -if (hole_start_pfn < range_end_pfn) - pgcnt +=init_unavailable_range (hole_start_pfn, range_end_pfn, +if (hole_start_pfn < zone_end_pfn) + pgcnt +=init_unavailable_range (hole_start_pfn, zone_end_pfn, zone, nid);if (pgcnt)
mm/page_alloc.c static void __init free_area_init_core(struct pglist_data *pgdat) · line 7045
Quoted 8 lines
mm/page_alloc.c +1
-1@@ -7039,7 +7039,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)set_pageblock_order ();setup_usemap (pgdat, zone, zone_start_pfn, size);init_currently_empty_zone (zone, zone_start_pfn, size); -memmap_init (size, nid, j, zone_start_pfn); +memmap_init_zone (size, nid, j, zone_start_pfn); } }
I would have factored-out renaming the variables or squashed that part into patch #2.
LGTM
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v3 1/4] mm: rename memmap_init() and memmap_init_zone()
Quoted 139 lines · David Hildenbrand
Quoted 138 lines · Baoquan He
The current
memmap_init_zone()only handles memory region inside one zone, actuallymemmap_init()does the memmap init of one zone. So rename both of them accordingly.And also rename the function parameter '
range_start_pfn' and local variable 'range_end_pfn' ofmemmap_init()to zone_start_pfn/zone_end_pfn.Signed-off-by Baoquan He <[email protected]>Reviewed-by Mike Rapoport <[email protected]>--- arch/ia64/include/asm/pgtable.h | 2 +- arch/ia64/mm/init.c | 6 +++--- include/linux/mm.h | 2 +- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 24 ++++++++++++------------ 5 files changed, 18 insertions(+), 18 deletions(-)arch/ia64/include/asm/pgtable.h +1
-1@@ -520,7 +520,7 @@ extern struct page *zero_page_memmap_ptr;# ifdef CONFIG_VIRTUAL_MEM_MAP /* arch mem_map init routine is needed due to holes in a virtual mem_map */ -extern void memmap_init (unsigned long size,int nid,unsigned long zone, +extern void memmap_init_zone (unsigned long size,int nid,unsigned long zone,unsigned long start_pfn);# endif /* CONFIG_VIRTUAL_MEM_MAP */ # endif /* !__ASSEMBLY__ */ arch/ia64/mm/init.c +3
-3@@ -535,18 +535,18 @@ virtual_memmap_init(u64 start, u64 end, void *arg) / sizeof(struct page));if (map_start < map_end) -memmap_init_zone ((unsigned long )(map_end - map_start), +memmap_init_range ((unsigned long )(map_end - map_start), args->nid, args->zone,page_to_pfn (map_start),page_to_pfn (map_end),MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE );return 0 ; }void __meminit -memmap_init (unsigned long size,int nid,unsigned long zone, +memmap_init_zone (unsigned long size,int nid,unsigned long zone,unsigned long start_pfn) {if (!vmem_map) { -memmap_init_zone (size, nid, zone, start_pfn, start_pfn + size, +memmap_init_range (size, nid, zone, start_pfn, start_pfn + size,MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE ); }else {struct page *start;include/linux/mm.h +1
-1@@ -2439,7 +2439,7 @@ extern int __meminit early_pfn_to_nid(unsigned long pfn);#endif extern void set_dma_reserve (unsigned long new_dma_reserve); -extern void memmap_init_zone (unsigned long ,int ,unsigned long , +extern void memmap_init_range (unsigned long ,int ,unsigned long ,unsigned long ,unsigned long ,enum meminit_context ,struct vmem_altmap *,int migratetype);extern void setup_per_zone_wmarks (void );mm/memory_hotplug.c +1
-1@@ -713,7 +713,7 @@ void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,* expects the zone spans the pfn range. All the pages in the range * are reserved so nobody should be touching them so we should be safe */ -memmap_init_zone (nr_pages, nid,zone_idx (zone), start_pfn,0 , +memmap_init_range (nr_pages, nid,zone_idx (zone), start_pfn,0 ,MEMINIT_HOTPLUG , altmap, migratetype);set_zone_contiguous (zone);mm/page_alloc.c +11
-11@@ -6117,7 +6117,7 @@ overlap_memmap_init(unsigned long zone, unsigned long *pfn)* (usually MIGRATE_MOVABLE). Besides setting the migratetype, no related * zone stats (e.g., nr_isolate_pageblock) are touched. */ -void __meminit memmap_init_zone (unsigned long size,int nid,unsigned long zone, +void __meminit memmap_init_range (unsigned long size,int nid,unsigned long zone,unsigned long start_pfn,unsigned long zone_end_pfn,enum meminit_context context,struct vmem_altmap *altmap,int migratetype)@@ -6292,24 +6292,24 @@ static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, }#endif -void __init __weak memmap_init (unsigned long size,int nid, +void __init __weak memmap_init_zone (unsigned long size,int nid,unsigned long zone, -unsigned long range_start_pfn) +unsigned long zone_start_pfn) {unsigned long start_pfn, end_pfn, hole_start_pfn =0 ; -unsigned long range_end_pfn = range_start_pfn + size; +unsigned long zone_end_pfn = zone_start_pfn + size;u64 pgcnt =0 ;int i;for_each_mem_pfn_range (i, nid, &start_pfn, &end_pfn,NULL ) { - start_pfn =clamp (start_pfn, range_start_pfn, range_end_pfn); - end_pfn =clamp (end_pfn, range_start_pfn, range_end_pfn); - hole_start_pfn =clamp (hole_start_pfn, range_start_pfn, - range_end_pfn); + start_pfn =clamp (start_pfn, zone_start_pfn, zone_end_pfn); + end_pfn =clamp (end_pfn, zone_start_pfn, zone_end_pfn); + hole_start_pfn =clamp (hole_start_pfn, zone_start_pfn, + zone_end_pfn);if (end_pfn > start_pfn) { size = end_pfn - start_pfn; -memmap_init_zone (size, nid, zone, start_pfn, range_end_pfn, +memmap_init_range (size, nid, zone, start_pfn, zone_end_pfn,MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE ); }@@ -6326,8 +6326,8 @@ void __init __weak memmap_init(unsigned long size, int nid,* considered initialized. Make sure that memmap has a well defined * state. */ -if (hole_start_pfn < range_end_pfn) - pgcnt +=init_unavailable_range (hole_start_pfn, range_end_pfn, +if (hole_start_pfn < zone_end_pfn) + pgcnt +=init_unavailable_range (hole_start_pfn, zone_end_pfn, zone, nid);
Quoted 14 lines
mm/page_alloc.c static void __init free_area_init_core(struct pglist_data *pgdat) · line 7045
Quoted 11 lines
mm/page_alloc.c +1
-1if (pgcnt)@@ -7039,7 +7039,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)set_pageblock_order ();setup_usemap (pgdat, zone, zone_start_pfn, size);init_currently_empty_zone (zone, zone_start_pfn, size); -memmap_init (size, nid, j, zone_start_pfn); +memmap_init_zone (size, nid, j, zone_start_pfn); } }I would have factored-out renaming the variables or squashed that part into patch #2.
Thanks for your careful reviewing. I will consider grab that part to a patch or squash into patch 2 as you suggested when repost.
Thanks
Baoquan
PATCH v3 2/4 mm: simplify parater of function memmap_init_zone()
In reply to Baoquan HeAs David suggested, simply passing 'struct zone *zone' is enough. We can get all needed information from 'struct zone*' easily.
--- arch/ia64/include/asm/pgtable.h | 3 +-- arch/ia64/mm/init.c | 12 +++++++----- mm/page_alloc.c | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 17 deletions(-)
arch/ia64/include/asm/pgtable.h +1 -2
@@ -520,8 +520,7 @@ extern struct page *zero_page_memmap_ptr;# ifdef CONFIG_VIRTUAL_MEM_MAP /* arch mem_map init routine is needed due to holes in a virtual mem_map */ -extern void memmap_init_zone (unsigned long size,int nid,unsigned long zone, -unsigned long start_pfn); +extern void memmap_init_zone (struct zone *zone);# endif /* CONFIG_VIRTUAL_MEM_MAP */ # endif /* !__ASSEMBLY__ */
arch/ia64/mm/init.c +7 -5
@@ -541,12 +541,14 @@ virtual_memmap_init(u64 start, u64 end, void *arg)return 0 ; } -void __meminit -memmap_init_zone (unsigned long size,int nid,unsigned long zone, -unsigned long start_pfn) +void __meminit memmap_init_zone (struct zone *zone) { +unsigned long size = zone->spanned_pages; +int nid =zone_to_nid (zone), zone_id =zone_idx (zone); +unsigned long start_pfn = zone->zone_start_pfn; +if (!vmem_map) { -memmap_init_range (size, nid, zone, start_pfn, start_pfn + size, +memmap_init_range (size, nid, zone_id, start_pfn, start_pfn + size,MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE ); }else {struct page *start;
@@ -556,7 +558,7 @@ memmap_init_zone(unsigned long size, int nid, unsigned long zone, args.start = start; args.end = start + size; args.nid = nid; - args.zone = zone; + args.zone = zone_id;efi_memmap_walk (virtual_memmap_init, &args); }
mm/page_alloc.c +10 -10
@@ -6292,16 +6292,16 @@ static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, }#endif -void __init __weak memmap_init_zone (unsigned long size,int nid, -unsigned long zone, -unsigned long zone_start_pfn) +void __init __weak memmap_init_zone (struct zone *zone) {unsigned long start_pfn, end_pfn, hole_start_pfn =0 ; -unsigned long zone_end_pfn = zone_start_pfn + size; +int i, nid =zone_to_nid (zone), zone_id =zone_idx (zone); +unsigned long zone_start_pfn = zone->zone_start_pfn; +unsigned long zone_end_pfn = zone_start_pfn + zone->spanned_pages;u64 pgcnt =0 ; -int i;for_each_mem_pfn_range (i, nid, &start_pfn, &end_pfn,NULL ) { +unsigned long size; start_pfn =clamp (start_pfn, zone_start_pfn, zone_end_pfn); end_pfn =clamp (end_pfn, zone_start_pfn, zone_end_pfn); hole_start_pfn = clamp(hole_start_pfn, zone_start_pfn,
@@ -6309,13 +6309,13 @@ void __init __weak memmap_init_zone(unsigned long size, int nid,if (end_pfn > start_pfn) { size = end_pfn - start_pfn; -memmap_init_range (size, nid, zone, start_pfn, zone_end_pfn, +memmap_init_range (size, nid, zone_id, start_pfn, zone_end_pfn,MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE ); }if (hole_start_pfn < start_pfn) pgcnt +=init_unavailable_range (hole_start_pfn, - start_pfn, zone, nid); + start_pfn, zone_id, nid); hole_start_pfn = end_pfn; }
@@ -6328,11 +6328,11 @@ void __init __weak memmap_init_zone(unsigned long size, int nid,*/ if (hole_start_pfn < zone_end_pfn) pgcnt +=init_unavailable_range (hole_start_pfn, zone_end_pfn, - zone, nid); + zone_id, nid);if (pgcnt)pr_info ("%s: Zeroed struct page in unavailable ranges: %lld\n" , - zone_names[zone], pgcnt); + zone_names[zone_id], pgcnt); }static int zone_batchsize (struct zone *zone)
@@ -7039,7 +7039,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)set_pageblock_order ();setup_usemap (pgdat, zone, zone_start_pfn, size);init_currently_empty_zone (zone, zone_start_pfn, size); -memmap_init_zone (size, nid, j, zone_start_pfn); +memmap_init_zone (zone); } }
Signature · 1 line
2.17.2
Re: [PATCH v3 2/4] mm: simplify parater of function memmap_init_zone()
[...]
arch/ia64/mm/init.c virtual_memmap_init(u64 start, u64 end, void *arg) · line 549
Quoted 9 lines
arch/ia64/mm/init.c +5
-3-void __meminit -memmap_init_zone (unsigned long size,int nid,unsigned long zone, -unsigned long start_pfn) +void __meminit memmap_init_zone (struct zone *zone) { +unsigned long size = zone->spanned_pages; +int nid =zone_to_nid (zone), zone_id =zone_idx (zone); +unsigned long start_pfn = zone->zone_start_pfn; +
Nit: reverse Christmas tree.
Quoted 23 lines
arch/ia64/mm/init.c +2
-2if (!vmem_map) { -memmap_init_range (size, nid, zone, start_pfn, start_pfn + size, +memmap_init_range (size, nid, zone_id, start_pfn, start_pfn + size,MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE ); }else {struct page *start;@@ -556,7 +558,7 @@ memmap_init_zone(unsigned long size, int nid, unsigned long zone, args.start = start; args.end = start + size; args.nid = nid; - args.zone = zone; + args.zone = zone_id;efi_memmap_walk (virtual_memmap_init, &args); }mm/page_alloc.c +0
-0@@ -6292,16 +6292,16 @@ static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, }#endif
mm/page_alloc.c static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, · line 6300
Quoted 10 lines
mm/page_alloc.c +4
-4-void __init __weak memmap_init_zone (unsigned long size,int nid, -unsigned long zone, -unsigned long zone_start_pfn) +void __init __weak memmap_init_zone (struct zone *zone) {unsigned long start_pfn, end_pfn, hole_start_pfn =0 ; -unsigned long zone_end_pfn = zone_start_pfn + size; +int i, nid =zone_to_nid (zone), zone_id =zone_idx (zone); +unsigned long zone_start_pfn = zone->zone_start_pfn; +unsigned long zone_end_pfn = zone_start_pfn + zone->spanned_pages;
dito.
mm/page_alloc.c static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, · line 6304
Quoted 5 lines
mm/page_alloc.c +1
-1u64 pgcnt =0 ; -int i;for_each_mem_pfn_range (i, nid, &start_pfn, &end_pfn,NULL ) { +unsigned long size;
You can just get rid of this parameter IMHO.
(Also, there is an empty line missing right now)
Apart from that LGTM
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v3 2/4] mm: simplify parater of function memmap_init_zone()
Quoted 13 lines · David Hildenbrand
[...]
arch/ia64/mm/init.c virtual_memmap_init(u64 start, u64 end, void *arg) · line 549
Quoted 9 lines
arch/ia64/mm/init.c +5
-3-void __meminit -memmap_init_zone (unsigned long size,int nid,unsigned long zone, -unsigned long start_pfn) +void __meminit memmap_init_zone (struct zone *zone) { +unsigned long size = zone->spanned_pages; +int nid =zone_to_nid (zone), zone_id =zone_idx (zone); +unsigned long start_pfn = zone->zone_start_pfn; +Nit: reverse Christmas tree.
Ah, yes, I will reorder these lines.
Quoted 24 lines
Quoted 24 lines
arch/ia64/mm/init.c +2
-2if (!vmem_map) { -memmap_init_range (size, nid, zone, start_pfn, start_pfn + size, +memmap_init_range (size, nid, zone_id, start_pfn, start_pfn + size,MEMINIT_EARLY ,NULL ,MIGRATE_MOVABLE ); }else {struct page *start;@@ -556,7 +558,7 @@ memmap_init_zone(unsigned long size, int nid, unsigned long zone, args.start = start; args.end = start + size; args.nid = nid; - args.zone = zone; + args.zone = zone_id;efi_memmap_walk (virtual_memmap_init, &args); }mm/page_alloc.c +0
-0@@ -6292,16 +6292,16 @@ static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, }#endif
Quoted 12 lines
mm/page_alloc.c static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, · line 6300
Quoted 10 lines
mm/page_alloc.c +4
-4-void __init __weak memmap_init_zone (unsigned long size,int nid, -unsigned long zone, -unsigned long zone_start_pfn) +void __init __weak memmap_init_zone (struct zone *zone) {unsigned long start_pfn, end_pfn, hole_start_pfn =0 ; -unsigned long zone_end_pfn = zone_start_pfn + size; +int i, nid =zone_to_nid (zone), zone_id =zone_idx (zone); +unsigned long zone_start_pfn = zone->zone_start_pfn; +unsigned long zone_end_pfn = zone_start_pfn + zone->spanned_pages;dito.
OK.
Quoted 8 lines
mm/page_alloc.c static inline u64 init_unavailable_range(unsigned long spfn, unsigned long epfn, · line 6304
Quoted 6 lines
mm/page_alloc.c +1
-1u64 pgcnt =0 ; -int i;for_each_mem_pfn_range (i, nid, &start_pfn, &end_pfn,NULL ) { +unsigned long size;You can just get rid of this parameter IMHO.
Someone possibly like a intermediate local variable better in this case, but I am fine to both, will change as you suggested.
Quoted 2 lines
(Also, there is an empty line missing right now)
Sure. Thanks.
Quoted 8 lines
Apart from that LGTM
Signature · 3 lines
Thanks, David / dhildenb
PATCH v3 3/4 mm: simplify parameter of setup_usemap()
In reply to Baoquan HeParameter 'zone' has got needed information, let's remove other unnecessary parameters.
--- mm/page_alloc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
mm/page_alloc.c +7 -10
@@ -6824,25 +6824,22 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned l return usemapsize / 8; } -static void __ref setup_usemap (struct pglist_data *pgdat, -struct zone *zone, -unsigned long zone_start_pfn, -unsigned long zonesize) +static void __ref setup_usemap (struct zone *zone) { -unsigned long usemapsize =usemap_size (zone_start_pfn, zonesize); +unsigned long usemapsize =usemap_size (zone->zone_start_pfn, + zone->spanned_pages); zone->pageblock_flags =NULL ;if (usemapsize) { zone->pageblock_flags =memblock_alloc_node (usemapsize,SMP_CACHE_BYTES , - pgdat->node_id); +zone_to_nid (zone));if (!zone->pageblock_flags)panic ("Failed to allocate %ld bytes for zone %s pageblock flags on node %d\n" , - usemapsize, zone->name, pgdat->node_id); + usemapsize, zone->name,zone_to_nid (zone)); } }#else -static inline void setup_usemap (struct pglist_data *pgdat,struct zone *zone, -unsigned long zone_start_pfn,unsigned long zonesize) {} +static inline void setup_usemap (struct zone *zone) {}#endif /* CONFIG_SPARSEMEM */ #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
@@ -7037,7 +7034,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)continue ;set_pageblock_order (); -setup_usemap (pgdat, zone, zone_start_pfn, size); +setup_usemap (zone);init_currently_empty_zone (zone, zone_start_pfn, size);memmap_init_zone (zone); }
Signature · 1 line
2.17.2
Re: [PATCH v3 3/4] mm: simplify parameter of setup_usemap()
Quoted 47 lines · Baoquan He
Parameter 'zone' has got needed information, let's remove other unnecessary parameters.
Signed-off-by Baoquan He <[email protected]>Reviewed-by Mike Rapoport <[email protected]>--- mm/page_alloc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)mm/page_alloc.c +6
-9@@ -6824,25 +6824,22 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned l return usemapsize / 8; } -static void __ref setup_usemap (struct pglist_data *pgdat, -struct zone *zone, -unsigned long zone_start_pfn, -unsigned long zonesize) +static void __ref setup_usemap (struct zone *zone) { -unsigned long usemapsize =usemap_size (zone_start_pfn, zonesize); +unsigned long usemapsize =usemap_size (zone->zone_start_pfn, + zone->spanned_pages); zone->pageblock_flags =NULL ;if (usemapsize) { zone->pageblock_flags =memblock_alloc_node (usemapsize,SMP_CACHE_BYTES , - pgdat->node_id); +zone_to_nid (zone));if (!zone->pageblock_flags)panic ("Failed to allocate %ld bytes for zone %s pageblock flags on node %d\n" , - usemapsize, zone->name, pgdat->node_id); + usemapsize, zone->name,zone_to_nid (zone)); } }#else -static inline void setup_usemap (struct pglist_data *pgdat,struct zone *zone, -unsigned long zone_start_pfn,unsigned long zonesize) {} +static inline void setup_usemap (struct zone *zone) {}#endif /* CONFIG_SPARSEMEM */ #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
mm/page_alloc.c static void __init free_area_init_core(struct pglist_data *pgdat) · line 7040
Quoted 8 lines
mm/page_alloc.c +1
-1@@ -7037,7 +7034,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)continue ;set_pageblock_order (); -setup_usemap (pgdat, zone, zone_start_pfn, size); +setup_usemap (zone);init_currently_empty_zone (zone, zone_start_pfn, size);memmap_init_zone (zone); }
Signature · 3 lines
Thanks, David / dhildenb
PATCH v3 4/4 mm: remove unneeded local variable in free_area_init_core
In reply to Baoquan HeLocal variable 'zone_start_pfn' is not needed since there's only one call site in free_area_init_core(). Let's remove it and pass zone->zone_start_pfn directly to init_currently_empty_zone().
--- mm/page_alloc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
mm/page_alloc.c +1 -2
@@ -6986,7 +6986,6 @@ static void __init free_area_init_core(struct pglist_data *pgdat)for (j =0 ; j <MAX_NR_ZONES ; j++) {struct zone *zone = pgdat->node_zones + j;unsigned long size, freesize, memmap_pages; -unsigned long zone_start_pfn = zone->zone_start_pfn; size = zone->spanned_pages; freesize = zone->present_pages;
@@ -7035,7 +7034,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)set_pageblock_order ();setup_usemap (zone); -init_currently_empty_zone (zone, zone_start_pfn, size); +init_currently_empty_zone (zone, zone->zone_start_pfn, size);memmap_init_zone (zone); } }
Signature · 1 line
2.17.2
Re: [PATCH v3 4/4] mm: remove unneeded local variable in free_area_init_core
Quoted 24 lines · Baoquan He
Local variable '
zone_start_pfn' is not needed since there's only one call site infree_area_init_core(). Let's remove it and passzone->zone_start_pfndirectly toinit_currently_empty_zone().Signed-off-by Baoquan He <[email protected]>Reviewed-by Mike Rapoport <[email protected]>--- mm/page_alloc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)mm/page_alloc.c +0
-1@@ -6986,7 +6986,6 @@ static void __init free_area_init_core(struct pglist_data *pgdat)for (j =0 ; j <MAX_NR_ZONES ; j++) {struct zone *zone = pgdat->node_zones + j;unsigned long size, freesize, memmap_pages; -unsigned long zone_start_pfn = zone->zone_start_pfn; size = zone->spanned_pages; freesize = zone->present_pages;
mm/page_alloc.c static void __init free_area_init_core(struct pglist_data *pgdat) · line 7040
Quoted 8 lines
mm/page_alloc.c +1
-1@@ -7035,7 +7034,7 @@ static void __init free_area_init_core(struct pglist_data *pgdat)set_pageblock_order ();setup_usemap (zone); -init_currently_empty_zone (zone, zone_start_pfn, size); +init_currently_empty_zone (zone, zone->zone_start_pfn, size);memmap_init_zone (zone); } }
Signature · 3 lines
Thanks, David / dhildenb