On 20.01.21 05:52, Baoquan He wrote:
> As David suggested, simply passing 'struct zone *zone' is enough. We can
> get all needed information from 'struct zone*' easily.
>
> Suggested-by: David Hildenbrand <david@xxxxxxxxxx>
> Signed-off-by: Baoquan He <bhe@xxxxxxxxxx>
> ---
> arch/ia64/include/asm/pgtable.h | 3 +--
> arch/ia64/mm/init.c | 12 +++++++-----
> mm/page_alloc.c | 24 +++++++++++-------------
> 3 files changed, 19 insertions(+), 20 deletions(-)
>
> diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
> index dce2ff37df65..2c81394a2430 100644
> --- a/arch/ia64/include/asm/pgtable.h
> +++ b/arch/ia64/include/asm/pgtable.h
> @@ -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__ */
>
> diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
> index c8e68e92beb3..88fb44895408 100644
> --- a/arch/ia64/mm/init.c
> +++ b/arch/ia64/mm/init.c
> @@ -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)
> {
> + int nid = zone_to_nid(zone), zone_id = zone_idx(zone);
> + unsigned long start_pfn = zone->zone_start_pfn;
> + unsigned long size = zone->spanned_pages;
> +
> 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);
> }
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index 42a1d2d2a87d..cbb67d9c1b2a 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -6254,23 +6254,21 @@ static void __meminit zone_init_free_lists(struct zone *zone)
> }
> }
>
> -void __meminit __weak memmap_init_zone(unsigned long size, int nid,
> - unsigned long zone,
> - unsigned long range_start_pfn)
> +void __meminit __weak memmap_init_zone(struct zone *zone)
> {
> + unsigned long zone_start_pfn = zone->zone_start_pfn;
> + unsigned long zone_end_pfn = zone_start_pfn + zone->spanned_pages;
> + int i, nid = zone_to_nid(zone), zone_id = zone_idx(zone);
> unsigned long start_pfn, end_pfn;
> - unsigned long range_end_pfn = range_start_pfn + size;
> - 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);
> + start_pfn = clamp(start_pfn, zone_start_pfn, zone_end_pfn);
> + end_pfn = clamp(end_pfn, zone_start_pfn, zone_end_pfn);
>
> - if (end_pfn > start_pfn) {
> - size = end_pfn - start_pfn;
> - memmap_init_range(size, nid, zone, start_pfn, range_end_pfn,
> - MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);
> - }
> + if (end_pfn > start_pfn)
> + memmap_init_range(end_pfn - start_pfn, nid,
> + zone_id, start_pfn, zone_end_pfn,
> + MEMINIT_EARLY, NULL, MIGRATE_MOVABLE);
> }
> }
>
> @@ -6978,7 +6976,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);
> }
> }
>
>
Reviewed-by: David Hildenbrand <david@xxxxxxxxxx>
--
Thanks,
David / dhildenb
