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=-9.8 required=3.0 tests=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 D49F5C2D0EC for ; Sun, 12 Apr 2020 19:49:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 827B82072D for ; Sun, 12 Apr 2020 19:49:40 +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="f8MaQrCm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 827B82072D 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 318F68E00D6; Sun, 12 Apr 2020 15:49:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2CA1B8E00D0; Sun, 12 Apr 2020 15:49:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 190F88E00D6; Sun, 12 Apr 2020 15:49:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0003.hostedemail.com [216.40.44.3]) by kanga.kvack.org (Postfix) with ESMTP id EFDED8E00D0 for ; Sun, 12 Apr 2020 15:49:39 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A72222490 for ; Sun, 12 Apr 2020 19:49:39 +0000 (UTC) X-FDA: 76700242878.08.light53_8e7e4a9f11333 X-HE-Tag: light53_8e7e4a9f11333 X-Filterd-Recvd-Size: 7287 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Sun, 12 Apr 2020 19:49:39 +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 2318520732; Sun, 12 Apr 2020 19:49:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586720978; bh=8bF1Pu75QmsOVjbaACX4VAU2zf9BLYADPXDD4519geE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f8MaQrCm0Hl80hu0++ZqU6IDqmN39vSrVOUXSCBiboiDATjuq8zWxXcrhx4reOEFz UnT1krn6SVH56kSVAhVqWmi/pqLue6tstokqSoGOhWphOTRTHFT8vEnlL0hd8L/AKu f0ajTvRbQbvN/SZEolDhT+HF7ng0L1Xb7dYMxDI0= From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Baoquan He , Brian Cain , Catalin Marinas , "David S. Miller" , Geert Uytterhoeven , Greentime Hu , Greg Ungerer , Guan Xuetao , Guo Ren , Heiko Carstens , Helge Deller , Hoan Tran , "James E.J. Bottomley" , Jonathan Corbet , Ley Foon Tan , Mark Salter , Matt Turner , Max Filippov , Michael Ellerman , Michal Hocko , Michal Simek , Mike Rapoport , Nick Hu , Paul Walmsley , Richard Weinberger , Rich Felker , Russell King , Stafford Horne , Thomas Bogendoerfer , Tony Luck , Vineet Gupta , x86@kernel.org, Yoshinori Sato , linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-csky@vger.kernel.org, linux-doc@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-um@lists.infradead.org, linux-xtensa@linux-xtensa.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp, Mike Rapoport Subject: [PATCH 01/21] mm: memblock: replace dereferences of memblock_region.nid with API calls Date: Sun, 12 Apr 2020 22:48:39 +0300 Message-Id: <20200412194859.12663-2-rppt@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200412194859.12663-1-rppt@kernel.org> References: <20200412194859.12663-1-rppt@kernel.org> MIME-Version: 1.0 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 There are several places in the code that directly dereference memblock_region.nid despite this field being defined only when CONFIG_HAVE_MEMBLOCK_NODE_MAP=3Dy. Replace these with calls to memblock_get_region_nid() to improve code robustness and to avoid possible breakage when CONFIG_HAVE_MEMBLOCK_NODE_MAP will be removed. Signed-off-by: Mike Rapoport --- arch/arm64/mm/numa.c | 9 ++++++--- arch/x86/mm/numa.c | 6 ++++-- mm/memblock.c | 8 +++++--- mm/page_alloc.c | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index 4decf1659700..aafcee3e3f7e 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -350,13 +350,16 @@ 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) - if (mblk->nid =3D=3D NUMA_NO_NODE || mblk->nid >=3D MAX_NUMNODES) { + for_each_memblock(memory, mblk) { + int mblk_nid =3D memblock_get_region_node(mblk); + + if (mblk_nid =3D=3D NUMA_NO_NODE || mblk_nid >=3D MAX_NUMNODES) { pr_warn("Warning: invalid memblk node %d [mem %#010Lx-%#010Lx]\n", - mblk->nid, mblk->base, + mblk_nid, mblk->base, mblk->base + mblk->size - 1); return -EINVAL; } + } =20 /* Finally register nodes. */ for_each_node_mask(nid, numa_nodes_parsed) { diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 59ba008504dc..fe024b2ac796 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -517,8 +517,10 @@ static void __init numa_clear_kernel_node_hotplug(vo= id) * reserve specific pages for Sandy Bridge graphics. ] */ for_each_memblock(reserved, mb_region) { - if (mb_region->nid !=3D MAX_NUMNODES) - node_set(mb_region->nid, reserved_nodemask); + int nid =3D memblock_get_region_node(mb_region); + + if (nid !=3D MAX_NUMNODES) + node_set(nid, reserved_nodemask); } =20 /* diff --git a/mm/memblock.c b/mm/memblock.c index c79ba6f9920c..43e2fd3006c1 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1207,13 +1207,15 @@ void __init_memblock __next_mem_pfn_range(int *id= x, int nid, { struct memblock_type *type =3D &memblock.memory; struct memblock_region *r; + int r_nid; =20 while (++*idx < type->cnt) { r =3D &type->regions[*idx]; + r_nid =3D memblock_get_region_node(r); =20 if (PFN_UP(r->base) >=3D PFN_DOWN(r->base + r->size)) continue; - if (nid =3D=3D MAX_NUMNODES || nid =3D=3D r->nid) + if (nid =3D=3D MAX_NUMNODES || nid =3D=3D r_nid) break; } if (*idx >=3D type->cnt) { @@ -1226,7 +1228,7 @@ void __init_memblock __next_mem_pfn_range(int *idx,= int nid, if (out_end_pfn) *out_end_pfn =3D PFN_DOWN(r->base + r->size); if (out_nid) - *out_nid =3D r->nid; + *out_nid =3D r_nid; } =20 /** @@ -1810,7 +1812,7 @@ int __init_memblock memblock_search_pfn_nid(unsigne= d long pfn, *start_pfn =3D PFN_DOWN(type->regions[mid].base); *end_pfn =3D PFN_DOWN(type->regions[mid].base + type->regions[mid].size= ); =20 - return type->regions[mid].nid; + return memblock_get_region_node(&type->regions[mid]); } #endif =20 diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 69827d4fa052..0d012eda1694 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7208,7 +7208,7 @@ static void __init find_zone_movable_pfns_for_nodes= (void) if (!memblock_is_hotpluggable(r)) continue; =20 - nid =3D r->nid; + nid =3D memblock_get_region_node(r); =20 usable_startpfn =3D PFN_DOWN(r->base); zone_movable_pfn[nid] =3D zone_movable_pfn[nid] ? @@ -7229,7 +7229,7 @@ static void __init find_zone_movable_pfns_for_nodes= (void) if (memblock_is_mirror(r)) continue; =20 - nid =3D r->nid; + nid =3D memblock_get_region_node(r); =20 usable_startpfn =3D memblock_region_memory_base_pfn(r); =20 --=20 2.25.1