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 3102AC3DA59 for ; Mon, 22 Jul 2024 07:37:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C24356B0099; Mon, 22 Jul 2024 03:37:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BAD8C6B009B; Mon, 22 Jul 2024 03:37:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A7F3C6B0099; Mon, 22 Jul 2024 03:37:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 8B0E16B0099 for ; Mon, 22 Jul 2024 03:37:24 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2FAB68029A for ; Mon, 22 Jul 2024 07:37:24 +0000 (UTC) X-FDA: 82366583208.12.8FFC55D Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf30.hostedemail.com (Postfix) with ESMTP id B47368000A for ; Mon, 22 Jul 2024 07:37:21 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=V5rEoxjJ; spf=pass (imf30.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721633819; a=rsa-sha256; cv=none; b=11/wD0W2FtiiDoVmA8CPAr+90LauwtleCGAv1Maa2qHcUleDkK2DhuqdOqXidv88x58MTB 8PfwRZoF7xM9Dn4eaHk7XBAsz29QKhYNBS/Gl1uoLeJxO/1j+rpqQ0vhrgFeVMZDDwdjR5 BYbLOpVkQwYYmeVIxaBek5cIbScSass= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=V5rEoxjJ; spf=pass (imf30.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 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=1721633819; 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=u8pyhZF8JePcVWlxZmDuXf307f3nQV2zunDHCr7yCXI=; b=spBiMfXlWwGbTtxPiR7o7An7l2hhMMKOncSLMoYyDSQ0YbxHAfBYmOJ8z/Iwp44AsCtbDh ReTXKYXkPGLwA+4HE6Pe8LDk0UQOrc9zIf8acgt9cLjm+iwYUZaCtfCoAbPFSw12ff8gYp W5UesfjrvbCCXvEM/uiZu1Ka3HLfqOY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 7105ECE0B0A; Mon, 22 Jul 2024 07:37:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C14EC116B1; Mon, 22 Jul 2024 07:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721633837; bh=Dxslf8J1nw2EoO1825aVEeJAxLrpHgQU1wjgg+XF/0U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=V5rEoxjJyp8Si4Ol1tKmDHfxujD1M6arK5yB3md41TgtMqzL7133QUbpMAiRqALI8 zHqP2jnhANmIGx1K6HRYtObkAQqmVJ2vQFti7pCzHaOzz0dds7xFt2urt534cJHiXw CurmUQ1pi3n/TpSSCUqTSIn7TV/EpAfGuHiiiLk6U01osyb6JXJ0yznQ72y9r7YmE5 p6fsNYiqRdEsZWZ4qQtfi/2IxHr6rbbdo6JlW+fM0tWjobtA9os1Uj3kz7eGY4SLEa ISuNDqsn9MvH468ghs8RFDYohLKYRIm2o5BjdJ/Ni63NJJU1x+XnEdyepZgDkMsXF7 by+28UouvqBSA== Date: Mon, 22 Jul 2024 10:34:06 +0300 From: Mike Rapoport To: Jonathan Cameron Cc: David Hildenbrand , linux-kernel@vger.kernel.org, Alexander Gordeev , Andreas Larsson , Andrew Morton , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christophe Leroy , Dan Williams , Dave Hansen , "David S. Miller" , Greg Kroah-Hartman , Heiko Carstens , Huacai Chen , Ingo Molnar , Jiaxun Yang , John Paul Adrian Glaubitz , Michael Ellerman , Palmer Dabbelt , "Rafael J. Wysocki" , Rob Herring , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Will Deacon , linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-acpi@vger.kernel.org, linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: Re: [PATCH 02/17] MIPS: sgi-ip27: make NODE_DATA() the same as on all other architectures Message-ID: References: <20240716111346.3676969-1-rppt@kernel.org> <20240716111346.3676969-3-rppt@kernel.org> <20240719153852.00003f44@Huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240719153852.00003f44@Huawei.com> X-Stat-Signature: 4pdksbb8uij13hzct3egptg37uwc7peg X-Rspamd-Queue-Id: B47368000A X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1721633841-89069 X-HE-Meta: U2FsdGVkX19c7bjE0n3J88KhquwlAiPrvw5qHauMKUpdGxoSQJgcOnvhR5xpElcypIVDMcPhzw92t7axhvG1OfKhz6QmFxg/OSFZTPcIvd7zKWWwGmMsYHW+TaO54TCvLMjyyKNSY0FC2TRqhL7ujwb4Q2DGBEUF1iH5wQsT1nxS4SVXtRJrqhQXcdRpHp5PJIL4xcKYCFxE0Hoo1L3+ypG3GWAFgWILEgvcmYSbVYpoo6vl3R/nlWmmoPK1uKmmh3UQm1sgIbsuKcjqb0eLKMO9zwkuvyKMTwBIUBkChlefc6cPRBBVdLBPY66CrKhVKEyVXscyOpxmgdyFCUMYtAPoG7CeUh0SFbALJlrj2iStkql/EAY3+M6ZWdZa4mBED9eX0OeMzA6/iVuqjCp2FHwJ9WuU2zxjF9+npbEtubnqxovsXyXhCKiv83R0vJC8voXJE5DYXGmEV3enGT0E3uKs8zHUfFCnKMpO9UpKd16jhok8H+9jiTpgjCX7PJq0a52ZLv0NWv1E3lS3o8p6FxUUJEdGeUSk+Xv0Ztv1OL9OIhUqbg0WiKjlXQk5XjAG0kSZFvfrgiEieaZqoDlpfYaODK2P+D+bdVht5DmYQgZ1HTQSjEcnALerikeW5RenbuJdI/GmO51gbMce6jwNctnWAYCtNQejDqjFWCUDcY6uRhjkCNmV8lmocDrzoIt/rKpdvEJgNX1lzMSeIrz79hjHrVLRhb1D414Mqu69vPSZIpKN8n+bql5zfEO5FTcN5N2jDFb7vl5P4/Za2cNqb/j6uA+VRU28ePk/tNHCjd6XY/hlmPxOmtK0uED1AiMHxj0+uZMlV6+fjzQXO6U3GWcerYjdNAmMpJsaGCqBk0Z7MWCGQ8vlny8WUEBHuxkDhlFM82Dt6X1FNzmafPu61P8Y8vtDvbHMs5F4wLNmsByW2DdyW5t8hEgyLA02emqBtOmMPPbD/Z1hBjXXjMx fvpd1owP m9/hzH9nx5OG2TzWJCWrv7XS9mQI5BPmnr7yPDHoOuBkND/mgwo8dkqia7Za53P+y+hpWdsVVaqhZRIZSMERs5id2+XG4WsL7tt3O6FJ1kR10d7BAXCAjeVfd10ojaQjTs68QMbaYcMp2wHbAkh9Yn/80y7mwhGOp7KnH0OY1SS7Fkbvvacls9s4HbVyOETaPpWKe+5xqT35jT+9YQptCvVNBDZ3SAb+AkUytfXbWoqlL7BIJinNBS7Qu5QceDvCr8nd2B0dpyLVbM1ddUWvDBxTG152lBYuv2rN0/eLVc/DjEf78TMgSIXHoI935rVwefN16oi3TMv2csUPQu5fuQLjXOAzUlk8AY6gBt0Ys7SNwMQ2DNQi0DnotQ/TSghwQCXHUiPBkVbAFZdOKoe+raTI2ZgjRia9SZXMZ 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 Fri, Jul 19, 2024 at 03:38:52PM +0100, Jonathan Cameron wrote: > On Wed, 17 Jul 2024 16:32:59 +0200 > David Hildenbrand wrote: > > > On 16.07.24 13:13, Mike Rapoport wrote: > > > From: "Mike Rapoport (Microsoft)" > > > > > > sgi-ip27 is the only system that defines NODE_DATA() differently than > > > the rest of NUMA machines. > > > > > > Add node_data array of struct pglist pointers that will point to > > > __node_data[node]->pglist and redefine NODE_DATA() to use node_data > > > array. > > > > > > This will allow pulling declaration of node_data to the generic mm code > > > in the next commit. > > > > > > Signed-off-by: Mike Rapoport (Microsoft) > > > --- > > > arch/mips/include/asm/mach-ip27/mmzone.h | 5 ++++- > > > arch/mips/sgi-ip27/ip27-memory.c | 5 ++++- > > > 2 files changed, 8 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/mips/include/asm/mach-ip27/mmzone.h b/arch/mips/include/asm/mach-ip27/mmzone.h > > > index 08c36e50a860..629c3f290203 100644 > > > --- a/arch/mips/include/asm/mach-ip27/mmzone.h > > > +++ b/arch/mips/include/asm/mach-ip27/mmzone.h > > > @@ -22,7 +22,10 @@ struct node_data { > > > > > > extern struct node_data *__node_data[]; > > > > > > -#define NODE_DATA(n) (&__node_data[(n)]->pglist) > > > #define hub_data(n) (&__node_data[(n)]->hub) > > > > > > +extern struct pglist_data *node_data[]; > > > + > > > +#define NODE_DATA(nid) (node_data[nid]) > > > + > > > #endif /* _ASM_MACH_MMZONE_H */ > > > diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c > > > index b8ca94cfb4fe..c30ef6958b97 100644 > > > --- a/arch/mips/sgi-ip27/ip27-memory.c > > > +++ b/arch/mips/sgi-ip27/ip27-memory.c > > > @@ -34,8 +34,10 @@ > > > #define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT) > > > #define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) > > > > > > -struct node_data *__node_data[MAX_NUMNODES]; > > > +struct pglist_data *node_data[MAX_NUMNODES]; > > > +EXPORT_SYMBOL(node_data); > > > > > > +struct node_data *__node_data[MAX_NUMNODES]; > > > EXPORT_SYMBOL(__node_data); > > > > > > static u64 gen_region_mask(void) > > > @@ -361,6 +363,7 @@ static void __init node_mem_init(nasid_t node) > > > */ > > > __node_data[node] = __va(slot_freepfn << PAGE_SHIFT); > > > memset(__node_data[node], 0, PAGE_SIZE); > > > + node_data[node] = &__node_data[node]->pglist; > > > > > > NODE_DATA(node)->node_start_pfn = start_pfn; > > > NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn; > > > > I was assuming we could get rid of __node_data->pglist. > > > > But now I am confused where that is actually set. > > It looks nasty... Nasty indeed :) > Cast in arch_refresh_nodedata() takes incoming pg_data_t * and casts it > to the local version of struct node_data * which I think is this one > > struct node_data { > struct pglist_data pglist; (which is pg_data_t pglist) > struct hub_data hub; > }; > > https://elixir.bootlin.com/linux/v6.10/source/arch/mips/sgi-ip27/ip27-memory.c#L432 > > Now that pg_data_t is allocated by > arch_alloc_nodedata() which might be fine (though types could be handled in a more > readable fashion via some container_of() magic. > https://elixir.bootlin.com/linux/v6.10/source/arch/mips/sgi-ip27/ip27-memory.c#L427 > > However that call is: > pg_data_t * __init arch_alloc_nodedata(int nid) > { > return memblock_alloc(sizeof(pg_data_t), SMP_CACHE_BYTES); > } > > So doesn't seem to allocate enough space to me as should be sizeof(struct node_data) Well, it's there to silence a compiler error (commit f8f9f21c7848 ("MIPS: Fix build error for loongson64 and sgi-ip27")), but this is not a proper fix :( Luckily nothing calls cpumask_of_node() for offline nodes... > Worth cleaning up whilst here? Proper handling of types would definitely > help. Worth cleanup indeed, but I'd rather drop arch_alloc_nodedata() on MIPS altogether. > Jonathan -- Sincerely yours, Mike.