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 920F8C2D0EC for ; Sun, 12 Apr 2020 19:50:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5750420739 for ; Sun, 12 Apr 2020 19:50:52 +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="K17ugq28" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5750420739 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 058928E00DB; Sun, 12 Apr 2020 15:50:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0080F8E00D0; Sun, 12 Apr 2020 15:50:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3A0B8E00DB; Sun, 12 Apr 2020 15:50:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0105.hostedemail.com [216.40.44.105]) by kanga.kvack.org (Postfix) with ESMTP id C973F8E00D0 for ; Sun, 12 Apr 2020 15:50:51 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 800B7180AD801 for ; Sun, 12 Apr 2020 19:50:51 +0000 (UTC) X-FDA: 76700245902.22.sink08_7713b1aef12c X-HE-Tag: sink08_7713b1aef12c X-Filterd-Recvd-Size: 5229 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Sun, 12 Apr 2020 19:50:51 +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 7A6E62072D; Sun, 12 Apr 2020 19:50:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586721050; bh=OywmGjN0YkpD4PeATHQLeZwZ6vCeABR7jWidYZOWKII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K17ugq281XlFMkMsNMLUH8vmdaytq7PErQpZ57JI0OypyejZ5V6JVOenwh2lNyz7c HJL1aCghNf8EpGRi72ZtOEPk50iIdsyQcYsVPaUoiY2GzAtCOtNHdFaVrYkz72OXAu lOdJ+/zDjmBcCstUFcUxU1Y2BvjEcUpUUqGfqh28= 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 06/21] alpha: simplify detection of memory zone boundaries Date: Sun, 12 Apr 2020 22:48:44 +0300 Message-Id: <20200412194859.12663-7-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 The free_area_init() function only requires the definition of maximal PFN for each of the supported zone rater than calculation of actual zone size= s and the sizes of the holes between the zones. After removal of CONFIG_HAVE_MEMBLOCK_NODE_MAP the free_area_init() is available to all architectures. Using this function instead of free_area_init_node() simplifies the zone detection. Signed-off-by: Mike Rapoport --- arch/alpha/mm/numa.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c index a24cd13e71cb..5ad6087de1d6 100644 --- a/arch/alpha/mm/numa.c +++ b/arch/alpha/mm/numa.c @@ -202,8 +202,7 @@ setup_memory(void *kernel_end) =20 void __init paging_init(void) { - unsigned int nid; - unsigned long zones_size[MAX_NR_ZONES] =3D {0, }; + unsigned long max_zone_pfn[MAX_NR_ZONES] =3D {0, }; unsigned long dma_local_pfn; =20 /* @@ -215,19 +214,10 @@ void __init paging_init(void) */ dma_local_pfn =3D virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; =20 - for_each_online_node(nid) { - unsigned long start_pfn =3D NODE_DATA(nid)->node_start_pfn; - unsigned long end_pfn =3D start_pfn + NODE_DATA(nid)->node_present_pag= es; + max_zone_pfn[ZONE_DMA] =3D dma_local_pfn; + max_zone_pfn[ZONE_NORMAL] =3D max_pfn; =20 - if (dma_local_pfn >=3D end_pfn - start_pfn) - zones_size[ZONE_DMA] =3D end_pfn - start_pfn; - else { - zones_size[ZONE_DMA] =3D dma_local_pfn; - zones_size[ZONE_NORMAL] =3D (end_pfn - start_pfn) - dma_local_pfn; - } - node_set_state(nid, N_NORMAL_MEMORY); - free_area_init_node(nid, zones_size, start_pfn, NULL); - } + free_area_init(max_zone_pfn); =20 /* Initialize the kernel's ZERO_PGE. */ memset((void *)ZERO_PGE, 0, PAGE_SIZE); --=20 2.25.1