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 48FDBC5B547 for ; Mon, 26 May 2025 14:51:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B574D6B0092; Mon, 26 May 2025 10:51:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB85A6B0093; Mon, 26 May 2025 10:51:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97FD66B0095; Mon, 26 May 2025 10:51:09 -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 7773D6B0092 for ; Mon, 26 May 2025 10:51:09 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 40CC4C06EE for ; Mon, 26 May 2025 14:51:09 +0000 (UTC) X-FDA: 83485346658.12.B83B2E4 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf13.hostedemail.com (Postfix) with ESMTP id C7D9C20009 for ; Mon, 26 May 2025 14:51:06 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=HW6MpTzV; spf=pass (imf13.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=1748271067; 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=mEbyvPQr2gVwbgCiESakcT+TQCA2g4GL1G0/MZDlAx0=; b=7qKfZIXzvLv5lsvLKKRlXFRnSw5vsvTih8KeRMC/QOfFEBUzqE+t5LnE5aeLTSt8EM61/W PuF8wF3hd4OQJl0bF10aJ7X6JNiQfSI6uv4emVgl50ZTXiNIT5rK63bEvlZQn8ooznzHIp GjwUf+IY9gSIZOMZuPpt32K82+vaBgo= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=HW6MpTzV; spf=pass (imf13.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=1748271067; a=rsa-sha256; cv=none; b=pi2kBXYzbO0c5WOUTfCNWHqB40X6ZtrYlFf+PrCIRNmFYJNOHTitI80iz76b9Ry7pih0pc mSpvyTSfe5gdAE9Ei64NlbZTzOhEkdQbpjSgsdetUcNt29W+1FvLVARd0NjFeB050jzc+E 5JCwSUP0W1SOpkv7gwC//0XgnyAf8I8= 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 54Q3HW2v001284; Mon, 26 May 2025 14:50:48 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=mEbyvPQr2gVwbgCiE SakcT+TQCA2g4GL1G0/MZDlAx0=; b=HW6MpTzVLt4j1oK8P9dlyto7LgE3rfNj4 /vJZ0J792APv/Z0K/nf7gZPqFFGc6AEdk5IaUvzbiuF9CBqqzmUQShfiUDCB4GUG 3boMY1bITC2+OdYVazroyoYqjZIeZTrenhTT3SmTVe7F/bbBdLw7y45EJ6wuIhzu OOuiShpnLkEkSfm8+O4DOoYofJur3rRNbxVp7Bxsg6ioZWS2wBgbmWv7SyQCQBr+ 3L4HN901s2EgSME3FoGI9syPZdobQ8Fyz/zlHHnUJ7+EviF99kzo04v6DS63Kj2V gcyLV2W00wudcTB6AC0yy/uOT4ra8LaLLPabGtMYqk1WNsWSCdz1A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46u5uchpx5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 May 2025 14:50:48 +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 54QEfsqr009052; Mon, 26 May 2025 14:50:48 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 46u5uchpx3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 May 2025 14:50:47 +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 54QEDdlZ007940; Mon, 26 May 2025 14:50:46 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 46uu52x93m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 May 2025 14:50:46 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54QEoh6S30540446 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 26 May 2025 14:50:43 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4B5D620043; Mon, 26 May 2025 14:50:43 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A18EC20040; Mon, 26 May 2025 14:50:40 +0000 (GMT) Received: from ltczz402-lp1.aus.stglabs.ibm.com (unknown [9.40.194.31]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 26 May 2025 14:50:40 +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 , Madhavan Srinivasan , Nilay Shroff , linuxppc-dev@lists.ozlabs.org, Donet Tom Subject: [PATCH v6 4/5] drivers/base/node: Rename register_memory_blocks_under_node() and remove context argument Date: Mon, 26 May 2025 09:50:12 -0500 Message-ID: <030838b43c052079be40e036a4d0f084165e1006.1748270306.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-ORIG-GUID: XU-eQ3M37H_5J9CbBH6jpezQo86iJwvr X-Proofpoint-GUID: TiTI2N2-MW1PZXMyGh2diXtASNGxD-k9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTI2MDEyNCBTYWx0ZWRfX+p7cEPRlTyK/ z0C1hfP+cyChD48/p7qazdp2S2jWX/pnQxqmvYH3ZdyKbkVfPivg/VmafYxxSwolAYLRPwyV0bp wqdiPsnLZRWs8cdqTktoDNaV+ONOVK/Lfj0hR35XUaVZBu08ASnK3iZ0jk0T83j4wej6YXvbNr9 Vf2dkP1wwIhF3u48EkDMbEg3E52WA+vpP8GWkQtE8qP3uGleWq6Afr+wsZRPXF3fin0xyPfTjNU 9P4ap155zKcTu9wM5TNN8ksgyWctTF0mTMFn0r4aomJ2ixftL7Hy16X8c5LDam9vXtBPnSv2DSd JSHOHnEYreNaO7ntx9endag0m2z4qzjr5Md6UEfrZ4trpXV8J6gpmUw2Zh6alTFkESu4t4C3fFU ds7lo84V4WRw+eYTgGw5KNASOaLWwMfXTymfZeXkBtvXriTLb/UWJgeDolGUPZ1GzMaxHezL X-Authority-Analysis: v=2.4 cv=fJM53Yae c=1 sm=1 tr=0 ts=68347fc8 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-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-26_07,2025-05-26_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 priorityscore=1501 bulkscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 phishscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 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-2505260124 X-Rspamd-Queue-Id: C7D9C20009 X-Stat-Signature: egw36kt5y7fi7q56uax187ag3a9b1w9s X-Rspam-User: X-Rspamd-Server: rspam07 X-HE-Tag: 1748271066-268762 X-HE-Meta: U2FsdGVkX181m7EtYJshyQnitEaEgXEd9fXfIs+12A5KJMsBgWbge76ueiH+3s6diJ0Tur1kH9Sh3/k6BO3VPlZrJfTNcxnn6shoUcO4v0V52uwVw/74KZ+oSTjR2wWIpBoGFVFTJLj389GqADyJjxjAGv2eYEilRdmrDpmZ6Mw2dq3BAOzhAokvWQKFHQOhpDd8z/Xvfr6yOwzS34GHKbutuycFFxGxxYRTohSgyX++uH6UKaJ6tmJAY3v6PrVrplQrDNdShLnM7zLfbHfxQy7t2p5h8Q8pFLueXzXDY0ChqB05Q0/uI0UKtND+wmRvvKbSh3k1iEHr4LXng4UzSVNLS0swpj2XJuD0ENw4qY+19bf3gV6zwAG3R4fGZPybwWOnxBjldBjQlUoA8SloY14wv4TYT2aj2NWrMD4YZPmc5aAczmXoj9BtjVfwPggLWYYpPKpnNMoEIb0FcEUrHjv1EgF/Sm+obpTKJ8JSWyGoGmZldbUIqeDaYAKt9gumla6iSvEGHVRf1Xx7m223eyDnzfg8nN8hBFJG75CgMkryE5HXYU2lSw4gvbwBeCl+Pk7KXt2Woz6393KuQQgVQgAWrFT5ux+W+G7DybKiHKCoz9bLrQ70DjrkC855mXzf/yqRyYAhnEuWkv3wohVoRyplzZ+4JjKGR3t7VYg4OswCxrCw2l55v5kvvkyE+DCMjYgmZSsx8DnK2wqIzE1bXt4FKpFlZFzwYylGPbR04B+QAig7QcP+SPkvUnjnRUVRnakrvuUIv3UkGFQ7FvioENlTZwFOSXcDcD3W0hRiMoQp7lCrL8PuwVUUFdSuxFe8JfLcl83feBlL4THMPckdMCxqK2zBnv0ZefuOkm0s7BL4wFU+ViK8jnW2ulM2dWfAe9eOrDJwJrZrpWiBdiohMOG5RQFoSBHMgnHJoVsnC4EUQcWnrcOUD6J63fJZQ9z4G2QOVkzCMxFO/Xt3Mwh 5CkQKENA 8uGoWXYfa7yfvZiKUoSTVcbgg0wBEOLQmfvlIE4Wo+CY5obVGHwYPd6FFYvELb1zqlk2OF5hdoscgPajxKIXwq++IyX/6NzmWPh4iwCtBaOvl7Wu3AvJk6bZmVJ0ePvVoL+E3KRGT8N0HBjSsCg7z+zmP40cALoj8a0LXLwIsi8wYIUooYJweOCHLzBKcPX34bJD6QWUBo9muCAS9GUkcbXDIn16tJLmwi6RLRumRbfu/2PkVkjpcMy9T7lC//OiEg+pJWj5Kj/Us/QH+aNwG1dAD+3M41y2CoKp0NLG8+w8xZz+K78wwbFYuQNODiVJwE/Tc7EsWv6Mij/9ElliP78crIjFbKUR6pZoKySCnyT4+kjxBakM03w5boYKRjqQOAtrjRcQQbBKQ8nxPu7ygoHrw5VrJhYB9bBKhDaqjBqagkuZjSq7uX/kR59qOKS8JgPzOvVBDc1zbM7GDuz6blQgQRpcJ5NRHw7bSXNDV50/QsSJrH8MQj0JN9HseWRqdmSt6YhW3mIXv0kQ= 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 --- v5 -> v6 No change v5 - https://lore.kernel.org/all/d2490e807b2c13950bc1d4199f22ec078cc4c56a.1747904868.git.donettom@linux.ibm.com/ 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 71ddf2d0d1af..9d0977fa50e3 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -843,9 +843,8 @@ static void register_memory_blocks_under_nodes(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 b15de78e0408..75b036a100d2 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_nodes(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