public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] ACPI: NUMA: debug invalid unused PXM value for CFMWs
@ 2025-03-13  6:09 Yuquan Wang
  2025-03-13 15:02 ` Gregory Price
  2025-03-13 16:28 ` Alison Schofield
  0 siblings, 2 replies; 8+ messages in thread
From: Yuquan Wang @ 2025-03-13  6:09 UTC (permalink / raw)
  To: rafael, lenb, dave, jonathan.cameron, dave.jiang,
	alison.schofield, vishal.l.verma, ira.weiny, dan.j.williams,
	rrichter, bfaccini, rppt, haibo1.xu
  Cc: chenbaozi, linux-acpi, linux-kernel, linux-cxl, Yuquan Wang

The absence of SRAT would cause the fake_pxm to be -1 and increment
to 0, then send to acpi_parse_cfmws(). If there exists CXL memory
ranges that are defined in the CFMWS and not already defined in the
SRAT, the new node (node0) for the CXL memory would be invalid, as
node0 is already in "used".

This utilizes disable_srat() & srat_disabled() to fail CXL init.

Signed-off-by: Yuquan Wang <wangyuquan1236@phytium.com.cn>
---

Changes in v2:
- Add disable_srat() when fake_pxm is invalid
- Add srat_disabled() check in cxl_acpi_probe() and acpi_parse_cfmws()


 drivers/acpi/numa/srat.c | 10 ++++++++++
 drivers/cxl/acpi.c       |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c
index 00ac0d7bb8c9..2dac25c9258a 100644
--- a/drivers/acpi/numa/srat.c
+++ b/drivers/acpi/numa/srat.c
@@ -441,6 +441,11 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header,
 	start = cfmws->base_hpa;
 	end = cfmws->base_hpa + cfmws->window_size;
 
+	if (srat_disabled()) {
+		pr_err("SRAT is missing or bad while processing CFMWS.\n");
+		return -EINVAL;
+	}
+
 	/*
 	 * The SRAT may have already described NUMA details for all,
 	 * or a portion of, this CFMWS HPA range. Extend the memblks
@@ -646,6 +651,11 @@ int __init acpi_numa_init(void)
 		if (node_to_pxm_map[i] > fake_pxm)
 			fake_pxm = node_to_pxm_map[i];
 	}
+
+	/* Make sure CFMWs fake nodes start at node[1] */
+	if (fake_pxm < 0)
+		disable_srat();
+
 	last_real_pxm = fake_pxm;
 	fake_pxm++;
 	acpi_table_parse_cedt(ACPI_CEDT_TYPE_CFMWS, acpi_parse_cfmws,
diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c
index cb14829bb9be..e75a8ead99f6 100644
--- a/drivers/cxl/acpi.c
+++ b/drivers/cxl/acpi.c
@@ -829,6 +829,10 @@ static int cxl_acpi_probe(struct platform_device *pdev)
 	if (rc)
 		return rc;
 
+	/* CXL must be in a NUMA system */
+	if (srat_disabled())
+		return -EINVAL;
+
 	cxl_res = devm_kzalloc(host, sizeof(*cxl_res), GFP_KERNEL);
 	if (!cxl_res)
 		return -ENOMEM;
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2025-03-14 16:56 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-13  6:09 [PATCH v2] ACPI: NUMA: debug invalid unused PXM value for CFMWs Yuquan Wang
2025-03-13 15:02 ` Gregory Price
2025-03-14 10:12   ` Jonathan Cameron
2025-03-14 13:38     ` Gregory Price
2025-03-14 16:55       ` Jonathan Cameron
2025-03-13 16:28 ` Alison Schofield
2025-03-14  7:55   ` Yuquan Wang
2025-03-14 16:55     ` Alison Schofield

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox