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 0348FC54756 for ; Thu, 22 May 2025 09:18:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B2FB6B0092; Thu, 22 May 2025 05:18:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 88B516B0093; Thu, 22 May 2025 05:18:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72B9E6B0095; Thu, 22 May 2025 05:18:02 -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 4F00B6B0092 for ; Thu, 22 May 2025 05:18:02 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0CF71140BAE for ; Thu, 22 May 2025 09:18:02 +0000 (UTC) X-FDA: 83469992004.07.893F735 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf19.hostedemail.com (Postfix) with ESMTP id 8E47B1A0005 for ; Thu, 22 May 2025 09:17:59 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=dikqZ495; spf=pass (imf19.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747905479; 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=rWaAiDWPrg8jjAFfZH8NkCi00pTyPIdq5c1PN1pWnZw=; b=q9jFe5tlw6FKs4lEuby0i5hmXe8gND7E973p+m94+N7WxSUn1M3Gnglo2u69G6oE+fb0aR L8VxevqnJxAZQmqTRoB3nIYWMo/fwnoaPmtBXJBHqTY626elI3lWtLNzO8qVZgeFu0tziw 0qy/h1B8Rs5jXYs/bchjSTG3GwB3w7M= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=dikqZ495; spf=pass (imf19.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747905479; a=rsa-sha256; cv=none; b=c1uoN3wjyaee/EDFsiF4Xup91O46v128out9ZUnRiI53vuonp7aiH/EkYg+x8JajU8xJzr 5SIF8qieE6rhc4mO6sus8LEWvbMBwxeVeEP4MZFqZIwwze149iJScHyRe7QsS3kFZpQfHd sMAgY/h154gkp/UKqQjJFg5579bDYpk= Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54M6G5mg005437; Thu, 22 May 2025 09:17:52 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=rWaAiDWPrg8jjAFfZ H8NkCi00pTyPIdq5c1PN1pWnZw=; b=dikqZ495MaKGwbKFqMT4ngWMvB1bLrGDO hPS3pEBB26zb0c2LvApo8d6MfNhKEBxJo2DNVhKoIWhSDTTwZ/8TYVpz6brPGcJl slqssabxJlnvuYXUtYIpNtoUmDCsxXWhoEznTVqAaYKIvd9o3vv9lNvScI4+tnsG NrO909BvjlWs+qVyLIvEmzXImAEWfOcdiXDReg7jUBQQRgh7oywCeC9PnIJQ2Z55 4+Agw7nnwwKo4NgRGS85qIV8N2y0tzBPVCU+545nlIlmGuVZOM5O0RSGWKRHjMvm hQihFpRBPKbcvhD6tTsXMod+ofpHwftvgauBbrn9pbMr0CTYjhKjw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46smf9bbdk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 22 May 2025 09:17:51 +0000 (GMT) Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 54M9Hprg032684; Thu, 22 May 2025 09:17:51 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46smf9bbdh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 22 May 2025 09:17:51 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54M5VBeU032076; Thu, 22 May 2025 09:17:50 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 46rwnmgqbd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 22 May 2025 09:17:50 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54M9HmT932375072 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 May 2025 09:17:48 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6FA8E2004E; Thu, 22 May 2025 09:17:48 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4300620043; Thu, 22 May 2025 09:17:46 +0000 (GMT) Received: from ltczz402-lp1.aus.stglabs.ibm.com (unknown [9.40.194.31]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 22 May 2025 09:17:46 +0000 (GMT) From: Donet Tom To: David Hildenbrand , Andrew Morton , Mike Rapoport , Oscar Salvador , Zi Yan , Greg Kroah-Hartman Cc: Ritesh Harjani , linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Rafael J . Wysocki" , Danilo Krummrich , Jonathan Cameron , Alison Schofield , Yury Norov , Dave Jiang , Donet Tom Subject: [PATCH v5 4/4] drivers/base/node : Rename register_memory_blocks_under_node() and remove context argument Date: Thu, 22 May 2025 04:17:31 -0500 Message-ID: <8394a530c01fbc38607e392ef9ffcdaaa3a8d3da.1747904868.git.donettom@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Pa_7H_jzah6JRAGZGES_e-t1MQBr14UB X-Proofpoint-ORIG-GUID: NO1FuBF6KTFc06MF5QgLWWLovuDPQkx_ X-Authority-Analysis: v=2.4 cv=TbqWtQQh c=1 sm=1 tr=0 ts=682eebbf cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=dt9VzEwgFbYA:10 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8 a=Ikd4Dj_1AAAA:8 a=xjaU-GFjuEzJSOh1rDoA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDA4NiBTYWx0ZWRfXzzyrnHtgZHpk cnIWXk4ib1sr9YcO7Q/dQ3mvBa1xe3hCW332hYj8ARFbFVS9+d8LetHX80ubRUhwo3NcaeSWOtA 7QHdKO3G29CkcUCH5byEVpnxdsBwkUk1rBdLCgPYQxrFel+qh208kKxkWeRnO3a4H8HsHPTvtMx BQ7F4TeGzTbYsZiRFSGKVqi+1YFOnMrQQ7Ss+kGN/syr9nEH5RCZL37V1TA5j6OH5x9U2DjDYuK BPsMzBQrkvmEsf9/BXZ3/4zxbsPCF4V6rHgcbCV6xmPGVPw6pe5b+MtYixxwO292B/CO9JfTcaN MAZOEZpn6R8yJLmULZhNFruNAh8CiIOBpjTFMIkpgySCJ7nMw8aU8Rtv045COOovHJK9ioWpQDU cH3yi1drBrlCTM3UmdKhft8kyUHLwWzCqhVNqh4qYG/OseCJM/ijNbT1EJwM/FDoGYXuzWNq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_04,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 bulkscore=0 phishscore=0 adultscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 lowpriorityscore=0 suspectscore=0 priorityscore=1501 clxscore=1015 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220086 X-Rspamd-Queue-Id: 8E47B1A0005 X-Stat-Signature: sxg8kfgqneotsxip1csppsn74n9hb68w X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1747905479-462995 X-HE-Meta: U2FsdGVkX1/syuFzjys/vMF+KCdRTjethbvtTtCcvY9AM1vb2lokKL6kpiVafeQwI7Pmnez0hTxFTwaf72/eXIUjhmssAwPfRLVNuT1OmwyYC7VoKvXW/zoslbrD3Ec9NSsuQF2SMc8CAOXKklLkxN4hZ+SzuAOdY8/QViaCwiaSDI/0yqbHeUOH++yaQjFoqwilvmex9AWyIQkQboIKreNT3yfqEkYRKpepTGe6RGDPWrlGMIUvZC4wT6CvpUqubNUpKAWnQnmoU4pXjA/6jUjQWNWw525vUclv26HWAdv/P0KU1x0Iz3hYww89tFfgX7HgCa4artMfXZj40vAa/tDKXVY9IE83e+NRkb/bcb/aoVKH+yWhFLCb/wvq9OfBp+ha+jefmVxm2cGjr5QMNbx4a5UM+b8Vp6ymGydpWrKivFB1KOoYKOMaQe2Y8H82PnpkT1AI05vKroAAoVB0/IwcbnQRlaHQr4TRzzdjzGa5i/u3pP/O/vQWHtrcoZp9StA5y0IE+kaQlzAlmq9AHRr28l2mX7AL1G1BeB73fZz+MdN0z4xm/aWcCGUPPOFyuV71B0sTh2PsqnN/OsHYYOHYr/GI4eqeKhf4yysD/0e5n0ISzBmLeevtm77BvHdA+p7dWt7uHEotSQYwEyPxp/Ppo0WvvbfuWvF2IBacDyvB1lpcguNnOk5vncxVnG48OUGbHhoA4cPAZbRC3OT+Dvb/TaSHN9Klo2gZSqVGJMgrTY/m8xKlm3kXKItV6/AR4R7n1jkxtdCqTnjP+NDmCa/e+p8T9CryWIeWkrlD5L7nWjOmnvMfiA1IbusW/G61fXupEh1B8HmGZaXjhkBUHJbeRqkqGdzbrSFvPGymTsRB6/ZaIMilzHhPTWRmLzvIaMG/7xYk+V0u+t2t53kGdLMi/KPlZmql3TT3TU+l4DzaWekO1i14zU552PZYs/9qEvyOzCQT87Sk3qhpnpE TJADlysl iqSz/mXgcCbM1G9iRiQxJtaS0PEElR0SQdlPkTONjUlOvTiPRI9fu8JQaBataTH40iOi08qnL1j+Au+cotrECTIOKKxMPEJAsY08mkK7uQGmVhvNz7+JoG4myoHNuBqrV4/Teh9dEnQ1OeUBPr3USpd1Ua2elLV6XQL2XwIe5+sHiUzSQm2ikEvetSQUAkwMV/8x+ssQymbSsquKDcGFAQ4J33c1iRoaCod1vRTa1r8ib5R7IXqBCr2njutkRZqcEdKoVt8P9cKsFrwKdh608An7qIL2ApCfSFO5OmtJ6BmlaX4XKpARip5Tspo8S+pOxuPBO4nTdh3lPT5Cmb70z9x0N3Ms+a9emn/sO3RsPN0KSXxLnEEKcB+nh0IHwxYIxu9gtA0BtADT2qOeA9yAj6n4/SiJDiCDCYXiAjAEQXrXDzL9sXMM/69ww6UxN3CYocVHrqvbNO2gG5VmOYWVK5kIPz/AmuYo3jJrawCptKXid3N1yIab6+Tlnz/rnG3hYSxoEn6Rv3IORSRo= 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_memory_blocks_under_node() is now only called from the memory hotplug path, as register_memory_blocks_under_node_early() handles registration during early boot. Therefore, the context argument used to differentiate between early boot and hotplug is no longer needed and was removed. Since the function is only called from the hotplug path, we renamed register_memory_blocks_under_node() to register_memory_blocks_under_node_hotplug() Acked-by: Oscar Salvador Acked-by: Mike Rapoport (Microsoft) Acked-by: David Hildenbrand Acked-by: Zi Yan Signed-off-by: Donet Tom --- v4->v5 Added Acked-by tag V4 - https://lore.kernel.org/all/f94685be9cdc931a026999d236d7e92de29725c7.1747376551.git.donettom@linux.ibm.com/ v3 - https://lore.kernel.org/all/b49ed289096643ff5b5fbedcf1d1c1be42845a74.1746250339.git.donettom@linux.ibm.com/ v2 - https://lore.kernel.org/all/fbe1e0c7d91bf3fa9a64ff5d84b53ded1d0d5ac7.1745852397.git.donettom@linux.ibm.com/ v1 - https://lore.kernel.org/all/50142a29010463f436dc5c4feb540e5de3bb09df.1744175097.git.donettom@linux.ibm.com/ --- drivers/base/node.c | 5 ++--- include/linux/node.h | 11 +++++------ mm/memory_hotplug.c | 5 ++--- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 0c97523e7b7d..3f7c8662696a 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -837,9 +837,8 @@ static void register_memory_blocks_under_node_early(void) } } -void register_memory_blocks_under_node(int nid, unsigned long start_pfn, - unsigned long end_pfn, - enum meminit_context context) +void register_memory_blocks_under_node_hotplug(int nid, unsigned long start_pfn, + unsigned long end_pfn) { walk_memory_blocks(PFN_PHYS(start_pfn), PFN_PHYS(end_pfn - start_pfn), (void *)&nid, register_mem_block_under_node_hotplug); diff --git a/include/linux/node.h b/include/linux/node.h index 6cf349c26780..fb567e5aef1c 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -111,13 +111,12 @@ struct memory_block; extern struct node *node_devices[]; #if defined(CONFIG_MEMORY_HOTPLUG) && defined(CONFIG_NUMA) -void register_memory_blocks_under_node(int nid, unsigned long start_pfn, - unsigned long end_pfn, - enum meminit_context context); +void register_memory_blocks_under_node_hotplug(int nid, unsigned long start_pfn, + unsigned long end_pfn); #else -static inline void register_memory_blocks_under_node(int nid, unsigned long start_pfn, - unsigned long end_pfn, - enum meminit_context context) +static inline void register_memory_blocks_under_node_hotplug(int nid, + unsigned long start_pfn, + unsigned long end_pfn) { } static inline void register_memory_blocks_under_node_early(void) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 8305483de38b..f734cc924b51 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1575,9 +1575,8 @@ int add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) BUG_ON(ret); } - register_memory_blocks_under_node(nid, PFN_DOWN(start), - PFN_UP(start + size - 1), - MEMINIT_HOTPLUG); + register_memory_blocks_under_node_hotplug(nid, PFN_DOWN(start), + PFN_UP(start + size - 1)); /* create new memmap entry */ if (!strcmp(res->name, "System RAM")) -- 2.43.5