lkml.org 
[lkml]   [2021]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH v5 3/5] mm: simplify parater of function memmap_init_zone()
    From
    Date
    On 22.01.21 14:59, 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@redhat.com>
    > Signed-off-by: Baoquan He <bhe@redhat.com>
    > ---
    > arch/ia64/mm/init.c | 12 +++++++-----
    > include/linux/mm.h | 3 +--
    > mm/page_alloc.c | 24 +++++++++++-------------
    > 3 files changed, 19 insertions(+), 20 deletions(-)
    >
    > 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/include/linux/mm.h b/include/linux/mm.h
    > index 2395dc212221..073049bd0b29 100644
    > --- a/include/linux/mm.h
    > +++ b/include/linux/mm.h
    > @@ -2401,8 +2401,7 @@ extern void set_dma_reserve(unsigned long new_dma_reserve);
    > extern void memmap_init_range(unsigned long, int, unsigned long,
    > unsigned long, unsigned long, enum meminit_context,
    > struct vmem_altmap *, int migratetype);
    > -extern void memmap_init_zone(unsigned long size, int nid,
    > - unsigned long zone, unsigned long range_start_pfn);
    > +extern void memmap_init_zone(struct zone *zone);
    > extern void setup_per_zone_wmarks(void);
    > extern int __meminit init_per_zone_wmark_min(void);
    > extern void mem_init(void);
    > 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@redhat.com>

    --
    Thanks,

    David / dhildenb

    \
     
     \ /
      Last update: 2021-01-22 16:42    [W:3.246 / U:1.972 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site