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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 8142AC3DA64 for ; Sun, 4 Aug 2024 15:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:CC:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GQh4d5T6fI/s6GHZXKwudoflgjYKr0AOYtmXSbOJYQU=; b=ENYoMBBqDIoHsI NaewTV96mS99HQ0+OBoDkeGcmEMzJ32CfTDPWKLmS26A3agorHzsJgYeWVwerooCApnkDaM7C5P9q unPyPHUa8/9d3Z3oo60YshPzE2IGdWv2+pMrt9yMjn3xrQwFZ1MoaOXxxk+Wta9kPACarYhqotFMh uHBVr6/5/7T7Iblbo3j0m9G7ErOzprEzTueL6zNBQbaBoSUitVdU7W/3G43VpY3TlOXestD55aRQI toEhY9JEbZl7+OSp8UepbwUrFNRIpKXI9T7lJ33vTy/ty5CXu6p/pulaVRQkHk0QKMpL6oxgA3DQb X7FSHd0ZOytr4sXmn+Vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sactq-0000000DTks-3WPE; Sun, 04 Aug 2024 15:11:58 +0000 Received: from frasgout.his.huawei.com ([185.176.79.56]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sactG-0000000DTbO-0j6j; Sun, 04 Aug 2024 15:11:24 +0000 Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4WcNJB6tQWz6K5Vy; Sun, 4 Aug 2024 23:08:58 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id B33CF140A35; Sun, 4 Aug 2024 23:11:09 +0800 (CST) Received: from localhost (10.195.244.131) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Sun, 4 Aug 2024 16:11:08 +0100 Date: Sun, 4 Aug 2024 16:11:19 +0100 From: Jonathan Cameron To: Mike Rapoport CC: Andrew Morton , , Alexander Gordeev , Andreas Larsson , 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 Corbet , Michael Ellerman , Palmer Dabbelt , "Rafael J. Wysocki" , Rob Herring , Samuel Holland , "Thomas Bogendoerfer" , Thomas Gleixner , Vasily Gorbik , Will Deacon , Zi Yan , , , , , , , , , , , , , , , , Subject: Re: [PATCH v3 07/26] mm: drop CONFIG_HAVE_ARCH_NODEDATA_EXTENSION Message-ID: <20240804161119.00003a02@Huawei.com> In-Reply-To: References: <20240801060826.559858-1-rppt@kernel.org> <20240801060826.559858-8-rppt@kernel.org> <20240802104922.000051a0@Huawei.com> <20240803115813.809f808f1afbe9f9feaae129@linux-foundation.org> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 X-Originating-IP: [10.195.244.131] X-ClientProxiedBy: lhrpeml500003.china.huawei.com (7.191.162.67) To lhrpeml500005.china.huawei.com (7.191.163.240) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240804_081122_508233_E4DC0521 X-CRM114-Status: GOOD ( 38.59 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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 :) 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 > > > _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv