From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 66819C433DF for ; Tue, 18 Aug 2020 15:27:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1805A206DA for ; Tue, 18 Aug 2020 15:27:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="Q2YllB9n" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1805A206DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A04E68D0028; Tue, 18 Aug 2020 11:27:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 98D158D001B; Tue, 18 Aug 2020 11:27:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 807558D0028; Tue, 18 Aug 2020 11:27:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0195.hostedemail.com [216.40.44.195]) by kanga.kvack.org (Postfix) with ESMTP id 63A278D001B for ; Tue, 18 Aug 2020 11:27:08 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id E57BD3631 for ; Tue, 18 Aug 2020 15:27:07 +0000 (UTC) X-FDA: 77164067694.17.roof41_2f149dd27020 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 49E67180177ED for ; Tue, 18 Aug 2020 15:19:57 +0000 (UTC) X-HE-Tag: roof41_2f149dd27020 X-Filterd-Recvd-Size: 10607 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Tue, 18 Aug 2020 15:19:56 +0000 (UTC) Received: from aquarius.haifa.ibm.com (nesher1.haifa.il.ibm.com [195.110.40.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DD7D0207DE; Tue, 18 Aug 2020 15:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597763995; bh=ozDs+ikcDN9A8o1w1ZdwHNmljXS0aLZyo/vOcdPYmPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q2YllB9nxUs1S8Yq+B7V9TZ9cWz5F/+xOingwwq7uoFzA7Y3VtgRDQ88+C68JDaKk 9Cp0/R0cjM1AjjyNT45D7/sgkudmCC50TRmJL2WZildNh9PimFmugzn8K80+/wDka2 Rhm31KncO57PPdeDTZwxahtVjAg9quHFjMnG2guE= From: Mike Rapoport To: Andrew Morton Cc: Andy Lutomirski , Baoquan He , Benjamin Herrenschmidt , Borislav Petkov , Catalin Marinas , Christoph Hellwig , Daniel Axtens , Dave Hansen , Emil Renner Berthing , Ingo Molnar , Hari Bathini , Marek Szyprowski , Max Filippov , Michael Ellerman , Michal Simek , Mike Rapoport , Mike Rapoport , Palmer Dabbelt , Paul Mackerras , Paul Walmsley , Peter Zijlstra , Russell King , Stafford Horne , Thomas Gleixner , Will Deacon , Yoshinori Sato , clang-built-linux@googlegroups.com, iommu@lists.linux-foundation.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-xtensa@linux-xtensa.org, linuxppc-dev@lists.ozlabs.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp, x86@kernel.org, Ingo Molnar , Thomas Bogendoerfer , Miguel Ojeda Subject: [PATCH v3 17/17] memblock: use separate iterators for memory and reserved regions Date: Tue, 18 Aug 2020 18:16:34 +0300 Message-Id: <20200818151634.14343-18-rppt@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200818151634.14343-1-rppt@kernel.org> References: <20200818151634.14343-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 49E67180177ED X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 Content-Transfer-Encoding: quoted-printable 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: From: Mike Rapoport for_each_memblock() is used to iterate over memblock.memory in a few places that use data from memblock_region rather than the memory ranges. Introduce separate for_each_mem_region() and for_each_reserved_mem_region= () to improve encapsulation of memblock internals from its users. Signed-off-by: Mike Rapoport Reviewed-by: Baoquan He Acked-by: Ingo Molnar # x86 Acked-by: Thomas Bogendoerfer # MIPS Acked-by: Miguel Ojeda # .clang-forma= t --- .clang-format | 3 ++- arch/arm64/kernel/setup.c | 2 +- arch/arm64/mm/numa.c | 2 +- arch/mips/netlogic/xlp/setup.c | 2 +- arch/riscv/mm/init.c | 2 +- arch/x86/mm/numa.c | 2 +- include/linux/memblock.h | 19 ++++++++++++++++--- mm/memblock.c | 4 ++-- mm/page_alloc.c | 8 ++++---- 9 files changed, 29 insertions(+), 15 deletions(-) diff --git a/.clang-format b/.clang-format index 2b77cc419b97..a118fdde25c1 100644 --- a/.clang-format +++ b/.clang-format @@ -201,7 +201,7 @@ ForEachMacros: - 'for_each_matching_node' - 'for_each_matching_node_and_match' - 'for_each_member' - - 'for_each_memblock' + - 'for_each_mem_region' - 'for_each_memblock_type' - 'for_each_memcg_cache_index' - 'for_each_mem_pfn_range' @@ -268,6 +268,7 @@ ForEachMacros: - 'for_each_property_of_node' - 'for_each_registered_fb' - 'for_each_reserved_mem_range' + - 'for_each_reserved_mem_region' - 'for_each_rtd_codec_dais' - 'for_each_rtd_codec_dais_rollback' - 'for_each_rtd_components' diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index a986c6f8ab42..dcce72ac072b 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -217,7 +217,7 @@ static void __init request_standard_resources(void) if (!standard_resources) panic("%s: Failed to allocate %zu bytes\n", __func__, res_size); =20 - for_each_memblock(memory, region) { + for_each_mem_region(region) { res =3D &standard_resources[i++]; if (memblock_is_nomap(region)) { res->name =3D "reserved"; diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index 8a97cd3d2dfe..5efdbd01a59c 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -350,7 +350,7 @@ static int __init numa_register_nodes(void) struct memblock_region *mblk; =20 /* Check that valid nid is set to memblks */ - for_each_memblock(memory, mblk) { + for_each_mem_region(mblk) { int mblk_nid =3D memblock_get_region_node(mblk); =20 if (mblk_nid =3D=3D NUMA_NO_NODE || mblk_nid >=3D MAX_NUMNODES) { diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setu= p.c index 1a0fc5b62ba4..6e3102bcd2f1 100644 --- a/arch/mips/netlogic/xlp/setup.c +++ b/arch/mips/netlogic/xlp/setup.c @@ -70,7 +70,7 @@ static void nlm_fixup_mem(void) const int pref_backup =3D 512; struct memblock_region *mem; =20 - for_each_memblock(memory, mem) { + for_each_mem_region(mem) { memblock_remove(mem->base + mem->size - pref_backup, pref_backup); } diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 06355716d19a..1fb6a826c2fd 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -531,7 +531,7 @@ static void __init resource_init(void) { struct memblock_region *region; =20 - for_each_memblock(memory, region) { + for_each_mem_region(region) { struct resource *res; =20 res =3D memblock_alloc(sizeof(struct resource), SMP_CACHE_BYTES); diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index aa76ec2d359b..b6246768479d 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -516,7 +516,7 @@ static void __init numa_clear_kernel_node_hotplug(voi= d) * memory ranges, because quirks such as trim_snb_memory() * reserve specific pages for Sandy Bridge graphics. ] */ - for_each_memblock(reserved, mb_region) { + for_each_reserved_mem_region(mb_region) { int nid =3D memblock_get_region_node(mb_region); =20 if (nid !=3D MAX_NUMNODES) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 354078713cd1..ef131255cedc 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -553,9 +553,22 @@ static inline unsigned long memblock_region_reserved= _end_pfn(const struct memblo return PFN_UP(reg->base + reg->size); } =20 -#define for_each_memblock(memblock_type, region) \ - for (region =3D memblock.memblock_type.regions; \ - region < (memblock.memblock_type.regions + memblock.memblock_type.= cnt); \ +/** + * for_each_mem_region - itereate over memory regions + * @region: loop variable + */ +#define for_each_mem_region(region) \ + for (region =3D memblock.memory.regions; \ + region < (memblock.memory.regions + memblock.memory.cnt); \ + region++) + +/** + * for_each_reserved_mem_region - itereate over reserved memory regions + * @region: loop variable + */ +#define for_each_reserved_mem_region(region) \ + for (region =3D memblock.reserved.regions; \ + region < (memblock.reserved.regions + memblock.reserved.cnt); \ region++) =20 extern void *alloc_large_system_hash(const char *tablename, diff --git a/mm/memblock.c b/mm/memblock.c index d0be57acccf2..4eacfed872c4 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1664,7 +1664,7 @@ static phys_addr_t __init_memblock __find_max_addr(= phys_addr_t limit) * the memory memblock regions, if the @limit exceeds the total size * of those regions, max_addr will keep original value PHYS_ADDR_MAX */ - for_each_memblock(memory, r) { + for_each_mem_region(r) { if (limit <=3D r->size) { max_addr =3D r->base + limit; break; @@ -1834,7 +1834,7 @@ void __init_memblock memblock_trim_memory(phys_addr= _t align) phys_addr_t start, end, orig_start, orig_end; struct memblock_region *r; =20 - for_each_memblock(memory, r) { + for_each_mem_region(r) { orig_start =3D r->base; orig_end =3D r->base + r->size; start =3D round_up(orig_start, align); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 12da56b1cf39..366982d1a1c2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5950,7 +5950,7 @@ overlap_memmap_init(unsigned long zone, unsigned lo= ng *pfn) =20 if (mirrored_kernelcore && zone =3D=3D ZONE_MOVABLE) { if (!r || *pfn >=3D memblock_region_memory_end_pfn(r)) { - for_each_memblock(memory, r) { + for_each_mem_region(r) { if (*pfn < memblock_region_memory_end_pfn(r)) break; } @@ -6535,7 +6535,7 @@ static unsigned long __init zone_absent_pages_in_no= de(int nid, unsigned long start_pfn, end_pfn; struct memblock_region *r; =20 - for_each_memblock(memory, r) { + for_each_mem_region(r) { start_pfn =3D clamp(memblock_region_memory_base_pfn(r), zone_start_pfn, zone_end_pfn); end_pfn =3D clamp(memblock_region_memory_end_pfn(r), @@ -7129,7 +7129,7 @@ static void __init find_zone_movable_pfns_for_nodes= (void) * options. */ if (movable_node_is_enabled()) { - for_each_memblock(memory, r) { + for_each_mem_region(r) { if (!memblock_is_hotpluggable(r)) continue; =20 @@ -7150,7 +7150,7 @@ static void __init find_zone_movable_pfns_for_nodes= (void) if (mirrored_kernelcore) { bool mem_below_4gb_not_mirrored =3D false; =20 - for_each_memblock(memory, r) { + for_each_mem_region(r) { if (memblock_is_mirror(r)) continue; =20 --=20 2.26.2