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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F538C5472C for ; Tue, 27 Aug 2024 08:55:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 630966B007B; Tue, 27 Aug 2024 04:55:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6081D6B0082; Tue, 27 Aug 2024 04:55:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A7A06B0083; Tue, 27 Aug 2024 04:55:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2A2236B007B for ; Tue, 27 Aug 2024 04:55:49 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9397C81780 for ; Tue, 27 Aug 2024 08:55:48 +0000 (UTC) X-FDA: 82497417576.01.341E4D6 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf26.hostedemail.com (Postfix) with ESMTP id DF65914000B for ; Tue, 27 Aug 2024 08:55:45 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DusVZnZ7; spf=pass (imf26.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724748859; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=edrvj8N6roPKYMjXImydBvCzJkV/SgZcOb26fB0+T6A=; b=jjteKeyhNennDOajm35/i9G4/Sg3nJhczZQ4dR9ogphbsK/jJ/O+MFyWKNzArl6UeROjBE I95XABdX89hnMrauhvubaI7erwzG72Rwfk7EKlW9Ur5CZe4vCHGkOh7LWGr2EcAUq719pb uyJlNBsZ0ZRuLDNZdkcOydBRWoh8k1E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724748859; a=rsa-sha256; cv=none; b=2oIYndy8jNfPAJz1obJ1rAVzkc+30x9klg+HC/lmb1Nm2zHaEIRX+NkxFYg73mB175NXPj DJAyCQftsCrkZwcg+6PFlvr7St5Gjs8/PE1/7zGPOaFs6O4XoENnO04bRpUIPNchCwzVX5 UX1F3Ttg2fgXrqerw6KGSRgpAWjmJao= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=DusVZnZ7; spf=pass (imf26.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 2CEDCA4168D; Tue, 27 Aug 2024 08:55:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E362BC8B7A5; Tue, 27 Aug 2024 08:55:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724748944; bh=WLyDwKrTLwxUKO9wLuHMkEx2eqbtMQG2RDk7GrJYDXs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=DusVZnZ7wV2iULh/1avLL75JPrhMhQlBqoECiJtic0bUtwgwuIxQeD5hzgO3OPkyS dpl+eK1bBgzJJ35WOwwwbfdgq1YQrY2eHAEWUAKnv8OixY+PRJYPtQH9Uh4KDOOHgD 2/VI5iJPwBhdC5LsFDFX73FW+2wIcx/umVi6Bv43EvELDrk40xPn4mIuDGkezsnKRA xbs+ZNNQqQDTYUIePAvIqd1K0l/VrmBAarQw0NUQwiKK+jAlMR+ifUUyK+I6EB0ATl 0IqZzSdRMeIajz+pVDlkeyPLq3GoGX7ttE4pCEa3ZuqwGkXktl0F6ooJc0ev3A8Yxa 2+SfAAZCXhU+Q== Date: Tue, 27 Aug 2024 11:52:55 +0300 From: Mike Rapoport To: Bruno Faccini Cc: "linux-kernel@vger.kernel.org" , Alexander Gordeev , Andreas Larsson , Andrew Morton , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christophe Leroy , Dan Williams , Dave Hansen , David Hildenbrand , "David S. Miller" , Davidlohr Bueso , Greg Kroah-Hartman , Heiko Carstens , Huacai Chen , Ingo Molnar , Jiaxun Yang , John Paul Adrian Glaubitz , Jonathan Cameron , Jonathan Corbet , Michael Ellerman , Palmer Dabbelt , "Rafael J. Wysocki" , Rob Herring , Samuel Holland , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Will Deacon , "devicetree@vger.kernel.org" , "linux-acpi@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-cxl@vger.kernel.org" , "linux-doc@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" , "linuxppc-dev@lists.ozlabs.org" , "loongarch@lists.linux.dev" , "nvdimm@lists.linux.dev" , "sparclinux@vger.kernel.org" , "x86@kernel.org" , Zi Yan Subject: Re: [PATCH v4 24/26] arch_numa: switch over to numa_memblks Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: DF65914000B X-Stat-Signature: e64sasq778tcgooaucs1czjp7buqkg7x X-HE-Tag: 1724748945-617942 X-HE-Meta: U2FsdGVkX19i4gza+zO3PIleHq+pVHVHXy32+6pSuNrTXrtsGXj/bQGNdbpRfatBIKDZdbWk29JionyoGFLsnLb3MmRTjDSCWhnwXwpd9CALKFMZvuMFTMAiKfqpXisRH/tYmJUd9VsQQ1/D0d8vTecuuqqXK745Ppn2yct9/t6bpWbE2c7GfgLcqwhgAB2iK1IOMCib1ufqPS4vaKsWBl9itRGuMUXYg5LBZgUa05XfKNROur5smPO3kZCib8ArYdpgiQg23fKCkU4O7ywmuEFGFrLf2dwwAh7SOzMtnA6sryQrkVUdLraAF98/GmxLmRYpWOYgOQ048zelDiwA47Dhvl15M59llfASdPojno8yKAIvQ+5i6pzTiiopz1mhvLKzmpsq3Elpp90MXjJEAHSEAfgQ8pk3xDfiJyX5pj5RQ4Y2N146cVoOLIzxrfmLd/NWKmwBz+QQwXs2savku4SRnYP2ZHV3pGGNBfpFq1lvpk6E+MAb5ft+NzVUWJfWBOPkA2zwiptF3HgfOv2ICriDYuSrwuDAiykN4gGlhIQnEoj9wDqeoLsEmy0F0p8MPejPVVbNciTEZgeuXPAQuuCcxKhgysJ2l7OKly/vzSa1jjOlsJvxZ4vRoE8FWOjzRAMAhXW0K0VOXyejmE8+ZMqdp3L0kD6uunhIRaXDOHB3sqkX5a3T/ZqrTolxoWKcKNYM5W6fAWVC/S3lgFiH7d0fAtmft6mk/dmL7w8wYUgihghY9iFESS/A+8S5bbyvbcy2UdF77reQwb0oIrAsl+7F5n5S7ANhtFv6xT2XVumt9qB18kS7NvYT4OqGFwUCV0aJzg+w0gkDwjVoP5fVIbJh60Q99RxArmZQFCkVg/AujjqgRYACQXxrSexJPOwTr5PPu2ilJKQwH8oohsYOJz4GMmimz1mW+kt3fNFE/OxpSJxj304cHkrztYDdZcc+S7R/XCcqtJfOAWobp12 bxuJTI4f vyPDW7gtDh3AivSoIn1PtPjxbFZ6uzYo9g/nvTV37TFA8rFxgNE9bun/KoEmOw9M1EYRN8QmV7Q5D7sh2MkA7UEQL6jFeypL7W5bxabZaS37z7EVprVKKdSK/zSWvBU6eVLRlkHC1jbthR6Z4ejSxMOH+yRJ7cqQHal9aE1e0p5GhuIj5gqgucblzlFtL9linGn5enY3Bbn9aDF39ZhKnFdTk67/TOo3hSYySDv+Fgo4ImFa5OX1Mgw/aObPBJj3GgzQ81+ICAWcTnbEj+Z6DLjVO0VREYPoXNQf0N7Ct1v4p0n8N5352OMAANlX2T3v/XAV8viNabwRWwHByfBTyxnWudsRJ/Nzcw/Kzb+RUasyCTGb1oD7LHm31L9WZUFPSCAj8IwaF1HDaDHrgcvHHVgpIxnvxEdU0mO6U9ytBjwMZOfX8eA2LVYKUZ0RqITyDFUcDpkPL3VGTAF8uPCBOAlHUoRf8eWGAtVuIKc95VzWEpfArS46EX/lCw4t9AkTHIUw1 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: List-Subscribe: List-Unsubscribe: Hi, On Mon, Aug 26, 2024 at 06:17:22PM +0000, Bruno Faccini wrote: > > On 7 Aug 2024, at 2:41, Mike Rapoport wrote: > > > > From: "Mike Rapoport (Microsoft)" > > > > Until now arch_numa was directly translating firmware NUMA information > > to memblock. > > > > Using numa_memblks as an intermediate step has a few advantages: > > * alignment with more battle tested x86 implementation > > * availability of NUMA emulation > > * maintaining node information for not yet populated memory > > > > Adjust a few places in numa_memblks to compile with 32-bit phys_addr_t > > and replace current functionality related to numa_add_memblk() and > > __node_distance() in arch_numa with the implementation based on > > numa_memblks and add functions required by numa_emulation. > > > > Signed-off-by: Mike Rapoport (Microsoft) > > Tested-by: Zi Yan # for x86_64 and arm64 > > Reviewed-by: Jonathan Cameron > > Tested-by: Jonathan Cameron [arm64 + CXL via > > QEMU] > > Acked-by: Dan Williams > > Acked-by: David Hildenbrand > > --- > > drivers/base/Kconfig | 1 + > > drivers/base/arch_numa.c | 201 +++++++++++-------------------------- > > include/asm-generic/numa.h | 6 +- > > mm/numa_memblks.c | 17 ++-- > > 4 files changed, 75 insertions(+), 150 deletions(-) > > > > > > > > + > > +u64 __init numa_emu_dma_end(void) > > +{ > > + return PFN_PHYS(memblock_start_of_DRAM() + SZ_4G); > > +} > > + > > PFN_PHYS() translation is unnecessary here, as > memblock_start_of_DRAM() + SZ_4G is already a > memory size. > > This should fix it: > > diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c > index 8d49893c0e94..e18701676426 100644 > --- a/drivers/base/arch_numa.c > +++ b/drivers/base/arch_numa.c > @@ -346,7 +346,7 @@ void __init numa_emu_update_cpu_to_node(int > *emu_nid_to_phys, > > u64 __init numa_emu_dma_end(void) > { > - return PFN_PHYS(memblock_start_of_DRAM() + SZ_4G); > + return memblock_start_of_DRAM() + SZ_4G; > } > > void debug_cpumask_set_cpu(unsigned int cpu, int node, bool enable) Right, I've missed that. Thanks for the fix! Andrew, can you please apply this (with fixed formatting) diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c index 8d49893c0e94..e18701676426 100644 --- a/drivers/base/arch_numa.c +++ b/drivers/base/arch_numa.c @@ -346,7 +346,7 @@ void __init numa_emu_update_cpu_to_node(int *emu_nid_to_phys, u64 __init numa_emu_dma_end(void) { - return PFN_PHYS(memblock_start_of_DRAM() + SZ_4G); + return memblock_start_of_DRAM() + SZ_4G; } void debug_cpumask_set_cpu(unsigned int cpu, int node, bool enable) -- Sincerely yours, Mike.