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 00B2BC3DA4A for ; Mon, 5 Aug 2024 14:42:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E3876B0085; Mon, 5 Aug 2024 10:42:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 892B96B0088; Mon, 5 Aug 2024 10:42:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 75AB86B0089; Mon, 5 Aug 2024 10:42:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 573A76B0085 for ; Mon, 5 Aug 2024 10:42:05 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EFAC51C52C6 for ; Mon, 5 Aug 2024 14:42:04 +0000 (UTC) X-FDA: 82418456568.23.6CACCE0 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf16.hostedemail.com (Postfix) with ESMTP id 31917180007 for ; Mon, 5 Aug 2024 14:42:02 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QeZVbyPB; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722868873; a=rsa-sha256; cv=none; b=8lHerD4h1bD/BzPZ4hEZ9Xaa+PN+g2YdfJjyYgeLoxqQNDJ/GDNaae5/p8eLqUJ1mpQxVQ IZqzeW8T1+y9XS1ikXLmSQCZxne3v67Kq2Veg4njezVDkJlQSqFIXG2aTRSpgJgzt+DwzD iUfaEsJjQCvtz3XzPeq1O+kVzBGwIhA= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QeZVbyPB; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722868873; 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=jXD94eK81SzpKGOoHJLQZUWayMa9lAkTG7KF/K0fyvE=; b=hk4yNBGrBZr08sP6nLLzOuonlT6a5S7TqU5tcMrw5vuUcLNsLYD6y0L9r5/iVDiaL+ApPu BRs86AwqC6vznH/+kXsGwjQ9xzpCdIb/Kw2yje99qbGfzbcKYaAxiN/xZmmCFsyV8ZmeEZ OF4FgwY0eG6AmLyFceRHRvX3HzK3i68= 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 Cc: Andrew Morton , 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> <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-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 31917180007 X-Stat-Signature: zngriqatmjnbkwajcr9dhqyowew4576g X-Rspam-User: X-HE-Tag: 1722868922-38850 X-HE-Meta: U2FsdGVkX1+8sNZDsiwMJ6sw9jTamK+1g/VzZyfTXwEr94IZX01L0H0WmpAJzyj5E0bsR+lL8J2aH1i/yPLRgN/gDMxtrmZWTWHj6NMuHqNIkNmk6BuB6Q9wcUcTAPI4hsyDGiF8yUKIYJy3jcZOCQnkl07ZCm5RXOqcYNxZ3rM3AiI3NNO2hFCAt2J9b2HmBcddVcGckWXKC7V7GbdVuJyyRHPSlTyJ1mAblEWn3yljbDSL7taEDUyEwSlyjhizRG2y/3YSGa5KItij8dsI3urMG0Y6k6oz9GdHE0T0fI0iHsz/w5a13MwfJpJj5EudYR8AxlbFMNAbkDAwl2RCTrKiISzppDFAmiUBmNUfHX1p8b32HrejbaCCCW6mk3BuXL1U8CmNOuzsawwCqXjmqGRxTeyCYqKrKB4BBX6M5k/q9W7MDyIk+GNtnMzSGwyD2j2gkGv8Orj2sZZj0Z6HHfBl4/d6OlG5X5De+Wrfx5xRG6K6JykCJrCcrDqZ3cBqbjfONd8c2XDJJ+kPOr0sLMN70vq2Y59+ufweAE9L23lAJKExncJoZsZYXjfdAIWP144KsaslLgFCz54KWZLAPPffAai38A416eyrCGHFdVTe9c83baSH7msZDWU0+jvaeLdJHTDWwSwt3wq+vEHP9lEwb9ga8Vv4En6jXOFZQgPkKqzHxPalB2FWf6abOveAjsd78UCOjfk38bPzLNK5XX+Q488sdVW1/3U7WtyQynAMJnheAX20PNJgc9nJ1lOfdNofTUvrX/RddYw4V/myNcriiujd47/e1lYcmBMeWXurJQkAP9oseqTyr7x/3lsC+DjCMLLaugZL25jyYZ3CkIz1RmhZr12Wp5ennmYPbx1GOBa8JFQtyiM3yb1u5ZqDaSMQAbNja/cbvuTrp5qFGz7rem6T7re4N3AUS6FlHQV4kzfY/N73UyRaKsBAQ1JTlF+SwoqxEngG/MV6+kK adJzmwkV 16BumUKKmCQyIyPsVMGXx3w7wBtjD3YlXeOnnNzor5wcW/2BzIK/CoemTPWOjyj81wULGlDCBweUtn7LEaL33VB+XgdGPNqeceg0VkFVQnXPNevaXvqes+w6QIQf4w52aVsQnLC/dSGyJUZKCJq2uoTeJ1i+UiKRch9Tb4me2amsKYV6G21V/1hCuCunrRUZlKvKjfiFg5HJQtVNgNAc9QKTJ2swqsf3PpPICyVGyJbN8G454zfXZHMZn7VM21gBJIREtrt9gcd4rNqNKLtuTW7USJXhLUkD8ejrZu4UKczZlze+0GpDglRvF4nRcmWKaFRQjcryViE9LA5qpWTs5zoAAbxDlYfcOFJQOPeLDlpx4NIlJ9Yg9It1+Wa/fXqmaFikJ47DmuWRi1vk= 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 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.