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 88784C369D9 for ; Sat, 3 May 2025 05:40:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D9726B00AF; Sat, 3 May 2025 01:40:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 588926B00B0; Sat, 3 May 2025 01:40:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DA2C6B00B4; Sat, 3 May 2025 01:40:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 14E336B00AF for ; Sat, 3 May 2025 01:40:51 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9921FBE16C for ; Sat, 3 May 2025 05:40:52 +0000 (UTC) X-FDA: 83400497544.03.248D2D4 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf28.hostedemail.com (Postfix) with ESMTP id 3511AC0003 for ; Sat, 3 May 2025 05:40:49 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=QdcozqtV; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf28.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746250850; a=rsa-sha256; cv=none; b=BklB8xmWzOw5cCNHV3ZcmboDyGTLAeBcX03A2FcOKwV3VVbpyeM/LsYyibntsxSgN+b/2q uA+z1e5ewzbVVIP5x9QgjuZSpM84MAT2n7WY3DlP+r4Bwjw7tyUhrZ3KJDKX0qc/4mUyR3 OmZgXp+OfGZd5xknXSdrLPahkxspaVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746250850; 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=YBuG9iHpO49vJs0ff6cHvwnAQWzm8aA82ZPebpBqUp0=; b=aU3PWtiy3ArME+i4lwtX89AX3qtJoeeM+0V2r7Qd3uMjPQWMKIkfa2NRVJBRNigYMDwoKi rUTYmXjguSFKpLRmIl4QYhdeH9gtB6J9XSE2YLQ9XwjLnM+zmhmv1HbsPH/VMdT2UgYBLa O26aWup/QDBtjqNMJjdyDHokb0yZbCo= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=QdcozqtV; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf28.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 543303JC007380; Sat, 3 May 2025 05:40:39 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=YBuG9iHpO49vJs0ff 6cHvwnAQWzm8aA82ZPebpBqUp0=; b=QdcozqtVhkjka+TpNpxmWSFGkDPLw42r2 HM6peNtzfLnibKERYEyTsgbpOPmGNr/bkvuox1Qw4T/yKNrvzNMukD/rNV8yOtof fOWs9LCOuR4/B6ZKfO8k67Ll9lkkvx578uuDj4EZzmflwSRArOPGT8+Bhze+hUbg BYDJ02UYBvPsHVwdQUqeF2pPCXVkNU1PhUzZCXO0auXg78bWMVWP5wO7BH8s1PNL YN43/AbF4Nb5Zm1aFSIN6HopscstB8PV927OlBbon3p3B+TeeEcEIl0vw3A796as jNAzjpk+H0QlWxs1zRZq0QSUugDtrwsiA1BhEcsvDMQOtsh1LhIIA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46daty0abt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 03 May 2025 05:40:39 +0000 (GMT) Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 5435ecOn016737; Sat, 3 May 2025 05:40:38 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46daty0abr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 03 May 2025 05:40:38 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5431I55G024662; Sat, 3 May 2025 05:40:37 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 469c1mms5m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 03 May 2025 05:40:37 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5435ea2036503828 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 3 May 2025 05:40:36 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2735320040; Sat, 3 May 2025 05:40:36 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AA9302004F; Sat, 3 May 2025 05:40:32 +0000 (GMT) Received: from li-06431bcc-2712-11b2-a85c-a6fe68df28f9.ibm.com.com (unknown [9.124.222.98]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Sat, 3 May 2025 05:40:32 +0000 (GMT) From: Donet Tom To: Mike Rapoport , David Hildenbrand , Oscar Salvador , Zi Yan , Greg Kroah-Hartman , Andrew Morton , rafael@kernel.org, Danilo Krummrich Cc: Ritesh Harjani , Jonathan Cameron , Alison Schofield , Yury Norov , Dave Jiang , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Donet Tom Subject: [PATCH v3 2/3] driver/base: remove register_mem_block_under_node_early() Date: Sat, 3 May 2025 11:10:13 +0530 Message-ID: <871e79e4583fcf5f28ecbb37f28297098f1ac748.1746250339.git.donettom@linux.ibm.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=fKc53Yae c=1 sm=1 tr=0 ts=6815ac57 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=dt9VzEwgFbYA:10 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8 a=64vTnB0G6KJa_LJvZe8A:9 X-Proofpoint-GUID: FVnB2AsHyshvjv0CBXGw5-inUP-IRfxE X-Proofpoint-ORIG-GUID: nv-RFAkYlDNglGJ2En-dlGUOLwH8xdec X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTAzMDA0NSBTYWx0ZWRfX0ElWrtPn4Lai 0YrFCkOj9fVAad4nSnbWMe/9ClT8IERCy7IBiLMrvDpQXLnhp3NvR82Az+e9AuvN4a+QK+X7Tw3 sfNrpMqhqzMExB5IXk+sy/Ko09IMHUU91HMyBDgW6KXm9pvnrhGp0J+tae1LXkB8jMMUDbWbI6x d7/u6DmRNsxIFabIM/FtQXZY3gBuElYWLF369GMzXuyoxPYjs7lqsB4ASBbOJXjt9szwL4WlPKp vaN3J414Dy5OnLOhxEzQL75VthxcHxRn5CpkbkNxuGYUIPdUFD64L8lBjHm6ZJtjRBXidehBM3D nAmWbgN4X7JIWAHO3bezYqVKFfCoQhIrrZXZhBreYeoZ00uf7Lk8fUceUPp7EO0EpxEAEBW9qox 0ixCEdVyBoc1nbi3xLbO/zPEozxkAgqNNyuxl7YaIWcW/XS5hVVKWqwxeC30Gxyb2vLePaUJ 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-03_03,2025-04-30_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 mlxlogscore=999 bulkscore=0 adultscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2505030045 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 3511AC0003 X-Stat-Signature: eb6fypbnft3uwskkmx9mu48sxod466ra X-Rspam-User: X-HE-Tag: 1746250849-491245 X-HE-Meta: U2FsdGVkX1/y/QBJ+rupDnNL4eTUIhIpkeW4styWQHQd+x+pIOLXYj7++QAb6GYxKuV87vc0IDMR7rKJQ/drItmZrrToRLq5qrPrL98wbTh2yCVESl5WlWji/lNzb88IxfdtE6zSReJK0PcTM08dRLWa6mclvBPvegZlOTQ9humheM0zPOl2lBDydMlFNBzk10YNOxOJKxgiS1t4MeaWLIa1cFeXjMCbtsbp0+jEhX10X4pfoYg02/HVkDMaiysB967QIyHXHCtT+fpDKttc/jTh3Si2BEZwyASoeSDNXNOLB9/qbR9KWLzgwk69aJdOuQdakPp4iRahI3kbBGK37SKDcMAtqOO72NstqCx9OynQnk/PEAh58uVBNXSub/05gjR3j5WqsWWMKvsfjpAjyq3jpErPr5iHo+nIS1t4GLHEWoazxtI+qt9lWzsFGNrQstMbPyypnOJCmmu+2UEoUtClSKbZMlyQDXvCjQng3j4ekl9loddHior5mTo7n6kOH7ILc6uRsfqWWTP8Hm5jfxz4TcXYJ9IRJCEzzj8OBrWRR+1rLF+NUSJHoyptasAeX5337zEz+neQlsQHJdfeNu3UjulYWBNAaVY3lwyWprPdqBtFhkTcetb9eymzHPgJlD2+DnqExyY8VWC6s2TVYaQ8wKhqy8oia0ZrqSdfdeT6cOe2T6E/dgyq5EfSMI4QiqVUOaWn99pojVkzINNsQM6+EI53216YSSb4IaPLSbo9oowTAHEdT230hr2MJBSxDm1mzIZ+WGPHhiI/ZJ1jGCsMHXsiJkJwdrFqkVfwKAywX9/kz2gd846cym4i8teuLnuqT4d0E3oUDnE874DMbRVcx8S8v+nV9+svpsED0YOE0jod26EPixyaSy6+E2MixkzfIlUzxY6jzqANt3395ZKZ5QRyvRVRTDOMj5vzhHNz3LYbjiK7q+xAUVDZ4prnNI/t9SP8CkfquQT69Fv tt92ExPw cF0tm5mOqkzfNeCOCtvL1NWoPQDlskcR0C5niFzBePnqtrSCGDgEwF7kyt5f64e9Hm+UEurvTS4CW+oCiJDf0K+WB3jgDmGRW5d2y4CENBHP3QDLXtsoOm1sJOEx+rWemYAeFp7U3YZxXwBSqqyfLPfi2EIJqfo2JAXw7gGwHoZqJNPhWnoGvTG7hyrvjv44ICe9MczkycZ1m0UjPRu8OuVRQYU1bSUUEhBpTt/eG7MLlhf/4jQBv4RNiaOYGXw7II7y7Ucjrfq+t87thtzu1ACD582/6lMROFYluGcQRK5pwpJPHZXa4UatGpdQ9YXDawjK/+zNEoO9pgEMQJyk+BRfFoRinmRdAX77KkuzlbiPrjJv4gv3yCunqwx62mKXMTAUr38qm/8+1avKw3uzeR3RPvmIxbQtFZwvv5HaVttFi/iufuM+b9abnUHFFcfWhYARdM5RPG4BjVeSd6KgzxPi62p1w67BEmGqogh1KysB0a6w= 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_mem_block_under_node_early() is no longer used, as register_memory_blocks_under_node_early() now handles memory block registration during early boot. Removed register_mem_block_under_node_early() and get_nid_for_pfn(), the latter was only used by the former. Acked-by: David Hildenbrand Signed-off-by: Donet Tom --- v2->v3 Removed temporary variable(fun) and passing register_mem_block_under_node_hotplug directly to walk_memory_blocks. 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 | 58 +-------------------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 0f8a4645b26c..948392b477ea 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -748,15 +748,6 @@ int unregister_cpu_under_node(unsigned int cpu, unsigned int nid) } #ifdef CONFIG_MEMORY_HOTPLUG -static int __ref get_nid_for_pfn(unsigned long pfn) -{ -#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT - if (system_state < SYSTEM_RUNNING) - return early_pfn_to_nid(pfn); -#endif - return pfn_to_nid(pfn); -} - static void do_register_memory_block_under_node(int nid, struct memory_block *mem_blk, enum meminit_context context) @@ -783,46 +774,6 @@ static void do_register_memory_block_under_node(int nid, ret); } -/* register memory section under specified node if it spans that node */ -static int register_mem_block_under_node_early(struct memory_block *mem_blk, - void *arg) -{ - unsigned long memory_block_pfns = memory_block_size_bytes() / PAGE_SIZE; - unsigned long start_pfn = section_nr_to_pfn(mem_blk->start_section_nr); - unsigned long end_pfn = start_pfn + memory_block_pfns - 1; - int nid = *(int *)arg; - unsigned long pfn; - - for (pfn = start_pfn; pfn <= end_pfn; pfn++) { - int page_nid; - - /* - * memory block could have several absent sections from start. - * skip pfn range from absent section - */ - if (!pfn_in_present_section(pfn)) { - pfn = round_down(pfn + PAGES_PER_SECTION, - PAGES_PER_SECTION) - 1; - continue; - } - - /* - * We need to check if page belongs to nid only at the boot - * case because node's ranges can be interleaved. - */ - page_nid = get_nid_for_pfn(pfn); - if (page_nid < 0) - continue; - if (page_nid != nid) - continue; - - do_register_memory_block_under_node(nid, mem_blk, MEMINIT_EARLY); - return 0; - } - /* mem section does not span the specified node */ - return 0; -} - /* * During hotplug we know that all pages in the memory block belong to the same * node. @@ -892,15 +843,8 @@ void register_memory_blocks_under_node(int nid, unsigned long start_pfn, unsigned long end_pfn, enum meminit_context context) { - walk_memory_blocks_func_t func; - - if (context == MEMINIT_HOTPLUG) - func = register_mem_block_under_node_hotplug; - else - func = register_mem_block_under_node_early; - walk_memory_blocks(PFN_PHYS(start_pfn), PFN_PHYS(end_pfn - start_pfn), - (void *)&nid, func); + (void *)&nid, register_mem_block_under_node_hotplug); return; } #endif /* CONFIG_MEMORY_HOTPLUG */ -- 2.48.1