From patchwork Fri Mar 28 09:21:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuquan Wang X-Patchwork-Id: 14031785 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 D158AC36013 for ; Fri, 28 Mar 2025 09:22:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1735B280120; Fri, 28 Mar 2025 05:22:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0FAAF2800FF; Fri, 28 Mar 2025 05:22:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB4F8280120; Fri, 28 Mar 2025 05:22:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CD5B12800FF for ; Fri, 28 Mar 2025 05:22:03 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 861AC121F61 for ; Fri, 28 Mar 2025 09:22:03 +0000 (UTC) X-FDA: 83270418126.21.FA244C1 Received: from sgoci-sdnproxy-4.icoremail.net (sgoci-sdnproxy-4.icoremail.net [129.150.39.64]) by imf20.hostedemail.com (Postfix) with ESMTP id 2E3831C000D for ; Fri, 28 Mar 2025 09:21:59 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of wangyuquan1236@phytium.com.cn designates 129.150.39.64 as permitted sender) smtp.mailfrom=wangyuquan1236@phytium.com.cn; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743153721; 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=a5r1ryGLlz9SXkBF0IzdShCiEoXMqqkQoJZL7zvgS8E=; b=sGE1zXXOS3DyPmK37yrTzxiR0tviJKnJTaYOSmQApWyJpKlUEdsu6SJa8UjtqF4Hp+vFO8 qZMC1Qlk/Hi/Si7ufHrZtiuRv+s6ZykTfKkUJSl0xs26qNeJBiUND/yjtKzE33GEoGkq77 /wXIyXzGB8VYWVRerC4y9L1PVYXvkzU= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of wangyuquan1236@phytium.com.cn designates 129.150.39.64 as permitted sender) smtp.mailfrom=wangyuquan1236@phytium.com.cn; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743153721; a=rsa-sha256; cv=none; b=RV2yN7cQtv1O86PhmukpznihIWtUiTlG4yfzgxgvHkI+v4hUsc3ADCRhiNLU1cvQVYGjID VOCuby9CM6B3zTRVIW8tuVL/37UYQKBqwOWvrY4diCeNvV1lVcR9/E5BQxr8W1JU/uteYX oHJ+KzquHurfUg1+a0wJcIO0vJziToY= Received: from prodtpl.icoremail.net (unknown [10.12.1.20]) by hzbj-icmmx-7 (Coremail) with SMTP id AQAAfwC3vmoyauZnUE0hDw--.1968S2; Fri, 28 Mar 2025 17:21:54 +0800 (CST) Received: from phytium.com.cn (unknown [123.150.8.50]) by mail (Coremail) with SMTP id AQAAfwB3e4cuauZn2txYAA--.2899S3; Fri, 28 Mar 2025 17:21:52 +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-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, chenbaozi@phytium.com.cn, Yuquan Wang Subject: [PATCH v2] mm: numa_memblks: introduce numa_add_reserved_memblk Date: Fri, 28 Mar 2025 17:21:32 +0800 Message-Id: <20250328092132.2695299-1-wangyuquan1236@phytium.com.cn> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CM-TRANSID: AQAAfwB3e4cuauZn2txYAA--.2899S3 X-CM-SenderInfo: 5zdqw5pxtxt0arstlqxsk13x1xpou0fpof0/1tbiAQADAWflrrMJuQABst X-Coremail-Antispam: 1Uk129KBjvJXoWxCFyxZFyUXrW7Jw1xCFyUWrg_yoW5Zw18pa yUG3Z8XayxGr1xGw1xuryj9w1S93Z5KF1DGFZrGr43ZF4rWry2vr4jyFnxZr1DtrW7ur1r Wr4vy3W5uw1rAFUanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj DUYxn0WfASr-VFAU7a7-sFnT9fnUUIcSsGvfJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJUUU UUUUU X-Rspamd-Queue-Id: 2E3831C000D X-Stat-Signature: e48htsfeyx63319ifhdcjnnphfqe8nah X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1743153719-56813 X-HE-Meta: U2FsdGVkX1+j7vGNvD8/pB+U5gxAw5C0WEPRd1Jtzr2VNqSVHmeJeDVX0B+UsRNyuDUCQyQzZXnfOuB7mb3VHlvruIfdFdD4fa1boh35We/m9yfs+IwX5EMMrJe4QO+zMjWWsqfPv0XTSfUYHRmIu0tr3T/490xirZ+h2z27PsPDvtNgLSWLG+gMFmO/obWsNMLNSDezEDrCwCVTP5GubjX+IYaLkF2oJHeQq6vVE8EN7BXZoOi7Hpa8kZv1YSLUMZNhxNTCDW3oLoi7cP079/3KBhIsnzah6Al2kno+E6d6pvehUQgN7SF7khnO7egZjlc7TF9YVHnZk3OlMHRTUiv8AKNxCjc2FSlsgYgp6P2/HOZleKnftiyw0GE5ucpKy17ivcoqNQyjFySWut658YtayELhMitaYaHN7qwGlhe//sIHsBATRN+4se4kEkrhqSI+TrS+T+5GU1iWfQpdGpMwJP40b1H/MJDLAnpHOZevF4wGJydmAJbNZCGpIE5U1bwEUj9fJGZML6DJpIzgcXt46BafTuWE0ciKOuPzXgGqjUNunPpgGyohItp/cnTZCd+EC6VK1G96ZuylWu6je0ceN+PgASFwIFnrIpBLyPBpaftPOa9+8oYuQsvrDtDzdsAaB61Gg3fPUu9Sq8A853Q9xlx+TmSVihRx7x1NdKWXeNvIlXH8m9WOOGUGhbWNfwde2AUDZ3JaFk/7mLlwbTQrccEf2KQqNk9CaLaV+0Zz+WduZcRRv4jtAP4ViBGWl2h1J4yXzr6+P9tQM65pi9uuZ/tRXalHXtMCQ2HNYr1zrg8wF+qGS9TU0Lu1RIbCYJVMfHZXiIzQ43X6oVmB1zBwyxoMqV+N 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: With numa_add_reserved_memblk(), kernel could add numa_memblk into numa_reserved_meminfo directly. 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 suppot of future hotplug / CXL provisioning. Signed-off-by: Yuquan Wang Acked-by: Mike Rapoport (Microsoft) --- Changes in v2 (Thanks to Dan): - 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() - Provide a more explicit commit message 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 00ac0d7bb8c9..70f1a7c6b54a 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -458,7 +458,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