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 CDD08C3DA64 for ; Sun, 4 Aug 2024 07:26:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2533E6B007B; Sun, 4 Aug 2024 03:26:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 202426B0082; Sun, 4 Aug 2024 03:26:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A4FF6B0085; Sun, 4 Aug 2024 03:26:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E26846B007B for ; Sun, 4 Aug 2024 03:26:37 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 859B71C3D42 for ; Sun, 4 Aug 2024 07:26:37 +0000 (UTC) X-FDA: 82413730434.23.E7C88E8 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf19.hostedemail.com (Postfix) with ESMTP id D096E1A0008 for ; Sun, 4 Aug 2024 07:26:34 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KIU8LoVO; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722756335; 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=WLB/1LrMczVhIpg0eoKxFksl74MeXTVJEYNugS5R0Kw=; b=Bt24Vt1rrv6H0C8kW7JVJ8ZKexJ5LHh6eWpX4v2EMYvDgFf4/3osSKuvnpLkAOkdONmdfz 0xAx39lQE5Kk54+u4CxX0K+pGpqnQ+ZQPl+JQfuy1r/66ZMVLVs2YyWs/A2PClnG2pvbUd nV1Hzp/K29tzILB9Aw+56Vz/MVeyBvs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722756335; a=rsa-sha256; cv=none; b=tBEUdhbJTnQ8HupKFwQlPvJcx3sBQgMWm1h1x8j5BHW8EDDUkYk1OWwiiXRc0bmcqwxdpJ LlGCuMuiP0F19SmeMkiYwqdX7r1/p+D4JSNljPpUIqwrDWGZfn1RmQDo4McXX5rwQsbmqK uXiF9OfzK45ntZ8kQRKanlpmjoEutUs= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KIU8LoVO; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8829660BD3; Sun, 4 Aug 2024 07:26:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD611C32786; Sun, 4 Aug 2024 07:26:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722756393; bh=rx2UdBu3Jn4YvMBlkSpIvWfaZAHG3g5eVDYxreRC0w8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=KIU8LoVOwFPBw/i+e9r4MNw3lCZ9Vibx6Dii6JlG87646MCH9g5WB4uLhl1sgD8XY fdhDH8dGci/plC04bp2qqqFN5dQbJHMWc6fWKJYivJ+bk5+GubVSlg3B3t+HSNIfir JTwRTaCcEoGzTNU1jYvwPfIqnBAdwUe1xFf3HqAX19LfaXMjWdmtrEyuqIK93JEmBz EFHb56nL5u7GvI90DNZwVtfaVmCpUg9fU4iOezzHPPuQFpcF1invnI5Iw9ThB6TUT4 ADe9mcgPXLgojRwwccp6Y65CANZWgRQC4iHBhVf31YxxkVq1gi+zDus1lvqFhKf27J Jc+qx/YNiH/Gg== Date: Sun, 4 Aug 2024 10:24:15 +0300 From: Mike Rapoport To: Andrew Morton Cc: Jonathan Cameron , linux-kernel@vger.kernel.org, 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 , 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 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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240803115813.809f808f1afbe9f9feaae129@linux-foundation.org> X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: D096E1A0008 X-Stat-Signature: h8wwmp3u6z88dqcho6jf8dsj73yfjbbk X-HE-Tag: 1722756394-181183 X-HE-Meta: U2FsdGVkX1/j+rEG/wcsZFtvFNn/g4gOqX9zjxzgai01uhDtCFdyDHYKxYVuQJpkGV3UV1WWI9opyA7Vs4Z0S2fn3bAQPFwmOudp6n8O0V7JAhhy3sEQir1cCO8X8unR49FlrNrQQgmm/I67C6jSG8jlkCMyP/p5vFvlmkt+stYH9lpouFQBE90087lW14hvvjg+TZL9kYtL0Bt3U8iX2i3G4lS5LcJ+UJuPEcFeh/uXuF948XFGeCqiUytbNn0ATh/zGCMoSPsq7nn34b2Txi8ohIYSnBKVny5RpJ6zxNB9zQqDJxKuhqy1QVUaHmQmWqh5xCioUObcVXwfy4y798v0Gd0ZYISW4KtMsr7/GuwztnANt1icOww2ZHIo4NqSJAPlDX2CH+7KEpLZApelg0WHYlvdoU5SkTQEfTJEs6ZJHZGC0VxoC5QgZOaYotFoGr57BS6U0H8o9iNh1QPzAX4Ok0mIYwEXxMNEsJ5TKD08c6KzhEGiqlr+VRXy31vNk576zIVKn8BhCtqLLRZ6JvnBlQHmYPTyB0mdKry8BC5MBNWGdz/72cpmPW3U70slI4qykomPpu3yAJ7KBnrF1oWBetnx14z4FhXGDl5Bj0E7mXTwukEJeFyvpUxu3OjNhz4qL4TQ92MrQRAnRVqDXYlEjSxuj/XVWnayF2XTzRg0ZyDbe9uGw0qnoFyRi3XNcRCyccSGboaA8Mwv1bFPI4A379ylciDk98zPGLaHskadDvP7w9aka7m/8CpsfeZXqn6yZ6xcj38x0eRkLh26CLC0dHMHIkCor7nHpRpsZX4VKh9hLgxLl4fsy33uoPI8bT3mvGJNPxkgyn2JzkyRzbgDrFpykv/lkeMz8AeUnzVWFIbn5UEUU9fwzg+MJeMyWpRtyP1Mg1JbRlIVy5z6ZtWH2RqMQqVKKO+RT/7E4R12jgm55lGzhyJK4JVvvyRZiyRwv5u3FJH66PY2XML LXDTnXkE uUK59lU3MsoOFDVSWRihkV0CiqYcqXp/VacUE/vU2xVzADfFKTULdlVKt+81+oH5sTzQQQ5ErWmRVns93TY4AFYiJo5/2Q6lG1Ac6EoMJsKCOzJ8gwaE8jWGsyuwCAHokxSIHQODfJJ1joevNtLJ43JBiM9NqxGNvlnUQ0lHCpO9IvKUqWABFMZsxT4X0p2CrrS68FQ4duqKDimI1ny6Q/WCrSj2+wgWM2oBW1FZlUnnjrFyYHFcDlFblfDq9DyqT3O4K9RdyIxmU9efaJEAJrVCUtrGEUGDpPMvokvFkuccZBWU2Paid6nnZAGEAXXgRMiCAyHldrBZtvfFkRMvbSe0skA== 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: 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. 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) {} #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) +{ + 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.