From patchwork Tue Jan 5 07:47:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 11998279 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0587FC433E0 for ; Tue, 5 Jan 2021 07:47:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7415B21973 for ; Tue, 5 Jan 2021 07:47:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7415B21973 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0CE9B8D005F; Tue, 5 Jan 2021 02:47:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 07F7B8D0036; Tue, 5 Jan 2021 02:47:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB0528D005F; Tue, 5 Jan 2021 02:47:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0162.hostedemail.com [216.40.44.162]) by kanga.kvack.org (Postfix) with ESMTP id D2CB48D0036 for ; Tue, 5 Jan 2021 02:47:25 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 929633629 for ; Tue, 5 Jan 2021 07:47:25 +0000 (UTC) X-FDA: 77670941250.23.knee77_490e7aa274d7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 76A2537608 for ; Tue, 5 Jan 2021 07:47:25 +0000 (UTC) X-HE-Tag: knee77_490e7aa274d7 X-Filterd-Recvd-Size: 8193 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Tue, 5 Jan 2021 07:47:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609832844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=WsAhgzYIsskRD8yIC+thC5F3Yu9Wgz1gQuSV+5tYO7k=; b=MJ0TND3NgTLPuKZpP5JVb7JXMO1Ab0kE0hw4qJoDa+hicOlOlF+bQgGzD4BkkiQtIMMg2/ B5er/4W9fg7PNYBkvnVk4l8HTQfeFT3qsCSSVOvRiumiJo9/ei1mb4xiFI0mSWq90FskUo 9CibiCBgR8GcokV/biNSyFH7f3zWGWc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-381-mLgPrRkUOmO55MbKYbXjmw-1; Tue, 05 Jan 2021 02:47:20 -0500 X-MC-Unique: mLgPrRkUOmO55MbKYbXjmw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A4BF6802B42; Tue, 5 Jan 2021 07:47:19 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-56.pek2.redhat.com [10.72.13.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C40571C9A; Tue, 5 Jan 2021 07:47:16 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, rppt@kernel.org, david@redhat.com, bhe@redhat.com Subject: [PATCH v3 1/4] mm: rename memmap_init() and memmap_init_zone() Date: Tue, 5 Jan 2021 15:47:05 +0800 Message-Id: <20210105074708.18483-2-bhe@redhat.com> In-Reply-To: <20210105074708.18483-1-bhe@redhat.com> References: <20210105074708.18483-1-bhe@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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. Signed-off-by: Baoquan He Reviewed-by: Mike Rapoport Reviewed-by: David Hildenbrand --- 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(-) diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index 779b6972aa84..dce2ff37df65 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h @@ -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__ */ diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index e76386a3479e..c8e68e92beb3 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -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; diff --git a/include/linux/mm.h b/include/linux/mm.h index 6b3de3c09cd5..26c01f5a028b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -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); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index f9d57b9be8c7..ddcb1cd24c60 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -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); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 3ea9d5cd6058..69ebf75be91c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -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); } } From patchwork Tue Jan 5 07:47:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 11998281 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B10D8C433E0 for ; Tue, 5 Jan 2021 07:47:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 35E0021973 for ; Tue, 5 Jan 2021 07:47:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 35E0021973 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D03A08D0060; Tue, 5 Jan 2021 02:47:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CB3C48D0036; Tue, 5 Jan 2021 02:47:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA25C8D0060; Tue, 5 Jan 2021 02:47:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0206.hostedemail.com [216.40.44.206]) by kanga.kvack.org (Postfix) with ESMTP id A23F48D0036 for ; Tue, 5 Jan 2021 02:47:30 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 60EA48248047 for ; Tue, 5 Jan 2021 07:47:30 +0000 (UTC) X-FDA: 77670941460.30.thing20_0e0cbb1274d7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 4101E180B3AA7 for ; Tue, 5 Jan 2021 07:47:30 +0000 (UTC) X-HE-Tag: thing20_0e0cbb1274d7 X-Filterd-Recvd-Size: 6505 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Tue, 5 Jan 2021 07:47:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609832849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=NmizFIUcxnbFhZLwvyEyz/ycKmX/WhqDKmClMna0PAw=; b=bvxaekUXCK5SdtYrdFkDUhgmvYCIUQ19xWmEfVhnXn8CT/OcP2uwObiAZ0ciQxXa27mcyC ZjK5U2jx3mrmACRJP08GUuq0h6ifv1wAd/dDF6TdBzmapG0ODhJJ4OJTrN7i10JVq2l6TL jvBsAg7CDAm5DWqYw6mqS97rcxp+PHU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-284-VCVKoS0LMUKSBTStlCuFFw-1; Tue, 05 Jan 2021 02:47:25 -0500 X-MC-Unique: VCVKoS0LMUKSBTStlCuFFw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CB8E315730; Tue, 5 Jan 2021 07:47:23 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-56.pek2.redhat.com [10.72.13.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D7BC71CA2; Tue, 5 Jan 2021 07:47:20 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, rppt@kernel.org, david@redhat.com, bhe@redhat.com Subject: [PATCH v3 2/4] mm: simplify parater of function memmap_init_zone() Date: Tue, 5 Jan 2021 15:47:06 +0800 Message-Id: <20210105074708.18483-3-bhe@redhat.com> In-Reply-To: <20210105074708.18483-1-bhe@redhat.com> References: <20210105074708.18483-1-bhe@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: As David suggested, simply passing 'struct zone *zone' is enough. We can get all needed information from 'struct zone*' easily. Suggested-by: David Hildenbrand Signed-off-by: Baoquan He Reviewed-by: Mike Rapoport --- 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(-) 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..ccbda1a74c95 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) { + 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); } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 69ebf75be91c..b2a46ffdaf0b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -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); } } From patchwork Tue Jan 5 07:47:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 11998283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55A18C433DB for ; Tue, 5 Jan 2021 07:47:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F0CCD21973 for ; Tue, 5 Jan 2021 07:47:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0CCD21973 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4C6FD8D0061; Tue, 5 Jan 2021 02:47:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4758F8D0036; Tue, 5 Jan 2021 02:47:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 319FA8D0061; Tue, 5 Jan 2021 02:47:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0222.hostedemail.com [216.40.44.222]) by kanga.kvack.org (Postfix) with ESMTP id 126F78D0036 for ; Tue, 5 Jan 2021 02:47:33 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id D09173629 for ; Tue, 5 Jan 2021 07:47:32 +0000 (UTC) X-FDA: 77670941544.05.map79_0807aff274d7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id B48CC1802A37E for ; Tue, 5 Jan 2021 07:47:32 +0000 (UTC) X-HE-Tag: map79_0807aff274d7 X-Filterd-Recvd-Size: 3871 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Tue, 5 Jan 2021 07:47:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609832851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=b2U2nEqaOtojovkjXAeglzjCU2zPKv7iQLxjUumzErg=; b=Is9fT9NbQLosOEhhXgMQagk25hc5zOU+BiJTpDihS7OrA/gMqRO/BY4D5A/x0tRpR25Xcw cml+V1XvJMOEa725lvGN571BooJIejgjIZoROuK4+IZGJpBjFm5iEeq+00ZaXbfxoZgVFt 37kXNyIE2pUqMMBDFZsxzAE7rloqwII= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-480-CHXO33XYPL2TcSEPInJL1A-1; Tue, 05 Jan 2021 02:47:27 -0500 X-MC-Unique: CHXO33XYPL2TcSEPInJL1A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C115859; Tue, 5 Jan 2021 07:47:26 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-56.pek2.redhat.com [10.72.13.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64D6671CA1; Tue, 5 Jan 2021 07:47:24 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, rppt@kernel.org, david@redhat.com, bhe@redhat.com Subject: [PATCH v3 3/4] mm: simplify parameter of setup_usemap() Date: Tue, 5 Jan 2021 15:47:07 +0800 Message-Id: <20210105074708.18483-4-bhe@redhat.com> In-Reply-To: <20210105074708.18483-1-bhe@redhat.com> References: <20210105074708.18483-1-bhe@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Parameter 'zone' has got needed information, let's remove other unnecessary parameters. Signed-off-by: Baoquan He Reviewed-by: Mike Rapoport Reviewed-by: David Hildenbrand --- mm/page_alloc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b2a46ffdaf0b..e0ce6fb6373b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -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); } From patchwork Tue Jan 5 07:47:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 11998285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D256BC433E6 for ; Tue, 5 Jan 2021 07:47:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 796B121973 for ; Tue, 5 Jan 2021 07:47:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 796B121973 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 0F6F88D0062; Tue, 5 Jan 2021 02:47:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 07E4F8D0036; Tue, 5 Jan 2021 02:47:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3CD78D0062; Tue, 5 Jan 2021 02:47:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0231.hostedemail.com [216.40.44.231]) by kanga.kvack.org (Postfix) with ESMTP id C05968D0036 for ; Tue, 5 Jan 2021 02:47:34 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 7F8AC8248047 for ; Tue, 5 Jan 2021 07:47:34 +0000 (UTC) X-FDA: 77670941628.06.crook34_1a0be1f274d7 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id 5BD971004ADEC for ; Tue, 5 Jan 2021 07:47:34 +0000 (UTC) X-HE-Tag: crook34_1a0be1f274d7 X-Filterd-Recvd-Size: 3108 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Tue, 5 Jan 2021 07:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609832852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=XIQjm85waNu2DaAUZ4nRwaahypJ7KcL7+iJQfZLah8o=; b=QnQWXmffLv4iiUzEWCm7xpN3Sheh8dJ2G33s3WFceqtRcrkBJJSBXXQDO8waOS1wSwkRTN PxC0Oy/O0YgMuUzS4scAfS73CQAnvBQ3EgHMsOjaGMw8dwnTZtyRb7aZqK1Rajx/iTyNBf TmWN6s34jqAPl1xLFgfmvzp0CD8qr/U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-485-VOn2FcFUM2Ok6SKyXak3Fw-1; Tue, 05 Jan 2021 02:47:31 -0500 X-MC-Unique: VOn2FcFUM2Ok6SKyXak3Fw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC8AF107ACF8; Tue, 5 Jan 2021 07:47:29 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-13-56.pek2.redhat.com [10.72.13.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52A9871C91; Tue, 5 Jan 2021 07:47:27 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, rppt@kernel.org, david@redhat.com, bhe@redhat.com Subject: [PATCH v3 4/4] mm: remove unneeded local variable in free_area_init_core Date: Tue, 5 Jan 2021 15:47:08 +0800 Message-Id: <20210105074708.18483-5-bhe@redhat.com> In-Reply-To: <20210105074708.18483-1-bhe@redhat.com> References: <20210105074708.18483-1-bhe@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Local 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(). Signed-off-by: Baoquan He Reviewed-by: Mike Rapoport Reviewed-by: David Hildenbrand --- mm/page_alloc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e0ce6fb6373b..9cacb8652239 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -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); } }