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 63BAFC3DA49 for ; Fri, 2 Aug 2024 09:49:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AEF516B007B; Fri, 2 Aug 2024 05:49:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A9E716B0083; Fri, 2 Aug 2024 05:49:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9659A6B0085; Fri, 2 Aug 2024 05:49:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 7741A6B007B for ; Fri, 2 Aug 2024 05:49:31 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 22E581C17E7 for ; Fri, 2 Aug 2024 09:49:31 +0000 (UTC) X-FDA: 82406832942.13.B317DF5 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by imf14.hostedemail.com (Postfix) with ESMTP id 3FD9810001D for ; Fri, 2 Aug 2024 09:49:28 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of jonathan.cameron@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=jonathan.cameron@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722592112; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NdhRjoTcQ852wsYtDg6PXA8CPVK9F1Jo/md5ATAuQqY=; b=o+ym7FP+aU/49PVY0fpZ/HAOgY9UiIB8Ii7DsqHU28TkD2X9iwo3qOeUyjWLDl2t78Krvg Yu68zpIz4cCBlmPta+lEQYEb4mU0YR1/d80vEr3Di21vqBv0uvo9dD1nk9gNFxIRT9rYeP zhaWeg2W+Cg/a4bE9U7iD/Rw7nU814s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722592112; a=rsa-sha256; cv=none; b=XWo/8lwZ6imt9UTkDwxPvruAoSDbKcGp9cFrDmqeKIz9/GMsix+jlt1qhWtXbjsFlrz1vD Q8hb6Qg0Yp7HY91ST2H/i53mCiADSbf8nGYqbD1LpYseP5LrKROWSZI797v5iAkN4WF2BS Feqzxh+KpDicNV3IpIlVqzSHwRWXaaM= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of jonathan.cameron@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=jonathan.cameron@huawei.com Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Wb1G048mKz6K610; Fri, 2 Aug 2024 17:47:20 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id 129BE140A08; Fri, 2 Aug 2024 17:49:24 +0800 (CST) Received: from localhost (10.203.177.66) 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; Fri, 2 Aug 2024 10:49:23 +0100 Date: Fri, 2 Aug 2024 10:49:22 +0100 From: Jonathan Cameron To: Mike Rapoport CC: , Alexander Gordeev , Andreas Larsson , "Andrew Morton" , 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: <20240802104922.000051a0@Huawei.com> In-Reply-To: <20240801060826.559858-8-rppt@kernel.org> References: <20240801060826.559858-1-rppt@kernel.org> <20240801060826.559858-8-rppt@kernel.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 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.203.177.66] X-ClientProxiedBy: lhrpeml100004.china.huawei.com (7.191.162.219) To lhrpeml500005.china.huawei.com (7.191.163.240) X-Rspamd-Queue-Id: 3FD9810001D X-Stat-Signature: oijxns54358mpe1b8qctoztrg6d7ryd6 X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1722592168-132202 X-HE-Meta: U2FsdGVkX1/JkOZj+6vucuAivfFYLMjywOId+wA4GxmF9PPKoOhT44CpI4GaLR7PME0FUbgpFbjwVmlFBI70W5byNZIHKTQjfPuwrH3xcWyDmTnEbqpKPzYf2GyrCnvYwzuFWVbdEs0eCCdHsWxci60XWpg2h0Jf0RiHsNjX8kt+IVBBPMs97rFCX9NQH/SQt0yal3lE4kuxOZyKhBmPMCeq9cKKBKUcX13lnAhy7lf5HUHKheD7BQ8O7SzSyIiANKn1wk75gXyrPBhLUKD04P6wTwxYVdxCYWoTPOGWsT8mvmYHq4Qr6TJAItSFxiZGQjVkBgoOxDhP0bl+8CH8KPdBJX08ECa8e4jllZ6CMptd+5B6juPNeHYwpOIPejXeU5Uvbg16o4rZZgB5U1VQY7/Bwa2uTY09Mnx6AtqZxbmWXbfoQ9V8n+gN/TVRfzMf+Q4ZL1TXCDKodRoscHdJ+mGVQryMCpfts9mQJ89UPWBvH7o1KiPxv9JfNdmYB+JHZx84rNTu3OX7dU5SzjaZXdIwZ57mc3JSZ+hD6cHdfsg6vrVeLMUmVLn3EGV0M5CJzIMSfZ37otwtmzyPaaKYeeHxbYdYs0yWWzknkg6NmAPsc+aXYOCl2Ehjekm6Cu88S26DxXycf/ehEgugNU0hE4qXODIAYEcV+QsBAVf7Z7zPqV/+3REsPZx5jR525WFV/oa1GwTWMY1Jbv6y0r5WGbbdBFLR41qpGaEV+W9ysJhtbTNi/xXsWSFGACpr97q3xjKAuKDlNdqmXWVu3lDhkuFLPlsNBrZGjcXn3w99GDYs7FnqvPc1UeT+46FRlYvvDRdH41by1jm2cMUnXTYn3Ri9HxxX06YZN3FgAOd3iytNmzyD2S3p7pGifQcltlZ38HuJmvOaf+wc5r8JNn6MHq9t0ye8bun5DVY6+bhqPNfxkViH4HjG89bG11FJDn/jQEtr5Nhb8zm4KFmv5HQ KlBP8r5N S6FDR49GRI4ywMmcbc9XdMTdaoO3ioqxj6s8RK3mk5XVoF1WD1c6A+sgmTjBAxT3sImXz6X6+YfIjPwrlpCzCZr0rfLsxR6k/2rmFQZwPN8k4LqHJS7cqOOgcJiJUm7WkftqS55NghFA2CayCb89Xu7fSzdK/YRnovDnGSiVIN176kFjZI1Y4PuwgZzbW7zD707CdEDE2tM7UI9/tzda/0BUMOcX9lG2eSfzYTs01QPX7+chtcy3SoorL9m5V9JFxcmzlAApQ6s9siMwiJwftgPjXPzzyHDRzgcmRwl4SZ8JHYPaXDKGdYrBcUPs5Ev5cOu4q0Ff2W4xON7xvpYsIw5/1AkTEUqXWimXiqaNSa9nFTgixypLFQHjRPB8f+Hkn9TDT 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 Thu, 1 Aug 2024 09:08:07 +0300 Mike Rapoport wrote: > From: "Mike Rapoport (Microsoft)" > > There are no users of HAVE_ARCH_NODEDATA_EXTENSION left, so > arch_alloc_nodedata() and arch_refresh_nodedata() are not needed > anymore. > > 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. > > Signed-off-by: Mike Rapoport (Microsoft) > Tested-by: Zi Yan # for x86_64 and arm64 Hi Mike, This has an accidental (I assume) functional change and if you have an initially offline node it all goes wrong. > --- > include/linux/memory_hotplug.h | 48 ---------------------------------- > mm/mm_init.c | 3 +-- > 2 files changed, 1 insertion(+), 50 deletions(-) > > diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h > index ebe876930e78..b27ddce5d324 100644 > --- a/include/linux/memory_hotplug.h > +++ b/include/linux/memory_hotplug.h > @@ -16,54 +16,6 @@ struct resource; > struct vmem_altmap; > struct dev_pagemap; > > -#ifdef CONFIG_HAVE_ARCH_NODEDATA_EXTENSION > -/* > - * For supporting node-hotadd, we have to allocate a new pgdat. > - * > - * If an arch has generic style NODE_DATA(), > - * node_data[nid] = kzalloc() works well. But it depends on the architecture. > - * > - * In general, generic_alloc_nodedata() is used. > - * > - */ > -extern pg_data_t *arch_alloc_nodedata(int nid); > -extern void arch_refresh_nodedata(int nid, pg_data_t *pgdat); > - > -#else /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ > - > -#define arch_alloc_nodedata(nid) generic_alloc_nodedata(nid) > - > -#ifdef CONFIG_NUMA > -/* > - * XXX: node aware allocation can't work well to get new node's memory at this time. > - * Because, pgdat for the new node is not allocated/initialized yet itself. > - * To use new node's memory, more consideration will be necessary. > - */ > -#define generic_alloc_nodedata(nid) \ > -({ \ > - memblock_alloc(sizeof(*pgdat), SMP_CACHE_BYTES); \ > -}) > - > -extern pg_data_t *node_data[]; > -static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) > -{ > - node_data[nid] = pgdat; > -} > - > -#else /* !CONFIG_NUMA */ > - > -/* never called */ > -static inline pg_data_t *generic_alloc_nodedata(int nid) > -{ > - BUG(); > - return NULL; > -} > -static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) > -{ > -} > -#endif /* CONFIG_NUMA */ > -#endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ > - > #ifdef CONFIG_MEMORY_HOTPLUG > struct page *pfn_to_online_page(unsigned long pfn); > > diff --git a/mm/mm_init.c b/mm/mm_init.c > index 75c3bd42799b..bcc2f2dd8021 100644 > --- 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. Jonathan > } > > pgdat = NODE_DATA(nid);