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 B8253C83F05 for ; Fri, 4 Jul 2025 10:29:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 411066B0088; Fri, 4 Jul 2025 06:29:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C2236B0095; Fri, 4 Jul 2025 06:29:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 289A86B0093; Fri, 4 Jul 2025 06:29:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 11D616B00A2 for ; Fri, 4 Jul 2025 06:29:16 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D8B2216028A for ; Fri, 4 Jul 2025 10:29:15 +0000 (UTC) X-FDA: 83626209870.03.3DFEFC6 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf12.hostedemail.com (Postfix) with ESMTP id 561FB4000C for ; Fri, 4 Jul 2025 10:29:13 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=IPb158Fo; spf=pass (imf12.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=1751624953; 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=PAHOMnNHqP/eG4f4e69TcRFLFm4pvnpWA7N5IDOc064=; b=ClnqXGZ0BszDG2vaC8Gm8lhi74HXzf5XyBoXok41vdJeUEWWFSWaIVo715nK+s3ZTIiMvh PdLCT8FjKCAKJOOzzH9nX/3vXGP1upufQ1zHnWNYBu6lWUEMqSvOtDOgavOOv4K9mF/O1j BI2Wizg5PYsrJSyKQuSYPcTJsrsdhtc= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=IPb158Fo; spf=pass (imf12.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=1751624953; a=rsa-sha256; cv=none; b=ZAiYKsE9Znlbm+yzTLrAQw4Y4Fujj4c93FL1b4HZnXOtwx9ges36gMzAhz9oFB8etau1B+ punAYj0HpyWJORbXsS4LbQ/vrtHh+3mEHaJ5yi9v4NBL04ID0ow1fb5VSSR4bPZB9glQRc DrwmHbmoUxuSwRtblWyAO7i66cQCI/I= 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 5646hLZ1004776; Fri, 4 Jul 2025 10:29:09 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=PAHOMn NHqP/eG4f4e69TcRFLFm4pvnpWA7N5IDOc064=; b=IPb158FocgY/TFXuaHlCQi HLZJKGFTBwyL5WIxoiQojFZnXiSsFDXhG+Gy+Qn91UX1fzFxAlSMWZVmBiMTsvOQ UOZm0AslphHAWs7gD64YMkiG8SBVtcxOmlfhxlglvP5XNqMqPwJ/Km1OAo9sVtoj rgdIXrbx44rwcZSjOm8j6vcSeY6YX2I1TEH8eY1rmJ9JedWVedQLX3DVyGxH8le4 qackxhuufTxbT8bShVRLotPFTLEhFqLCXoOS63qEzbwo4/Wp7T9Pt8ZY0Lpcq7SM EhahtwmKsEmqU4C4pEHIlsKLRh0reBN/gqdyHgyxXhyqTdKtFhLMBATLZbNM6KPw == Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47j7ws1bva-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 10:29:09 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5646U3l8021906; Fri, 4 Jul 2025 10:29:08 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 47juqq1fqm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 10:29:08 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 564AT7CP51642714 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 4 Jul 2025 10:29:07 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 695635803F; Fri, 4 Jul 2025 10:29:07 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 105E458056; Fri, 4 Jul 2025 10:29:06 +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:29:05 +0000 (GMT) Message-ID: Date: Fri, 4 Jul 2025 15:59:04 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/3] mm/memory_hotplug: activate node before adding new memory blocks To: Hannes Reinecke , David Hildenbrand Cc: Oscar Salvador , linux-mm@kvack.org References: <20250704063404.27495-1-hare@kernel.org> <20250704063404.27495-3-hare@kernel.org> Content-Language: en-US From: Donet Tom In-Reply-To: <20250704063404.27495-3-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=6867acf5 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=VwQbUJbxAAAA:8 a=20KFwNOVAAAA:8 a=VnNF1IyMAAAA:8 a=Fqj92kXbljRMwP2oazQA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-GUID: uGkR18VgPKErHrvZWXxuPm3lRoQC8YNr X-Proofpoint-ORIG-GUID: uGkR18VgPKErHrvZWXxuPm3lRoQC8YNr X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDA3OSBTYWx0ZWRfX5vSvVsg4GdOd Qi5D+Gvn66QdbqnorLW8Ieve9M6M4v85Icm3kgvD2LUT+8dc7Px8ATmM9BDJqGtc2mHfc1r8YeV PdwOCfle9nLNXTF2LkdAnkgH3re6xZKVDrf4jM/HC4dlBYThEUHYDMOw7nqGJBZrviPWJUdeL8Z bzyHYM46VLjgrFAJ1sJy0luQWfDWc1SaQS385lKj5o2OwjmeaeH88IzyZRczbnsYozNT1O/sEiK lUxfmMfhmJOzyWTSXC8pwLr0owEnFPOdth6EdcFEyF/MHrrz0dii4MUNsQuFMccJmFulSrAmz/C l6Wx+H699fLTBTPamDVHUyciv+/lg39lH40k3EsvBnmJUtr/xZKvilik0MO4PoMulP3ZI3bysab Ao/IkSy2fPmCtzR6qkUOpJP7DeKz5vW44AQPOOc+Ju0lQDARUAtilSYLnrbtCD7PVde229Oz 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-Stat-Signature: rkqhb63w5w5ss1wyryk3tqb31i5h9yte X-Rspamd-Queue-Id: 561FB4000C X-Rspamd-Server: rspam11 X-Rspam-User: X-HE-Tag: 1751624953-924677 X-HE-Meta: U2FsdGVkX18FmUMmCTuTRJReE6FJA4PWm6cQJPSoxbSPwPovMrOXzUrM4NKawpWVavlLHstBwIW7Lak/pcqkzxI+9m1Gmz4fA3rDny4eytgD+k0pjqVP43tgjc1cCAIAON6ZK9Erwt4SjYgQwzG9Mz2SQLgi6CadxDR0slptJy6lc5n3T1+cs6p/f8zJ7crnV4qJstQ4SdHj5j7WPCXJLdqRej9HuRuMBMJYFdTFgfbBilDFkXNsPTR4HNV8XZGSu23qIs1YVrpeT0ZbVLaub2UiRfNsqvZyzZeCA/bA9FzNxqHzVniy1nRnqR/CYHy+qnzsgZzKUOjC3iEmi34r1Qkq6WJddsFc8vtzKkUaFpH6cpypKetD/xxGyXnthGWomu6wXr0PDhxK8FL8T6ctEjr3P8XBaKjeO/sHsKPKmQEiIjGkyOAsLVxeWKpceb05L8bseo7F88PFALREOYhJkeQAjCPOWMkn+HXTP8Se3lokcW1YxFIdTdg5u/nrot//ASLdIzdutYyFYFc4kpfWPDI9DhVDJIwHDv0SjU9SWxcsxguz4S0lrOKlqmfij8H49V+w6HE39FtyNufoqycf5f35zUuCs6d5QIGoRlxD21sjlR1gS2hdL6I+f+20zHWkZpnkczcCnza5518vActaemV1b0BdkmB30EQhY0bi8WNoKgW0baRaY0KARQzMp/1bmF3ZCxm1rOVENlfIfT11saNAVZJYJ6QIIm1ytBMWZme1kl/8Nx0LrmJoK295fDVBWW+sn6M578MxOvn9TaGT9NmjN1aSYiWyC+gLkLJo7LYQFaa2pzRBSLW8DGmGzxd10XmL/tPIkwkfIA9IR2dvLs58lS4L8zy3kUGZsZoC/J3NVM16PA+jPH9ccJyn2OQuIRYqM6F2SKnbxmOJPQsJkzgELpn8Vn3ByO71z2o8NSlWzgKP4icdcKGdZ6HUUf9D+61anzqeWc58eRH1Zt7 UcDrKA/s GgNLfqNya+jH3++3VIzzS2ayO3QKvkj2XWhhrQ5NwuAUEbwBqb0uQtt78hkIL+SOhCQLoj1tCFZ8151FpdH1upXY+32kt/Wxj558sS4nizsMKpf3Xbs1k6Tch7TSNm6XbQ41WZlF7DoOo4xe8DwGFgTucc8tc9Epe7XljnOM2tiyUvQGjuwdb63ZdVRnZfyumQADQWGCsdh237SmNYrz62QuTZhRVIFRYMtpf41uUls2i95LzXAtKrXuPIi0uKgjRUzcigD4wZraCXwjGFOOQzigHyUoIecjOYgGDTxkZZspwO8vIS+5s1LrjN75kWxMb+i3HMIO4quS1dFyDkL7A6u/wSUncNhJ9pf3ULWwiqLRsc+Jjha6LP3UxVQ== 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: > The sysfs attributes for memory blocks require the node ID to be > set and initialized, so move the node activation before adding > new memory blocks. This also has the nice side effect that the > BUG_ON() can be converted into a WARN_ON() as we now can handle > registration errors. > > Fixes: b9ff036082cd ("mm/memory_hotplug.c: make add_memory_resource use __try_online_node") > Signed-off-by: Hannes Reinecke > Acked-by: David Hildenbrand > --- > drivers/base/memory.c | 4 ++-- > include/linux/memory.h | 2 +- > mm/memory_hotplug.c | 32 +++++++++++++++++--------------- > 3 files changed, 20 insertions(+), 18 deletions(-) > > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > index 2b951e5f8a27..4ce93fb54525 100644 > --- a/drivers/base/memory.c > +++ b/drivers/base/memory.c > @@ -892,7 +892,7 @@ static void remove_memory_block(struct memory_block *memory) > * Called under device_hotplug_lock. > */ > int create_memory_block_devices(unsigned long start, unsigned long size, > - struct vmem_altmap *altmap, > + int nid, struct vmem_altmap *altmap, > struct memory_group *group) > { > const unsigned long start_block_id = pfn_to_block_id(PFN_DOWN(start)); > @@ -906,7 +906,7 @@ int create_memory_block_devices(unsigned long start, unsigned long size, > return -EINVAL; > > for (block_id = start_block_id; block_id != end_block_id; block_id++) { > - ret = add_memory_block(block_id, NUMA_NO_NODE, MEM_OFFLINE, altmap, group); > + ret = add_memory_block(block_id, nid, MEM_OFFLINE, altmap, group); > if (ret) > break; > } > diff --git a/include/linux/memory.h b/include/linux/memory.h > index 5ec4e6d209b9..d7c3a4856031 100644 > --- a/include/linux/memory.h > +++ b/include/linux/memory.h > @@ -161,7 +161,7 @@ static inline unsigned long memory_block_advised_max_size(void) > extern int register_memory_notifier(struct notifier_block *nb); > extern void unregister_memory_notifier(struct notifier_block *nb); > int create_memory_block_devices(unsigned long start, unsigned long size, > - struct vmem_altmap *altmap, > + int nid, struct vmem_altmap *altmap, > struct memory_group *group); > void remove_memory_block_devices(unsigned long start, unsigned long size); > extern void memory_dev_init(void); > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index b1caedbade5b..204bd6f19d8d 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -1478,7 +1478,7 @@ static int create_altmaps_and_memory_blocks(int nid, struct memory_group *group, > } > > /* create memory block devices after memory was added */ > - ret = create_memory_block_devices(cur_start, memblock_size, > + ret = create_memory_block_devices(cur_start, memblock_size, nid, > params.altmap, group); > if (ret) { > arch_remove_memory(cur_start, memblock_size, NULL); > @@ -1540,8 +1540,16 @@ int add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) > > ret = __try_online_node(nid, false); > if (ret < 0) > - goto error; > - new_node = ret; > + goto error_memblock_remove; > + if (ret) { > + node_set_online(nid); > + ret = __register_one_node(nid); > + if (WARN_ON(ret)) { > + node_set_offline(nid); > + goto error_memblock_remove; > + } > + new_node = true; > + } > > /* > * Self hosted memmap array > @@ -1557,24 +1565,13 @@ int add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) > goto error; > > /* create memory block devices after memory was added */ > - ret = create_memory_block_devices(start, size, NULL, group); > + ret = create_memory_block_devices(start, size, nid, NULL, group); > if (ret) { > arch_remove_memory(start, size, params.altmap); > goto error; > } > } > > - if (new_node) { > - /* If sysfs file of new node can't be created, cpu on the node > - * can't be hot-added. There is no rollback way now. > - * So, check by BUG_ON() to catch it reluctantly.. > - * We online node here. We can't roll back from here. > - */ > - node_set_online(nid); > - ret = __register_one_node(nid); > - BUG_ON(ret); > - } > - > register_memory_blocks_under_node(nid, PFN_DOWN(start), > PFN_UP(start + size - 1), > MEMINIT_HOTPLUG); > @@ -1599,6 +1596,11 @@ int add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) > > return ret; > error: > + if (new_node) { > + node_set_offline(nid); > + unregister_one_node(nid); > + } > +error_memblock_remove: > if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK)) > memblock_remove(start, size); > error_mem_hotplug_end: This looks good to me. Reviewed-by: Donet Tom