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,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 8B68DC433DF for ; Sun, 2 Aug 2020 16:39:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3F41220759 for ; Sun, 2 Aug 2020 16:39:13 +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="LeAsAzWK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F41220759 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 D520F8D00C5; Sun, 2 Aug 2020 12:39:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CFFEB8D00AA; Sun, 2 Aug 2020 12:39:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA27B8D00C5; Sun, 2 Aug 2020 12:39:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0062.hostedemail.com [216.40.44.62]) by kanga.kvack.org (Postfix) with ESMTP id A32FA8D00AA for ; Sun, 2 Aug 2020 12:39:12 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 6F1AE3621 for ; Sun, 2 Aug 2020 16:39:12 +0000 (UTC) X-FDA: 77106188544.14.nest06_4d1846d26f96 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id 450DB18229837 for ; Sun, 2 Aug 2020 16:39:12 +0000 (UTC) X-HE-Tag: nest06_4d1846d26f96 X-Filterd-Recvd-Size: 9418 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Sun, 2 Aug 2020 16:39:11 +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 9C6F7207BB; Sun, 2 Aug 2020 16:39:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596386350; bh=gqBMOJufupVT6nwjCYDhdQzDn7YpaiO3JM6cP/9C3wE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LeAsAzWKRP59PigJoeA+XtS0FJGWFVUdDhjkFEKClGxmxsaW6+DxphUxN6CoYMYaT tl2WX65cznSnalnk9ZwonQBu35jxUPNSqyzIs2PyJpU9XishZghg1BraDKduHM2ouD WedM8Ivn0Ro/l/b30nFV0/UkeZIodRQvAC8k7/4U= From: Mike Rapoport To: Andrew Morton Cc: Andy Lutomirski , Baoquan He , Benjamin Herrenschmidt , Borislav Petkov , Catalin Marinas , Christoph Hellwig , 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 Subject: [PATCH v2 16/17] memblock: implement for_each_reserved_mem_region() using __next_mem_region() Date: Sun, 2 Aug 2020 19:36:00 +0300 Message-Id: <20200802163601.8189-17-rppt@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200802163601.8189-1-rppt@kernel.org> References: <20200802163601.8189-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 450DB18229837 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 Iteration over memblock.reserved with for_each_reserved_mem_region() used __next_reserved_mem_region() that implemented a subset of __next_mem_region(). Use __for_each_mem_range() and, essentially, __next_mem_region() with appropriate parameters to reduce code duplication. While on it, rename for_each_reserved_mem_region() to for_each_reserved_mem_range() for consistency. Signed-off-by: Mike Rapoport --- .clang-format | 2 +- arch/arm64/kernel/setup.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 2 +- include/linux/memblock.h | 12 +++------ mm/memblock.c | 46 +++++++------------------------- 5 files changed, 17 insertions(+), 47 deletions(-) diff --git a/.clang-format b/.clang-format index 52ededab25ce..e28a849a1c58 100644 --- a/.clang-format +++ b/.clang-format @@ -266,7 +266,7 @@ ForEachMacros: - 'for_each_process_thread' - 'for_each_property_of_node' - 'for_each_registered_fb' - - 'for_each_reserved_mem_region' + - 'for_each_reserved_mem_range' - '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 93b3844cf442..f3aec7244aab 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -257,7 +257,7 @@ static int __init reserve_memblock_reserved_regions(v= oid) if (!memblock_is_region_reserved(mem->start, mem_size)) continue; =20 - for_each_reserved_mem_region(j, &r_start, &r_end) { + for_each_reserved_mem_range(j, &r_start, &r_end) { resource_size_t start, end; =20 start =3D max(PFN_PHYS(PFN_DOWN(r_start)), mem->start); diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v= 3-its.c index beac4caefad9..9971fd8cf6b6 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -2192,7 +2192,7 @@ static bool gic_check_reserved_range(phys_addr_t ad= dr, unsigned long size) =20 addr_end =3D addr + size - 1; =20 - for_each_reserved_mem_region(i, &start, &end) { + for_each_reserved_mem_range(i, &start, &end) { if (addr >=3D start && addr_end <=3D end) return true; } diff --git a/include/linux/memblock.h b/include/linux/memblock.h index ec2fd8f32a19..9e51b3fd4134 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -136,9 +136,6 @@ void __next_mem_range_rev(u64 *idx, int nid, enum mem= block_flags flags, struct memblock_type *type_b, phys_addr_t *out_start, phys_addr_t *out_end, int *out_nid); =20 -void __next_reserved_mem_region(u64 *idx, phys_addr_t *out_start, - phys_addr_t *out_end); - void __memblock_free_late(phys_addr_t base, phys_addr_t size); =20 /** @@ -193,7 +190,7 @@ void __memblock_free_late(phys_addr_t base, phys_addr= _t size); MEMBLOCK_NONE, p_start, p_end, NULL) =20 /** - * for_each_reserved_mem_region - iterate over all reserved memblock are= as + * for_each_reserved_mem_range - iterate over all reserved memblock area= s * @i: u64 used as loop variable * @p_start: ptr to phys_addr_t for start address of the range, can be %= NULL * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL @@ -201,10 +198,9 @@ void __memblock_free_late(phys_addr_t base, phys_add= r_t size); * Walks over reserved areas of memblock. Available as soon as memblock * is initialized. */ -#define for_each_reserved_mem_region(i, p_start, p_end) \ - for (i =3D 0UL, __next_reserved_mem_region(&i, p_start, p_end); \ - i !=3D (u64)ULLONG_MAX; \ - __next_reserved_mem_region(&i, p_start, p_end)) +#define for_each_reserved_mem_range(i, p_start, p_end) \ + __for_each_mem_range(i, &memblock.reserved, NULL, NUMA_NO_NODE, \ + MEMBLOCK_NONE, p_start, p_end, NULL) =20 static inline bool memblock_is_hotpluggable(struct memblock_region *m) { diff --git a/mm/memblock.c b/mm/memblock.c index 48d614352b25..dadf579f7c53 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -946,42 +946,16 @@ int __init_memblock memblock_clear_nomap(phys_addr_= t base, phys_addr_t size) return memblock_setclr_flag(base, size, 0, MEMBLOCK_NOMAP); } =20 -/** - * __next_reserved_mem_region - next function for for_each_reserved_regi= on() - * @idx: pointer to u64 loop variable - * @out_start: ptr to phys_addr_t for start address of the region, can b= e %NULL - * @out_end: ptr to phys_addr_t for end address of the region, can be %N= ULL - * - * Iterate over all reserved memory regions. - */ -void __init_memblock __next_reserved_mem_region(u64 *idx, - phys_addr_t *out_start, - phys_addr_t *out_end) -{ - struct memblock_type *type =3D &memblock.reserved; - - if (*idx < type->cnt) { - struct memblock_region *r =3D &type->regions[*idx]; - phys_addr_t base =3D r->base; - phys_addr_t size =3D r->size; - - if (out_start) - *out_start =3D base; - if (out_end) - *out_end =3D base + size - 1; - - *idx +=3D 1; - return; - } - - /* signal end of iteration */ - *idx =3D ULLONG_MAX; -} - -static bool should_skip_region(struct memblock_region *m, int nid, int f= lags) +static bool __init_memblock should_skip_region(struct memblock_type *typ= e, + struct memblock_region *m, + int nid, int flags) { int m_nid =3D memblock_get_region_node(m); =20 + /* we never skip regions when iterating memblock.reserved */ + if (type =3D=3D &memblock.reserved) + return false; + /* only memory regions are associated with nodes, check it */ if (nid !=3D NUMA_NO_NODE && nid !=3D m_nid) return true; @@ -1048,7 +1022,7 @@ void __init_memblock __next_mem_range(u64 *idx, int= nid, phys_addr_t m_end =3D m->base + m->size; int m_nid =3D memblock_get_region_node(m); =20 - if (should_skip_region(m, nid, flags)) + if (should_skip_region(type_a, m, nid, flags)) continue; =20 if (!type_b) { @@ -1152,7 +1126,7 @@ void __init_memblock __next_mem_range_rev(u64 *idx,= int nid, phys_addr_t m_end =3D m->base + m->size; int m_nid =3D memblock_get_region_node(m); =20 - if (should_skip_region(m, nid, flags)) + if (should_skip_region(type_a, m, nid, flags)) continue; =20 if (!type_b) { @@ -1977,7 +1951,7 @@ static unsigned long __init free_low_memory_core_ea= rly(void) =20 memblock_clear_hotplug(0, -1); =20 - for_each_reserved_mem_region(i, &start, &end) + for_each_reserved_mem_range(i, &start, &end) reserve_bootmem_region(start, end); =20 /* --=20 2.26.2