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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6B416CCD184 for ; Tue, 14 Oct 2025 15:39:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B71D48E00CC; Tue, 14 Oct 2025 11:39:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B49848E0090; Tue, 14 Oct 2025 11:39:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5FC88E00CC; Tue, 14 Oct 2025 11:39:49 -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 943818E0090 for ; Tue, 14 Oct 2025 11:39:49 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 38D2D5C08D for ; Tue, 14 Oct 2025 15:39:49 +0000 (UTC) X-FDA: 83997130098.23.7BA5F3D Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf06.hostedemail.com (Postfix) with ESMTP id D4E9D180007 for ; Tue, 14 Oct 2025 15:39:46 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=s+Vgw+ku; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf06.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1760456386; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gvxPlkHyNN4Ev5gVwdQJWsjGxQipg71xBw6FqJLZhTs=; b=o2+XRxQdOkZlat4V5ZLRMbZ6nVB1gJ20b47ktkkYwhYAOdWIqrGnQ9Z2j40RNBcTwvIBlw 5au/JaPj8SXhK6ni7uIACw1+P+AcfnM/aKbOsKaoGEN3hKaHlt77sQWQjcpW1FNuO2/v+w DTcfE2kNWBV5RGqUSg7cl4MVEkMzEbs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1760456386; a=rsa-sha256; cv=none; b=fAOt54rhtg8AhJm7uvT28A23VhIEG3s1aWZZzhoTHbUseCHgvR7gfvi8iXOB/IH7qxaLfQ TNTx5vYLXsnEWcKR0q0uN0OnFBsJsiokm0j5U6ytC+VOyP+E5h8ma8Is4Fuqb/etdl5749 naHaGJkTx95Z9vjGyHLrXwXz/HMAKKs= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=s+Vgw+ku; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf06.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 59E7VB7v003920; Tue, 14 Oct 2025 15:39:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=gvxPlkHyNN4Ev5gVw dQJWsjGxQipg71xBw6FqJLZhTs=; b=s+Vgw+kujD7UJ+KsoqEcaOaFNiell3E+j O/4+UTYOrGgymLOhKbWDHmwrrtK9tk7rCajzBDCIZiHX9m31a4/c/XWjoHkwJ69E E6IDOyOoU86AwnmduuFULDdb4dxXtA+ZnKEZWN4S7l/iIBTXc63TL2otgeMYCUpd du74BSyyDE5h4kwBMKk/pcotAVlBF5EAn8p4UrARfvssNyt+3K5csIfCV4VPbyGS KsNftS3JXSC5OTIzhRKjCipvBhwsJS8E0kjAVnSon7tAY4XXdApZjt3C99Tm6e3K EW1pIneV4cNBJNYnIcqxUlujFvxQkMvDFaL4ebvjmDeh9JHYs+fRA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49qdnpf5yy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Oct 2025 15:39:37 +0000 (GMT) Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 59EFagnO026314; Tue, 14 Oct 2025 15:39:36 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 49qdnpf5yv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Oct 2025 15:39:36 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 59EFJC0F016705; Tue, 14 Oct 2025 15:39:35 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 49r32juk80-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Oct 2025 15:39:35 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 59EFdVCV25363010 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Oct 2025 15:39:31 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B547220063; Tue, 14 Oct 2025 15:39:31 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 766D02004D; Tue, 14 Oct 2025 15:39:28 +0000 (GMT) Received: from li-218185cc-29b5-11b2-a85c-9a1300ae2e6e.in.ibm.com (unknown [9.109.215.183]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 14 Oct 2025 15:39:28 +0000 (GMT) From: Donet Tom To: Andrew Morton , David Hildenbrand , Mike Rapoport , Oscar Salvador Cc: Ritesh Harjani , Aboorva Devarajan , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Madhavan Srinivasan , linuxppc-dev@lists.ozlabs.org, Christophe Leroy , Peter Zijlstra , Ingo Molnar , x86@kernel.org, Greg Kroah-Hartman , rafael@kernel.org, Danilo Krummrich , Dave Jiang , Donet Tom Subject: [PATCH v2 1/2] drivers/base/node: Fold register_node() into register_one_node() Date: Tue, 14 Oct 2025 21:09:16 +0530 Message-ID: <910853c9dd61f7a2190a56cba101e73e9c6859be.1760097207.git.donettom@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDExMDAwNSBTYWx0ZWRfX6GjH7wqcz2zp /D+UekZgPJq2hB9+MnN9YhX6lI9/fCVcjxfkufO6cf4Hnm2uKk7rpeCG9Tq08lxz/SIohOtVWTT WEgW0Y6lc2dyE51H+LG6rZdN7o/yktTid9KkbHxKaUqWtgM5/eqvNyelkDCAgYvUulFMvq3cqFF OzIiYLE/JGlAcLQyt4bfvY57xJpGX4WHrVPr51sbFstzSUoTKZW2RraxVNExz2V3OZc8n9iWYMV IQrswSXM4jycgHMBRAHN0GFKkWTUGGqYBvFFgiKWGneqojgvg6qhPxY4iWIGjolaHk4xbU5OSCr wufqmTfMjPzwwITOREIR3BdduZW0mPZBZoSIttLKhCj1hCpxpO9fP5sXcVSJsGjks68U/w7FC7P VsRWj/KYvvtV4tTl60xExsNt5x50UQ== X-Proofpoint-ORIG-GUID: l_I2HrfiHWEnvMKBjXDGi9IWrPwWedBN X-Proofpoint-GUID: LQUticiJ96BWNad8aIbiIvHuVJLWPtDE X-Authority-Analysis: v=2.4 cv=MoxfKmae c=1 sm=1 tr=0 ts=68ee6eb9 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=x6icFKpwvdMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=TH3b8Etr9zJLuk16028A:9 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-14_03,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 bulkscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510020000 definitions=main-2510110005 X-Rspamd-Server: rspam01 X-Stat-Signature: 9faytetsguia866od1uofoogyoy4qouu X-Rspam-User: X-Rspamd-Queue-Id: D4E9D180007 X-HE-Tag: 1760456386-298900 X-HE-Meta: U2FsdGVkX1+jxcNoAlh5mKG6NIQG1U0i9nVDSOb7H7h9MfIa9EJU7mC6eHisOFYiw5AyMZvzgNQfvOUoiga7JXa2VSMIB31CkADScs1rXeaWMPM7gRemyR6NiTeqqp+CaZ6+5mB9BlgNMcNTDJxZa9eCkv3nfM6wtGQWz4lqtBmDCDwgbbPv0Ht/TYVcx1HNxCOZRfXO//sQMp5QTX4SMORIRls2hWqMFWajNvVkGhgaFArE2DgcjXNmCf0+vKykB0Myqizf71/c/KOzLaLG8Q07pK8Sw1FdruuUsPaPHoMunhUZnLqRktVgjophjlBRbBaXGpIvYxp40vTArKL3y0VhwwzB/IXGQvUsW1xgEWHFlawlzSsz0KQ2ar/zybB3suX0D1ex0IQtxGfne3QqCdPmzOJTNBjG3dmZBFJZtaTc6vheqi7FfluyA8zv6VVkBIx+FZSXCi5f1SpmEnOz0Z7nrI1zYqjqG83vODM6qsCVY9/AyvpG2mYnHcQoSoHK+BsP/iWYIqQDao6vplpmafexiweF42qtDeC0lyUtRkzLJJF+ZhOIGgq7wGoTXIYco9zxPHSVdH9uXsMEobY7q2NbuewybtTPTYkT4zHTe/XG6TeXaMVlTF4DabLXWY33enFxWS6fL0vnprQiFvpT4lY66J8WWR/93GnL/QVELof6xQtReXdAUEphvHG2QtvUc5yD5m2Pa/X4mZHYMfN++0moJhVszeiFMkt3xjdS6RcU/dAriQpkvtAQ+gyNItA1BBoAhPS+zSr7GyYiPc8OlfEN643HOzHeP+ZnzUwgSGQeuq8cqdjUahhrhmpyhHpO/TSZFk/JT8BXLTIWWeZqecNweCLeN2q1Fb12CPFNOTk0u1HU+mTH6gK5KXwJpvMOtrJOTY43q2luLZVoPPHaW4+bS0eKDnKgD8bCLzRfLoWTbtUbPMMWEjfO9JSVzJBibYejo8rx/257nS/BWwb S31ePWaJ 7KrRJdlnQHy1dZ1+AgkPdRPnDVtUOFkOaEGhi6bD9GHE3xblbKRjMnlm+Y6iH1rV9T0tAVZka5ChDBY6+7QF+iI+nM8W1AQxrajU3rFpkgDLgN151Mrcf9e3dXIXxvklxRMFtUMgEI+Dk/0QwYBSJihCdnMYYdCxilPxqJ3IAhvzc1keTIRQzrCa80C6zziEcEdeXYUuD+WT6zPa+X0BNpObVJVvPJd4Db2pNRjEht2AKa8BXwaQg1A79Bb5ivjOLT6bfy2rrcoEidL2GBktPiHh2Jc7Ovpkvv0u6nSDCxwolTFBtmCLsY7cpWBO61oH7xD3OFXB8eeCwSqJNi3u9W6mJGDaXup46Bad1tQT/qMs4aF+8J6BDR5PGF5S69xKH+YLa 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: The function register_node() is only called from register_one_node(). This patch folds register_node() into its only caller and renames register_one_node() to register_node(). This reduces unnecessary indirection and simplifies the code structure. No functional changes are introduced. Acked-by: Mike Rapoport (Microsoft) Signed-off-by: Donet Tom --- arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- arch/x86/mm/numa.c | 4 +- drivers/base/node.c | 52 +++++++++------------- include/linux/node.h | 4 +- mm/memory_hotplug.c | 4 +- mm/mm_init.c | 2 +- 6 files changed, 28 insertions(+), 40 deletions(-) diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c index aeb8633a3d00..8c77ec7980de 100644 --- a/arch/powerpc/platforms/pseries/pci_dlpar.c +++ b/arch/powerpc/platforms/pseries/pci_dlpar.c @@ -29,7 +29,7 @@ struct pci_controller *init_phb_dynamic(struct device_node *dn) nid = of_node_to_nid(dn); if (likely((nid) >= 0)) { if (!node_online(nid)) { - if (register_one_node(nid)) { + if (register_node(nid)) { pr_err("PCI: Failed to register node %d\n", nid); } else { update_numa_distance(dn); diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index c24890c40138..7a97327140df 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -262,7 +262,7 @@ void __init init_gi_nodes(void) * bringup_nonboot_cpus * cpu_up * __try_online_node - * register_one_node + * register_node * because node_subsys is not initialized yet. * TODO remove dependency on node_online */ @@ -303,7 +303,7 @@ void __init init_cpu_to_node(void) * bringup_nonboot_cpus * cpu_up * __try_online_node - * register_one_node + * register_node * because node_subsys is not initialized yet. * TODO remove dependency on node_online */ diff --git a/drivers/base/node.c b/drivers/base/node.c index 83aeb0518e1d..4bcaa8006cd6 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -676,33 +676,6 @@ static void node_device_release(struct device *dev) kfree(to_node(dev)); } -/* - * register_node - Setup a sysfs device for a node. - * @num - Node number to use when creating the device. - * - * Initialize and register the node device. - */ -static int register_node(struct node *node, int num) -{ - int error; - - node->dev.id = num; - node->dev.bus = &node_subsys; - node->dev.release = node_device_release; - node->dev.groups = node_dev_groups; - error = device_register(&node->dev); - - if (error) { - put_device(&node->dev); - } else { - hugetlb_register_node(node); - compaction_register_node(node); - reclaim_register_node(node); - } - - return error; -} - /** * unregister_node - unregister a node device * @node: node going away @@ -907,7 +880,13 @@ void register_memory_blocks_under_node_hotplug(int nid, unsigned long start_pfn, } #endif /* CONFIG_MEMORY_HOTPLUG */ -int register_one_node(int nid) +/** + * register_node - Initialize and register the node device. + * @nid - Node number to use when creating the device. + * + * Return: 0 on success, -errno otherwise + */ +int register_node(int nid) { int error; int cpu; @@ -918,14 +897,23 @@ int register_one_node(int nid) return -ENOMEM; INIT_LIST_HEAD(&node->access_list); - node_devices[nid] = node; - error = register_node(node_devices[nid], nid); + node->dev.id = nid; + node->dev.bus = &node_subsys; + node->dev.release = node_device_release; + node->dev.groups = node_dev_groups; + + error = device_register(&node->dev); if (error) { - node_devices[nid] = NULL; + put_device(&node->dev); return error; } + node_devices[nid] = node; + hugetlb_register_node(node); + compaction_register_node(node); + reclaim_register_node(node); + /* link cpu under this node */ for_each_present_cpu(cpu) { if (cpu_to_node(cpu) == nid) @@ -1018,7 +1006,7 @@ void __init node_dev_init(void) * to already created cpu devices. */ for_each_online_node(i) { - ret = register_one_node(i); + ret = register_node(i); if (ret) panic("%s() failed to add node: %d\n", __func__, ret); } diff --git a/include/linux/node.h b/include/linux/node.h index 866e3323f1fd..b7028d3ec3b4 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -176,7 +176,7 @@ static inline int hotplug_node_notifier(notifier_fn_t fn, int pri) #ifdef CONFIG_NUMA extern void node_dev_init(void); /* Core of the node registration - only memory hotplug should use this */ -extern int register_one_node(int nid); +int register_node(int nid); extern void unregister_one_node(int nid); extern int register_cpu_under_node(unsigned int cpu, unsigned int nid); extern int unregister_cpu_under_node(unsigned int cpu, unsigned int nid); @@ -189,7 +189,7 @@ extern int register_memory_node_under_compute_node(unsigned int mem_nid, static inline void node_dev_init(void) { } -static inline int register_one_node(int nid) +static inline int register_node(int nid) { return 0; } diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 0be83039c3b5..6c050d867031 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1311,7 +1311,7 @@ static int __try_online_node(int nid, bool set_node_online) if (set_node_online) { node_set_online(nid); - ret = register_one_node(nid); + ret = register_node(nid); BUG_ON(ret); } out: @@ -1542,7 +1542,7 @@ int add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) goto error_memblock_remove; if (ret) { node_set_online(nid); - ret = register_one_node(nid); + ret = register_node(nid); if (WARN_ON(ret)) { node_set_offline(nid); goto error_memblock_remove; diff --git a/mm/mm_init.c b/mm/mm_init.c index 3db2dea7db4c..d9ef05c4dc5b 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1909,7 +1909,7 @@ void __init free_area_init(unsigned long *max_zone_pfn) free_area_init_node(nid); /* - * No sysfs hierarchy will be created via register_one_node() + * No sysfs hierarchy will be created via register_node() *for memory-less node because here it's not marked as N_MEMORY *and won't be set online later. The benefit is userspace *program won't be confused by sysfs files/directories of -- 2.47.1