From patchwork Wed Apr 9 04:01:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuquan Wang X-Patchwork-Id: 14044071 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 494C3C36002 for ; Wed, 9 Apr 2025 04:02:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2AC96B0128; Wed, 9 Apr 2025 00:02:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CB54E6B0129; Wed, 9 Apr 2025 00:02:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B54A428002A; Wed, 9 Apr 2025 00:02:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 90B166B00D3 for ; Wed, 9 Apr 2025 00:02:03 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1EFE8141A6B for ; Wed, 9 Apr 2025 04:02:05 +0000 (UTC) X-FDA: 83313157410.04.E0B9C09 Received: from sgoci-sdnproxy-4.icoremail.net (sgoci-sdnproxy-4.icoremail.net [129.150.39.64]) by imf06.hostedemail.com (Postfix) with ESMTP id 08CCE180015 for ; Wed, 9 Apr 2025 04:02:01 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf06.hostedemail.com: domain of wangyuquan1236@phytium.com.cn designates 129.150.39.64 as permitted sender) smtp.mailfrom=wangyuquan1236@phytium.com.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744171323; 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:references; bh=hUgoXBRh5Iqy4cdbYs5Di1Rva+DLXSHAV+DFFONIGcM=; b=D3WiYBnvNNTIFq5ahfy1zz2Rie7ket/T7b9eI3HNc0zTTpXIbKeVabJ80hjgQCwWMQnXbj LxEeY3Hq1tYzEijvfUge5b1udawWgC92/vMAGEihmvByuzcPnaf0yFXmp1W2SxAzIZT1cx WU5hx7UbZwPoCnTEn33RDvOYiIcPY7g= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf06.hostedemail.com: domain of wangyuquan1236@phytium.com.cn designates 129.150.39.64 as permitted sender) smtp.mailfrom=wangyuquan1236@phytium.com.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744171323; a=rsa-sha256; cv=none; b=xH53q8tjgBhD59ZR2c/UqIjs/3EaZ3kqLhxQcJP+Y3dvuN8gpBfFfgXb9uTh3KxQAfN67A 5GPrn9MNCx5mKvVXSPwL/h6KAFAFRAJwWJyz9gIGw9ytFrd5SK1G0yyQMPFVQ8IWzIBL0w 4LgldzO/7rwLsNQXe21rAbQBSZyuUDA= Received: from prodtpl.icoremail.net (unknown [10.12.1.20]) by hzbj-icmmx-7 (Coremail) with SMTP id AQAAfwCXGywy8fVnU8+wEw--.12446S2; Wed, 09 Apr 2025 12:01:54 +0800 (CST) Received: from phytium.com.cn (unknown [123.150.8.50]) by mail (Coremail) with SMTP id AQAAfwBHSoYw8fVnOyxkAA--.72S3; Wed, 09 Apr 2025 12:01:53 +0800 (CST) From: Yuquan Wang To: Jonathan.Cameron@huawei.com, dan.j.williams@intel.com, rppt@kernel.org, rafael@kernel.org, lenb@kernel.org, akpm@linux-foundation.org, alison.schofield@intel.com, rrichter@amd.com, bfaccini@nvidia.com, haibo1.xu@intel.com, david@redhat.com Cc: linux-cxl@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, chenbaozi@phytium.com.cn, loongarch@lists.linux.dev, Yuquan Wang Subject: [PATCH v2] mm: numa_memblks: introduce numa_add_reserved_memblk Date: Wed, 9 Apr 2025 12:01:21 +0800 Message-Id: <20250409040121.3212489-1-wangyuquan1236@phytium.com.cn> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CM-TRANSID: AQAAfwBHSoYw8fVnOyxkAA--.72S3 X-CM-SenderInfo: 5zdqw5pxtxt0arstlqxsk13x1xpou0fpof0/1tbiAQAOAWf0L0IFaAAfsC X-Coremail-Antispam: 1Uk129KBjvJXoWxXFW7Ar4xuF4DCr48Xr47Jwb_yoW5Zw4rpa yUG3Z8XF4xGw1xGw1xuryj9w1S93WrKr1DJFZrGr13ZF4rWry2vr4UtFsxZr1DtrW7ur1r Wr4vyw15uw1rAFUanT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj DUYxn0WfASr-VFAU7a7-sFnT9fnUUIcSsGvfJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJUUU UUUUU X-Rspamd-Queue-Id: 08CCE180015 X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: k5ya5dm5j1eqcp4n6pxtt487hs1a8dcy X-HE-Tag: 1744171321-16380 X-HE-Meta: U2FsdGVkX1+MQ3tiE7lcQEh89PefY8uH/4CN2TSAPGQo/EiVAbzlERb2Bko6K7MhzWFDZkPHu62JUeqYxpZli/Cy5g2/1V8NTC1R/A26wlOSv7GeRnCpUk6zctOj00J5vIe0l3vmiQ0bffplbpG+rSMS0Z9EkrifkAmxkx3zOSSjvrciV/EyMh2bwb96I+GTHOLr/pDMEgEpGr9uwirbsHmAlcpdxC2inkzdp4SXBGum2yKr1UHgJT7nn5ythDWl+N+iTSDLFg31ChEIsqfIPCvYd0sLqhqN0HTSKkN7es6XUCdr3HKFGvNsEhmAK/xZQxzVOjjGJj6HSN8vpo0yZzXjhB1tWB/6+9B1k0XpLNg69zoGUaSRjsCZkupRZBG65XhEJOohGUOhfv54mgpf/EfsDzsZGEI6Ewl3552JqqSx2bqS7y1QrTX2sf9tjDSjEnkVoJzGlylV2c0tEkcxdNQ+s1dMzYQaTpgelOteNwYv9DJu5bShg+cK+Wltd1zrzm4RCJSY2Lpi78vcniktNkPztxD0iaG9DHTuP5o6QqQh9iO/qqc8enW1FOPgtTf0LeeuD9JHZMKGnH672EOLNlti4AgmjQYkjvmPShEQQIizsCcaLCm2Yucat2JmDCi1vRHyjAGHQV5qO0eqBOwvslCrTg7fgsiAsBBSxI27TKN0Y4kscJmbn0I/D4Q5Rt7uywzLVNZJpXV2iWy/N26+2zX/8aaYnR5OHnU8/MRjSWXdfE22v3uCZt0i52OeFrrNSGsl8BLFpEtz/LmmpWxgSxOhyvh6XqfZji21qg5ve9LUcyzQpkbXXDNSAJvvr8Cs5XoYOTNDPXa39DYTXAr5BWc4NYakc4qo7qh+Z/y8nfqsxOMbYr71IU1HZfuqTUwKIVD7pC63UY+06Y1/LU2UE443KCeqnmASZxxF4Vt9K2wHI+zLnQFi6+TarTlhFZEGi4VgXc5cQlbKE0/i4LM p7hBiHQn 8emam4uEZkfKt4P40J9J9w91HGm/vzjlNCMCWPwIEdMS840pDjTSyXOjEE4xLHoSPiA5kkxBRZZb2SbJmGedTiA/bWzws1df1le2YccKSGsSdnqM1jOrizRWVPVDO5C8oTXnHUEP29JTT5mp39KLK6qIje69MJ4VMoBzt 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: acpi_parse_cfmws() currently adds empty CFMWS ranges to numa_meminfo with the expectation that numa_cleanup_meminfo moves them to numa_reserved_meminfo. There is no need for that indirection when it is known in advance that these unpopulated ranges are meant for numa_reserved_meminfo in support of future hotplug / CXL provisioning. Introduce and use numa_add_reserved_memblk() to add the empty CFMWS ranges directly. Signed-off-by: Yuquan Wang Acked-by: Mike Rapoport (Microsoft) --- Changes in v2 (Thanks to Dan & Alison): - Use numa_add_reserved_memblk() to replace numa_add_memblk() in acpi_parse_cfmws() - Add comments to describe the usage of numa_add_reserved_memblk() - Updating the commit message to clarify the purpose of the patch drivers/acpi/numa/srat.c | 2 +- include/linux/numa_memblks.h | 1 + mm/numa_memblks.c | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index 0a725e46d017..751774f0b4e5 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -453,7 +453,7 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, return -EINVAL; } - if (numa_add_memblk(node, start, end) < 0) { + if (numa_add_reserved_memblk(node, start, end) < 0) { /* CXL driver must handle the NUMA_NO_NODE case */ pr_warn("ACPI NUMA: Failed to add memblk for CFMWS node %d [mem %#llx-%#llx]\n", node, start, end); diff --git a/include/linux/numa_memblks.h b/include/linux/numa_memblks.h index dd85613cdd86..991076cba7c5 100644 --- a/include/linux/numa_memblks.h +++ b/include/linux/numa_memblks.h @@ -22,6 +22,7 @@ struct numa_meminfo { }; int __init numa_add_memblk(int nodeid, u64 start, u64 end); +int __init numa_add_reserved_memblk(int nid, u64 start, u64 end); void __init numa_remove_memblk_from(int idx, struct numa_meminfo *mi); int __init numa_cleanup_meminfo(struct numa_meminfo *mi); diff --git a/mm/numa_memblks.c b/mm/numa_memblks.c index ff4054f4334d..541a99c4071a 100644 --- a/mm/numa_memblks.c +++ b/mm/numa_memblks.c @@ -200,6 +200,28 @@ int __init numa_add_memblk(int nid, u64 start, u64 end) return numa_add_memblk_to(nid, start, end, &numa_meminfo); } +/** + * numa_add_reserved_memblk - Add one numa_memblk to numa_reserved_meminfo + * @nid: NUMA node ID of the new memblk + * @start: Start address of the new memblk + * @end: End address of the new memblk + * + * Add a new memblk to the numa_reserved_meminfo. + * + * Usage Case: numa_cleanup_meminfo() reconciles all numa_memblk instances + * against memblock_type information and moves any that intersect reserved + * ranges to numa_reserved_meminfo. However, when that information is known + * ahead of time, we use numa_add_reserved_memblk() to add the numa_memblk + * to numa_reserved_meminfo directly. + * + * RETURNS: + * 0 on success, -errno on failure. + */ +int __init numa_add_reserved_memblk(int nid, u64 start, u64 end) +{ + return numa_add_memblk_to(nid, start, end, &numa_reserved_meminfo); +} + /** * numa_cleanup_meminfo - Cleanup a numa_meminfo * @mi: numa_meminfo to clean up