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 A1C56C83F03 for ; Fri, 4 Jul 2025 10:30:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EE4D6B803A; Fri, 4 Jul 2025 06:30:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39D546B8035; Fri, 4 Jul 2025 06:30:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28C9C6B803A; Fri, 4 Jul 2025 06:30:55 -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 14C976B8035 for ; Fri, 4 Jul 2025 06:30:55 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BEFB5B8242 for ; Fri, 4 Jul 2025 10:30:54 +0000 (UTC) X-FDA: 83626214028.04.F4E1334 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf29.hostedemail.com (Postfix) with ESMTP id 45360120008 for ; Fri, 4 Jul 2025 10:30:52 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=JaAW9p7l; spf=pass (imf29.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=1751625052; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=bOcHbqk9/MgQLGqf1rAqaS17elm03KlbKIEO/W1Bsdw=; b=0wQUi1BVzY4qVYAAsRUTiEpo9aRS43Es0SM/T82A+rXuGIbAGUEsA8EXEBXpnCdEd2giqN 3kGkLHKN7OkXnu67pe4nlcop27XNyT+H5OcuFWs8ngv6MkrdHdsEPMuBG9oYmhvtVT6HE/ wmmzYYuJZDjlk2A/7LCJMlQB5VEJFvY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751625052; a=rsa-sha256; cv=none; b=VuNjtOex0jeGlgkSgqEiqSrmRNKQgjaEY3AmEDTO9/0F3k2MnuIRAG3nAjDX5/wqRI44aH BZTdu7/ccbrAKz4I/yZTeyt2uoRmfJ9oSwTL9WkABsSih2twQ7kc7i0VlkNsBjZXchuRmC UjLXO7K08nipVj3TGIZSN/c9m5A8tRA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=JaAW9p7l; spf=pass (imf29.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 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56445LvQ000329; Fri, 4 Jul 2025 10:30:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=bOcHbq k9/MgQLGqf1rAqaS17elm03KlbKIEO/W1Bsdw=; b=JaAW9p7l+2jda26FfXLHDa G4qwS3P4vXKOuRu1qhhuiSmTrcMDU7WfrRlFl4GSVFDEcjAUanySOW8eWD39k8tW I/VbiQer3d/t2ej1n4FaWYx8RVmCX812O/OtRR47PTHQV3yWghojRSRvvZ4zREV1 xr2wSItISIi0EntcDDhlfoItN7fTPwW3qAljcMv+6mQbak2G/MuTfQPigW0SdOqq PTVhU+G+BvuIlrvUI3gum0Vw6ZTEhKWZQydX1Mj0AOu5C0ZJnwxPdj7eFCUtmvqh hMCpd3oD/Kobt4CHj6UCHSWqPKlaEZ0/EV1R8BQ+HEBD9zeF+fYFBj31x4+Azkpw == 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 47j7ws1c2s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 10:30:49 +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 56481kS1021398; Fri, 4 Jul 2025 10:30:48 GMT Received: from smtprelay01.wdc07v.mail.ibm.com ([172.16.1.68]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 47jwe3s4rs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 10:30:48 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay01.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 564AUlSu32178648 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 4 Jul 2025 10:30:47 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 08DD45807A; Fri, 4 Jul 2025 10:30:47 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 78B1558077; Fri, 4 Jul 2025 10:30:45 +0000 (GMT) Received: from [9.109.245.113] (unknown [9.109.245.113]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 4 Jul 2025 10:30:45 +0000 (GMT) Message-ID: Date: Fri, 4 Jul 2025 16:00:44 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 3/3] drivers/base: move memory_block_add_nid() into the caller To: Hannes Reinecke , David Hildenbrand Cc: Oscar Salvador , linux-mm@kvack.org References: <20250704063404.27495-1-hare@kernel.org> <20250704063404.27495-4-hare@kernel.org> Content-Language: en-US From: Donet Tom In-Reply-To: <20250704063404.27495-4-hare@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=E/PNpbdl c=1 sm=1 tr=0 ts=6867ad59 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=20KFwNOVAAAA:8 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=jRnKzK5zCCT1ngw2yRsA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-GUID: hu_PWk_mB6aF_CPGWkTLKZVPcySJbyp- X-Proofpoint-ORIG-GUID: hu_PWk_mB6aF_CPGWkTLKZVPcySJbyp- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDA3OSBTYWx0ZWRfX26fk0V0zE85c TKKJg9GEdKjYDt/thJOkbIAx+a+Z1i9nDWLJF96okQawfXzSYgkvAfHWkALOtmkYFg1bFxCzamq NHRRWLOJMW4IL0dS/pLK3OZgnu4UlXEDfco7Mip03heA8rPyWsgYFJPimlKFAbj1wcRuE2s+JO/ lHxF5cznTI5GfYQygpkYiY2CnzI6ExQ8+zZdqi8fjyNzWH0XBPifgHGOc2nTIUyf3+uCSBgQlqp 60Ru1MObYoYlDtQtdKcBo+k20a8KTNHUymRuD/EPU6obxqJRAJlK+gie3C+iaDFXcS3sjBnf6xm vkgKYqxMaC+Pp+oaHsZONoxSO+xWc7MTH2ixSZ+8GHVnyqdOPg+HU6ZrQNU8+AlhbNNETDlzezN LNu+gmKCjKJvpNORAD1SpJe/afdmgCiQzr0G+EiAXMChgPMys1ef2t+O7Dvvd4BOrxFPcWUT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_04,2025-07-02_04,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 bulkscore=0 priorityscore=1501 phishscore=0 suspectscore=0 mlxlogscore=999 lowpriorityscore=0 mlxscore=0 clxscore=1015 adultscore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507040079 X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 45360120008 X-Stat-Signature: gw1xchm1hzeuqro1i6e3r8n7ya4h3hk3 X-HE-Tag: 1751625052-927512 X-HE-Meta: U2FsdGVkX1/q3OG+NTRKhDNuiNj40PhH6kn39qa9oAeTzGRV4QncUfGYrE1q74NbDGKVEtKp+z+aXZd1kPBV6ktcKYzR3sIpYfhJBS0BUkUM8pBzS0v//DpB0xZiFE4Ufs2ydmkIOilVucThwvN2pi2nEwBd53czymddvHhKJh3jq8BR8RoNQCfRfYJfa9tDWdxXXFrIJ2DML5ZczaGFVht7DBIJMqfJbq2oivL6up0b4RLQVBfhTgDbfyukD2aitEFlx6jJwB6pEoTs/suITQ0ydO6Y/l5MqyPrDjwo9pvjfRBZ9os2n7EylWw7IxpAd8WOjLKFWaGBhjCuDKeGPDynz1KW82QDa7IF90AlkTr56YmYwCnAgUfCzxUiIyira5qyuZSpiifdoWhdHVCOBpxmuKDKfOrLw8GkiOsAlPgC2m6m9A/vaTPCRYdA2XWweKQJFeJ+gKmyxSWiEBFgtCT6jqudF982Ss0mVM1VkJhWqBbISToK0lvap6N/ubS7C6i4pq8f5ECIrky0G8ypmXsJF7Zo4XhusV1+cA+5l29FpvCMj5JT0C8iswxsPF7B2nF3WjH2WwKVxhnoIgs3Rcv2iejdUZnT/84zWQEVcay/aPLUMQuVPPwq70kKNQ0Ii1LbXzs1c3u6IWu8FK/iE+U5FgpCSZm62NktbQewrMfpecAUx3dDZr/GQLM4WZxKoggUpwrlgMImuW0rCwkjO8MsEzAu8S9olmyd/c1VlIVpv+mTVvU5eOW5pnpYlJo/WfysB0F/9fC7qPGtgp0x+SPamFKl0gV+S7RhQ/ZO4vwdl6xcC2ohy/vucXv9Q+2zbTgVY0EFkjucnklahKIOo4CvUKFo+ak/s4wZftfkfNLgiJbL2xYCTrmed3v5pXvnbcTfF5zyJmsRW+LQnFhKEksM7YrTyNKArm0m/87ZT4Jia/O9wM0oLpr+DCA020RaBoMOuc6zYj5nj3Qq3br O+dXSRN3 131VRCHQ95omysffb3jCF0A3bmi8p5MVEhD2dRbTd9LehfB7ZeJm8XlkfvA9V/75IuicsT63EUOjszZuuMvTG3A6gHwAPKpBQr74UtSXVBLnvKiMzF1IZeDOkjOibtLJHybTJXT3bnj+F5HTHzY2UBxkhnEUf0EtxHCnOSIlAIem1hAZULEsz1Kzf/0R2qB8/VR3lMFsQvEApGZLXwWfthLg4y0M1WhzMhypOYETEImOQUejCIn0q2qFx06SYxY5WzDhVjIij1qmR/sKpZIvrLiKJ68suR3SYK6aKRu9rTu+OeNULrpAXp4DTsn4MilB6JeElkXdReXw5TiDwrFc1gAlFpLLEapTNFtqg3WNGj3yuJb/j6WT03famnSayAsfbfomZOoRzlOBQx0hG2syCTVxGbZoCrc4IGl+PK8HxpP6twaUopQNEG21uhojQIuG7lhIHsydbVZlJujWjL7TvHNMSuA== 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: On 7/4/25 12:04 PM, Hannes Reinecke wrote: > Now the node id only needs to be set for early memory, so move > memory_block_add_nid() into the caller and rename it into > memory_block_add_nid_early(). This allows us to further simplify > the code by dropping the 'context' argument to > do_register_memory_block_under_node(). > > Suggested-by: David Hildenbrand > Signed-off-by: Hannes Reinecke > Acked-by: David Hildenbrand > --- > drivers/base/memory.c | 36 ++++++++++++++++++------------------ > drivers/base/node.c | 10 ++++------ > include/linux/memory.h | 3 +-- > 3 files changed, 23 insertions(+), 26 deletions(-) > > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > index 4ce93fb54525..5fb275d7ed7d 100644 > --- a/drivers/base/memory.c > +++ b/drivers/base/memory.c > @@ -782,21 +782,22 @@ static struct zone *early_node_zone_for_memory_block(struct memory_block *mem, > > #ifdef CONFIG_NUMA > /** > - * memory_block_add_nid() - Indicate that system RAM falling into this memory > - * block device (partially) belongs to the given node. > + * memory_block_add_nid_early() - Indicate that early system RAM falling into > + * this memory block device (partially) belongs > + * to the given node. > * @mem: The memory block device. > * @nid: The node id. > - * @context: The memory initialization context. > * > - * Indicate that system RAM falling into this memory block (partially) belongs > - * to the given node. If the context indicates ("early") that we are adding the > - * node during node device subsystem initialization, this will also properly > - * set/adjust mem->zone based on the zone ranges of the given node. > + * Indicate that early system RAM falling into this memory block (partially) > + * belongs to the given node. This will also properly set/adjust mem->zone based > + * on the zone ranges of the given node. > + * > + * Memory hotplug handles this on memory block creation, where we can only have > + * a single nid span a memory block. > */ > -void memory_block_add_nid(struct memory_block *mem, int nid, > - enum meminit_context context) > +void memory_block_add_nid_early(struct memory_block *mem, int nid) > { > - if (context == MEMINIT_EARLY && mem->nid != nid) { > + if (mem->nid != nid) { > /* > * For early memory we have to determine the zone when setting > * the node id and handle multiple nodes spanning a single > @@ -810,15 +811,14 @@ void memory_block_add_nid(struct memory_block *mem, int nid, > mem->zone = early_node_zone_for_memory_block(mem, nid); > else > mem->zone = NULL; > + /* > + * If this memory block spans multiple nodes, we only indicate > + * the last processed node. If we span multiple nodes (not applicable > + * to hotplugged memory), zone == NULL will prohibit memory offlining > + * and consequently unplug. > + */ > + mem->nid = nid; > } > - > - /* > - * If this memory block spans multiple nodes, we only indicate > - * the last processed node. If we span multiple nodes (not applicable > - * to hotplugged memory), zone == NULL will prohibit memory offlining > - * and consequently unplug. > - */ > - mem->nid = nid; > } > #endif > > diff --git a/drivers/base/node.c b/drivers/base/node.c > index c19094481630..8e3225434ae7 100644 > --- a/drivers/base/node.c > +++ b/drivers/base/node.c > @@ -766,13 +766,10 @@ static int __ref get_nid_for_pfn(unsigned long pfn) > } > > static void do_register_memory_block_under_node(int nid, > - struct memory_block *mem_blk, > - enum meminit_context context) > + struct memory_block *mem_blk) > { > int ret; > > - memory_block_add_nid(mem_blk, nid, context); > - > ret = sysfs_create_link_nowarn(&node_devices[nid]->dev.kobj, > &mem_blk->dev.kobj, > kobject_name(&mem_blk->dev.kobj)); > @@ -824,7 +821,8 @@ static int register_mem_block_under_node_early(struct memory_block *mem_blk, > if (page_nid != nid) > continue; > > - do_register_memory_block_under_node(nid, mem_blk, MEMINIT_EARLY); > + memory_block_add_nid_early(mem_blk, nid); > + do_register_memory_block_under_node(nid, mem_blk); > return 0; > } > /* mem section does not span the specified node */ > @@ -840,7 +838,7 @@ static int register_mem_block_under_node_hotplug(struct memory_block *mem_blk, > { > int nid = *(int *)arg; > > - do_register_memory_block_under_node(nid, mem_blk, MEMINIT_HOTPLUG); > + do_register_memory_block_under_node(nid, mem_blk); > return 0; > } > > diff --git a/include/linux/memory.h b/include/linux/memory.h > index d7c3a4856031..63f076f2d303 100644 > --- a/include/linux/memory.h > +++ b/include/linux/memory.h > @@ -186,8 +186,7 @@ int walk_dynamic_memory_groups(int nid, walk_memory_groups_func_t func, > }) > > #ifdef CONFIG_NUMA > -void memory_block_add_nid(struct memory_block *mem, int nid, > - enum meminit_context context); > +void memory_block_add_nid_early(struct memory_block *mem, int nid); > #endif /* CONFIG_NUMA */ > int memory_block_advise_max_size(unsigned long size); > unsigned long memory_block_advised_max_size(void); This looks good to me. Reviewed-by: Donet Tom