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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55586C3DA4A for ; Mon, 5 Aug 2024 14:42:50 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=QeZVbyPB; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4WczgY0DH7z3cXw for ; Tue, 6 Aug 2024 00:42:49 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=QeZVbyPB; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2604:1380:4641:c500::1; helo=dfw.source.kernel.org; envelope-from=rppt@kernel.org; receiver=lists.ozlabs.org) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Wczfk1sNHz2y8t for ; Tue, 6 Aug 2024 00:42:06 +1000 (AEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0C63B60C5E; Mon, 5 Aug 2024 14:42:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F5ADC4AF0C; Mon, 5 Aug 2024 14:41:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722868921; bh=KAAzyiSgI5VUznoplq6rpjnO/fNKSFt30uf+NxUGEms=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QeZVbyPBXcN5TPefvaZdSJjjdX4y6Cq/DxczfJ+Znju3yHvNTlO4aXvamUiVWCNfm dJFw3BUgSadYOQ78s/G2NFZdYqOSMyUBf2zL4pLaMFZ2EewzmNmJ9Rhn37EaPRg84N 9/e8uP7RFruygWPGM1gHiLdkGIBlGPcbSW51E1iNan8BRdokqw6NeOBGxu0KFh/Qks mRAvGlnoK48IZtmY+61J7iNsk0pg1002E708O3v+oVXriGyhI/7ytWZoPV2JtIBVsT FjMUFjm01xX837WqtfHRuVUblGy21ffay5yDOackY6gR8nnfP4nTbw6GxA72f9QZSb FucTO3UZRmE+A== Date: Mon, 5 Aug 2024 17:39:41 +0300 From: Mike Rapoport To: Jonathan Cameron Subject: Re: [PATCH v3 07/26] mm: drop CONFIG_HAVE_ARCH_NODEDATA_EXTENSION Message-ID: References: <20240801060826.559858-1-rppt@kernel.org> <20240801060826.559858-8-rppt@kernel.org> <20240802104922.000051a0@Huawei.com> <20240803115813.809f808f1afbe9f9feaae129@linux-foundation.org> <20240804161119.00003a02@Huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240804161119.00003a02@Huawei.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nvdimm@lists.linux.dev, x86@kernel.org, Andreas Larsson , Catalin Marinas , Dave Hansen , David Hildenbrand , Jiaxun Yang , linux-mips@vger.kernel.org, linux-mm@kvack.org, sparclinux@vger.kernel.org, Alexander Gordeev , Will Deacon , Thomas Gleixner , linux-arch@vger.kernel.org, Rob Herring , Davidlohr Bueso , Vasily Gorbik , Jonathan Corbet , linux-sh@vger.kernel.org, Huacai Chen , Christophe Leroy , linux-acpi@vger.kernel.org, Ingo Molnar , Zi Yan , devicetree@vger.kernel.org, Arnd Bergmann , linux-s390@vger.kernel.org, Heiko Carstens , Borislav Petkov , linux-cxl@vger.kernel.org, loongarch@lists.linux.dev, John Paul Adrian Glaubitz , Dan Williams , linux-arm-kernel@lists.infradead.org, Thomas Bogendoerfer , Greg Kroah-Hartman , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Samuel Holland , linux-riscv@lists.infradead.org, Palmer Dabbelt , "Rafael J. Wysocki" , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Sun, Aug 04, 2024 at 04:11:19PM +0100, Jonathan Cameron wrote: > On Sun, 4 Aug 2024 10:24:15 +0300 > Mike Rapoport wrote: > > > On Sat, Aug 03, 2024 at 11:58:13AM -0700, Andrew Morton wrote: > > > On Fri, 2 Aug 2024 10:49:22 +0100 Jonathan Cameron wrote: > > > > > > > > --- a/mm/mm_init.c > > > > > +++ b/mm/mm_init.c > > > > > @@ -1838,11 +1838,10 @@ void __init free_area_init(unsigned long *max_zone_pfn) > > > > > > > > > > if (!node_online(nid)) { > > > > > /* Allocator not initialized yet */ > > > > > - pgdat = arch_alloc_nodedata(nid); > > > > > + pgdat = memblock_alloc(sizeof(*pgdat), SMP_CACHE_BYTES); > > > > > if (!pgdat) > > > > > panic("Cannot allocate %zuB for node %d.\n", > > > > > sizeof(*pgdat), nid); > > > > > - arch_refresh_nodedata(nid, pgdat); > > > > > > > > This allocates pgdat but never sets node_data[nid] to it > > > > and promptly leaks it on the line below. > > > > > > > > Just to sanity check this I spun up a qemu machine with no memory > > > > initially present on some nodes and it went boom as you'd expect. > > > > > > > > I tested with addition of > > > > NODE_DATA(nid) = pgdat; > > > > and it all seems to work as expected. > > > > > > Thanks, I added that. It blew up on x86_64 allnoconfig because > > > node_data[] (and hence NODE_DATA()) isn't an lvalue when CONFIG_NUMA=n. > > > > > > I'll put some #ifdef CONFIG_NUMAs in there for now but > > > > > > a) NODE_DATA() is upper-case. Implies "constant". Shouldn't be assigned to. > > > > > > b) NODE_DATA() should be non-lvalue when CONFIG_NUMA=y also. But no, > > > we insist on implementing things in cpp instead of in C. > > > > This looks like a candidate for a separate tree-wide cleanup. > > > > > c) In fact assigning to anything which ends in "()" is nuts. Please > > > clean up my tempfix. > > > > > > c) Mike, generally I'm wondering if there's a bunch of code here > > > which isn't needed on CONFIG_NUMA=n. Please check all of this for > > > unneeded bloatiness. > > > > I believe the patch addresses your concerns, just with this the commit log > > needs update. Instead of > > > > Replace the call to arch_alloc_nodedata() in free_area_init() with > > memblock_alloc(), remove arch_refresh_nodedata() and cleanup > > include/linux/memory_hotplug.h from the associated ifdefery. > > > > it should be > > > > Replace the call to arch_alloc_nodedata() in free_area_init() with a > > new helper alloc_offline_node_data(), remove arch_refresh_nodedata() > > and cleanup include/linux/memory_hotplug.h from the associated > > ifdefery. > > > > I can send an updated patch if you prefer. > This solution looks good to me - except for a Freudian typo that means it won't > compile :) Right :) I'll post v4 after kbuild confirms it compiles :) > Jonathan > > > > > diff --git a/include/linux/numa.h b/include/linux/numa.h > > index 3b12d8ca0afd..5a749fd67f39 100644 > > --- a/include/linux/numa.h > > +++ b/include/linux/numa.h > > @@ -34,6 +34,7 @@ extern struct pglist_data *node_data[]; > > #define NODE_DATA(nid) (node_data[nid]) > > > > void __init alloc_node_data(int nid); > > +void __init alloc_offline_node_data(int nit); > > > > /* Generic implementation available */ > > int numa_nearest_node(int node, unsigned int state); > > @@ -62,6 +63,8 @@ static inline int phys_to_target_node(u64 start) > > { > > return 0; > > } > > + > > +static inline void alloc_offline_node_data(int nit) {} > nid > > #endif > > > > #define numa_map_to_online_node(node) numa_nearest_node(node, N_ONLINE) > > diff --git a/mm/mm_init.c b/mm/mm_init.c > > index bcc2f2dd8021..2785be04e7bb 100644 > > --- a/mm/mm_init.c > > +++ b/mm/mm_init.c > > @@ -1836,13 +1836,8 @@ void __init free_area_init(unsigned long *max_zone_pfn) > > for_each_node(nid) { > > pg_data_t *pgdat; > > > > - if (!node_online(nid)) { > > - /* Allocator not initialized yet */ > > - pgdat = memblock_alloc(sizeof(*pgdat), SMP_CACHE_BYTES); > > - if (!pgdat) > > - panic("Cannot allocate %zuB for node %d.\n", > > - sizeof(*pgdat), nid); > > - } > > + if (!node_online(nid)) > > + alloc_offline_node_data(nid); > > > > pgdat = NODE_DATA(nid); > > free_area_init_node(nid); > > diff --git a/mm/numa.c b/mm/numa.c > > index da27eb151dc5..07e486a977c7 100644 > > --- a/mm/numa.c > > +++ b/mm/numa.c > > @@ -34,6 +34,18 @@ void __init alloc_node_data(int nid) > > memset(NODE_DATA(nid), 0, sizeof(pg_data_t)); > > } > > > > +void __init alloc_offline_node_data(int nit) > > nid > > > +{ > > + pg_data_t *pgdat; > > + > > + pgdat = memblock_alloc(sizeof(*pgdat), SMP_CACHE_BYTES); > > + if (!pgdat) > > + panic("Cannot allocate %zuB for node %d.\n", > > + sizeof(*pgdat), nid); > > + > > + node_data[nid] = pgdat; > > +} > > + > > /* Stub functions: */ > > > > #ifndef memory_add_physaddr_to_nid > > > > > > > > -- Sincerely yours, Mike.