From patchwork Sun Dec 20 08:27:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 11983823 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=-15.8 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 D5972C2BBCD for ; Sun, 20 Dec 2020 08:28:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5B3D72389F for ; Sun, 20 Dec 2020 08:28:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B3D72389F 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 E96406B0070; Sun, 20 Dec 2020 03:28:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E48E56B0071; Sun, 20 Dec 2020 03:28:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D61126B0072; Sun, 20 Dec 2020 03:28:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0045.hostedemail.com [216.40.44.45]) by kanga.kvack.org (Postfix) with ESMTP id C2BC76B0070 for ; Sun, 20 Dec 2020 03:28:20 -0500 (EST) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 8CFFE1F10 for ; Sun, 20 Dec 2020 08:28:20 +0000 (UTC) X-FDA: 77612983560.03.vest34_1a15acd2744d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id 7026028A4E8 for ; Sun, 20 Dec 2020 08:28:20 +0000 (UTC) X-HE-Tag: vest34_1a15acd2744d X-Filterd-Recvd-Size: 6481 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Sun, 20 Dec 2020 08:28:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608452899; 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=n0g34m/KCff5RmPKhid8aMrdNLzjpYVILvAVkWIl6Jk=; b=cM7MYnFItbP8BB0t7sIMDtaHfUwjryBRaiWAbwpJPqvb4sT100ls4I6SBqdNL4LIl+HcLv OfuYJaL4vCxSC/Ju3QzLf/8Lsd4kuNcVEPS2fMlfvYkthRJManRi2FDoERbw8uu74D5sJW aOepsNm9a4IEaOxc45soXRh3eVGQ4AQ= 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-8S9O5UwxMDaO2dVlr-xrxw-1; Sun, 20 Dec 2020 03:28:17 -0500 X-MC-Unique: 8S9O5UwxMDaO2dVlr-xrxw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF1BD1800D42; Sun, 20 Dec 2020 08:28:15 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-22.pek2.redhat.com [10.72.12.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EEE660C13; Sun, 20 Dec 2020 08:28:13 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, gopakumarr@vmware.com, rppt@kernel.org, david@redhat.com, bhe@redhat.com Subject: [PATCH v2 3/5] mm: simplify parater of function memmap_init_zone() Date: Sun, 20 Dec 2020 16:27:52 +0800 Message-Id: <20201220082754.6900-4-bhe@redhat.com> In-Reply-To: <20201220082754.6900-1-bhe@redhat.com> References: <20201220082754.6900-1-bhe@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 4b46326099d9..7a6626351ed7 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); } }