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 59B3EC83013 for ; Wed, 2 Jul 2025 06:26:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E7A746B00AC; Wed, 2 Jul 2025 02:26:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E29F86B00AD; Wed, 2 Jul 2025 02:26:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF25C6B00AE; Wed, 2 Jul 2025 02:26:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id BA64B6B00AC for ; Wed, 2 Jul 2025 02:26:11 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 31DC180760 for ; Wed, 2 Jul 2025 06:26:11 +0000 (UTC) X-FDA: 83618339742.14.6C93689 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf15.hostedemail.com (Postfix) with ESMTP id D47A9A0003 for ; Wed, 2 Jul 2025 06:26:08 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="ccuX/c/U"; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf15.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751437568; a=rsa-sha256; cv=none; b=5MmqtvXeIfltGpjAlx+B9YM11h4mnJvTgEVVyWbB65uKwCw7Nv1WeuI7mGuK4pOoE3PP0O pmzw3AlptlXVqxqggJS2lls+Jsr0uk9Ll+N9VB/16ydYgVuFY5TDNqVPktXbShq0XNzwlD IrcT206HHbMG/dCW2QYTDMFDXwDy9z4= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="ccuX/c/U"; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf15.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751437568; 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=kYgfD7AsM+2EGCkijj9gYdA6+THQX4LUmAX70hMnYdc=; b=p0p3JXLiOM/teGTtxj05VzwvuNwBZhAF8STIdy482Bv+J/rGL+MZyyAuYFazJdN64EU1Nt LMibn8/iq0eFTft4KrBmv2KJUFYhAehtgcyt1rJk1qScDCtW/OvWdbR9aZZjyJ9WG1Ez3C aD3+nzIvXKJSR6sCAYmVP5ltJ9uHoMU= Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 561KevLx013644; Wed, 2 Jul 2025 06:26:00 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=kYgfD7 AsM+2EGCkijj9gYdA6+THQX4LUmAX70hMnYdc=; b=ccuX/c/UF9N9VrnYkuNhtK /wmuXUDtHEdDhfd9t0C48lrOf4dhbq926QWKxPq0sGTqcFkLW+nRU8JAz5X0zaO2 zAWW6DwgVdKFUOIXbzmkd7SMAZFG8QfMXza80OIHZwMKWj+xakcJ6MsoMwQHHtw5 ako2HiUXqf++zpRfBBCsee7xNgTnAHHbh7wDrb2whYh4bloath+s48LdErqKNC93 QtbZuxF/Dmryuq1y4yyvVgRpE08UVkq4a/fCsHsyPM4QMcy1qn8l5JUCveyxTXeM u0YuBwp63O8VhOe322qbm/jWwfgIvEL0wzugUJ27CkZitHEwBYHLs8lb1Zw4c9DQ == 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 47j6u1ufeq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 02 Jul 2025 06:26:00 +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 5624cBbZ032225; Wed, 2 Jul 2025 06:25:59 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 47ju40pc6t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 02 Jul 2025 06:25:59 +0000 Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5626Pxst25428612 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 2 Jul 2025 06:25:59 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 28A8D58054; Wed, 2 Jul 2025 06:25:59 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7FCCB5805C; Wed, 2 Jul 2025 06:25:57 +0000 (GMT) Received: from [9.109.245.113] (unknown [9.109.245.113]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Wed, 2 Jul 2025 06:25:57 +0000 (GMT) Message-ID: Date: Wed, 2 Jul 2025 11:55:56 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] mm/memory_hotplug: activate node before adding new memory blocks To: Hannes Reinecke , David Hildenbrand Cc: Oscar Salvador , linux-mm@kvack.org References: <20250701114155.16452-1-hare@kernel.org> <20250701114155.16452-3-hare@kernel.org> Content-Language: en-US From: Donet Tom In-Reply-To: <20250701114155.16452-3-hare@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 3IheEfq3M52yQIgtRVU1MVivwiBMr1Az X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzAyMDA0OCBTYWx0ZWRfX6WZ4XY/vJm+D qYFxIG4kABoO4+6Rj81y4LqMQJf1kBXjtGYOCaap3jMJ5l11IsQ7w02XOZfQ/4fJ+3fq0aojcHU CPUTSX+NS4eRr6w8typ9JtL7ei0Hk6V5K8VM83ii6PHVwB/kcHGb8ETMRaDzeiGIo9IctL9OoX8 lSagS4q9nZosnI2OoWxpUy9Lp4j+Wn4iewPklD+YK8de0oqQeE6uZYMqrm4EbEp13T3Er7Ytqm3 ufjmNgKItiDJy/Vn36IaRdArUcZBMCbA4xxym11Ivql99ZPp0YSFXkUX0+qay8cggnXU0SZFmo6 dYBzs6Ka1Y09uhp98RgUb6/ieoM5Ov/s6PURsjfR4jtuaM+8h6X668tXDU0rTX3qQrSt8jmuZoq vgyj+4iS2X8SX897jGRgnjGfTmSUGms8f6aY9N+5TteNJ/7b4mcj1DkEVaa0VXq5ctsqwCQs X-Proofpoint-GUID: 3IheEfq3M52yQIgtRVU1MVivwiBMr1Az X-Authority-Analysis: v=2.4 cv=GrRC+l1C c=1 sm=1 tr=0 ts=6864d0f8 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=VwQbUJbxAAAA:8 a=zqQ7UnPtLUSbktUlCsEA:9 a=QEXdDO2ut3YA:10 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-01_02,2025-06-27_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 priorityscore=1501 adultscore=0 mlxlogscore=999 mlxscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507020048 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: D47A9A0003 X-Stat-Signature: 3xxgn7dejbyk5hwxezjqpbha5sbu48dn X-HE-Tag: 1751437568-171690 X-HE-Meta: U2FsdGVkX1/6XFB06a/5gD+ij2lDYIdSFvctclHdAjnSSbV6OdlJ2Nes6LmODUuv01qtNtOVgduT3wN5Y9i2rObTriLht5k/Ei45MJ4xd+wB9ElUGxfxi8pGnd8ojWyiA/KUa4QD9FvsyoD7Dxs3qQbx/cKH66bEHkLW5ct7gC7Cz0xdPGtKrAYb5QZE/pGGT5JRVrnBZvixcg88OSsYa2VHWUyDQQEBmzIBzrNu9vK1zdmSWkKePfvtKDP8cZ5uP3/HsFQFDE1uMAz2J0VpjgpcylmMRavE5seesA4v1NPCfR1qIq5dwSltSgejoHObvjmLtauLamoOC5ZxteKHwL9Krjg7IFEkAi0rETR/AKLrWkeE11GEprrEMMG4+QFAl6rBuBDwyQlYe/OKv6n6EQBOLHHEZAExC2L1jeWQ/uobkStCcTN/Hfe0/3/5+c1sSwz56fngsX+KGaq/2wbUAeEOMljQ9sm+kicAiwmaWhInfjd4P6c2fe9msu6WZCI2M2mWJJXpVm7evvziCtKoCL609w34vR0qmtTlaBeHpXhbojMNRbSjF4gn4GxTjDs92QhdchsmGvyiEPeW/KXaHY6vXhjQhd7H0FsG+PduZUpmdveBDHiBUQEvpATL+jQxCFs2z8KuK1bFdrHqlMssw0N1EWhyIgQT5fQ//SUVKWwpVscoksY49NDMcaQs5PofpgwdejROQnI7CdwPNHp/HLqpVh69y/m+0itP/76sTdD5GvamxJXU4AMrXIsAGXAfZkV+jaBgMSLv2JpBC6hYwDaGwleQBpr9dw8lItgwPj95m/t62UWUbWaOHVrx2M3Hq6nWvldtQW9bX/6AOY0jM3WdgX48iFn8meU5G7Z72KPCnbiDAmGr1jxVOVQwojd9RPPtnfRAe2kEWuBq7mHNRjopiqHmxjKVpPDlYyn8krVQr3vhjbwcJNy0CHeQPHcvmJrbLRpZcMOYqqXHq73 nF1Hjj50 hhiRNOPloOKfKGMFVAElXjSG+5VUDBotJ/FFAk8sHoVBL5zo8v2AZwevRyZ37JPfYBQGACvPrnc/OZjk52GfDEytDt077H8C9/DqgvYnzB5NK1Hl4SVuD5d9BTd5dO26zldfwSTwFfvKbEvXXH3G1Mm8orii5WQau1vvxKETr0blCxMVwriZWg93lvHb7wEFNL4uqGOyiEK1eqq4IPsK6+C1GenLRqCgt0eD1dqnk3Be84tarZnKaUKP60HmWAdcrwTG3efaOnQkBR4GZi2/eVQCpLNI1jmkfuiTVlRmN7JPxWjk2kEkVSf1ji498gUXwqeYshsLMeL6Ujh8= 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: Hi Hannes Reinecke On 7/1/25 5:11 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. Since this fixes the issue, should we consider adding a Fixes: tag? > Signed-off-by: Hannes Reinecke > --- > drivers/base/memory.c | 19 +++++++++---------- > include/linux/memory.h | 2 +- > mm/memory_hotplug.c | 32 +++++++++++++++++--------------- > 3 files changed, 27 insertions(+), 26 deletions(-) > > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > index 2b951e5f8a27..d24a90e0ea96 100644 > --- a/drivers/base/memory.c > +++ b/drivers/base/memory.c > @@ -810,15 +810,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 > > @@ -892,7 +891,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 +905,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: