From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2889F22D4C4 for ; Fri, 16 May 2025 08:21:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747383663; cv=none; b=O1uaky6E+72s94aIe8ojBCG/WUMjAm67EEPtmhEVJDyK239jGwBV2B7kpdGwDSwPf0tBURS5rX/7X3LV2qn7hhszapvqjPAoVc4AjeoED8CldMWYw/gkgTuodfgFfgJat7DAdKiXyhw63ZeMjteqd6DZ3OfHAPlHS1ytzPdIiEE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747383663; c=relaxed/simple; bh=KkLzJYf4ldiyYH/+tc1S0cbrbgQ3t+ADmi9ESEV/L+Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JNQ3Bb/YNw7P0KzpV7fIfIkPG49zGSuSBNNQLRAd7YKRCBuUrf9Ei6SykrnqKA7S0cJGcz+3agY7l3qjalOgPX+sMY5PmpRH2jw9dayCLJdDQywESU+2vZ50homG08fXs4ACGmPbx52YBY6bms5GXytMmuDF0PC6eO3Bdrrp2oQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=tHL+fzk3; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="tHL+fzk3" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54G5ugOl021477; Fri, 16 May 2025 08:20:42 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=+ep/8DbxGA1WHNVQh ANsIPHjx/fwa1Sn2iUI/6BR1fU=; b=tHL+fzk3FfbU8zA8YZNvXEdMKKDEEba5I 4GPgKyRCD/khSu73qYtO40rXtb71M2KFWFFGAHBpV9wBT4JPQC0QnF596KkwfiAQ R6LsBRBR7+gdt2wW+9rXfLQoFu+3vXKRYEJ7ZeQrQfPHqJKNkF8HcEYEC+JHA697 N2ZGwShm9hh3uZoysLYwHTpAs7tZM2pp6FbdE2xfD8opNaKNaw+eoZC0Ay6R0nK4 3Vb7JvHzda8m4OdIcBvS0etu2BP5kSMTLBF0aALfnvg4PmPE3euwFpPxP3aouLTv 5Jqviw82jHfiDHIp73zvL4F1nzAWTEQJJURUqnjbhY0TZVxJtZ24g== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46ndfjwr4h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 May 2025 08:20:42 +0000 (GMT) Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 54G87ThH016088; Fri, 16 May 2025 08:20:41 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46ndfjwr4f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 May 2025 08:20:41 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54G5ipdZ021806; Fri, 16 May 2025 08:20:41 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 46mbfpxk81-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 May 2025 08:20:41 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54G8KdAS34406980 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 16 May 2025 08:20:39 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 275A9201EE; Fri, 16 May 2025 08:20:39 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9D1A5201ED; Fri, 16 May 2025 08:20:36 +0000 (GMT) Received: from ltczz402-lp1.aus.stglabs.ibm.com (unknown [9.40.194.31]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 16 May 2025 08:20:36 +0000 (GMT) From: Donet Tom To: David Hildenbrand , Andrew Morton , Mike Rapoport , Oscar Salvador , Zi Yan Cc: Ritesh Harjani , rafael@kernel.org, Danilo Krummrich , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Jonathan Cameron , Alison Schofield , Yury Norov , Dave Jiang , Donet Tom Subject: [PATCH v4 4/4] drivers/base : Rename register_memory_blocks_under_node() and remove context argument Date: Fri, 16 May 2025 03:19:54 -0500 Message-ID: X-Mailer: git-send-email 2.43.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 6dbgyF3IYYNZsZcVdYGRaE4k-BHRNPAx X-Authority-Analysis: v=2.4 cv=ecg9f6EH c=1 sm=1 tr=0 ts=6826f55a cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=dt9VzEwgFbYA:10 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=Ikd4Dj_1AAAA:8 a=OPxH2NnHIxsCVRiEbJ0A:9 X-Proofpoint-ORIG-GUID: umtMFTABQQexuBGXGoGm0PFRnZr0Z_mF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTE2MDA3NSBTYWx0ZWRfX+uZ032JotcSc pK0dPMDmnJMoH4f1y+R8dgK3od7EYKwM2RtDRU0c23Zpq08FQOuYPZ2o5pX6IxcWEI2wcNffEhG YUcJ9ePtlSn4Tc9bhDUMp/LzAByCzfL1808rTRKUZ3ubVEhuvmBcSbkr/kHwUcRvMev8tUKwEUT bFJqxhb52LMPFP5kfPUGJvYFsWEFziXHRdkj0ajGgi0TlGK9cv1mkg58t5gDXfvRwrSZDJw8WkG vIrh8slT5jLVYTOA57PVIcfEzpCvU2OujqyfeNSZwQ9GwixlGC0NIUTRfZTQJaQNtkMyDt3pPZQ q7TaMdFvasE8RzfKnWW8EfFEZsJrx/LCaynSv4n3MWeDhywMyJlEWq13IiBnOIeov0/Zp5spIH7 wZg7/wUJ9vtize+4e2+KMXI9gEjSCS679LDTnQMJXNx8Q6iDSNPPp/nD5kL1Va900FDXQJai 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-16_03,2025-05-15_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 impostorscore=0 spamscore=0 clxscore=1015 malwarescore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 suspectscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505070000 definitions=main-2505160075 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: Zi Yan Signed-off-by: Donet Tom --- v3->v4 Added Acked-by tag 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 8a14ebcae3b9..52b0bf91ccd8 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -839,9 +839,8 @@ static void register_memory_blocks_under_node_early(int nid) } } -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 8b8f96ca5b06..d3a31d18625e 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(int nid) 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