From: Robert Richter <rrichter@amd.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
Alison Schofield <alison.schofield@intel.com>,
Dan Williams <dan.j.williams@intel.com>,
"Dave Hansen" <dave.hansen@linux.intel.com>
Cc: <linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-cxl@vger.kernel.org>, Robert Richter <rrichter@amd.com>,
Derick Marks <derick.w.marks@intel.com>,
Len Brown <lenb@kernel.org>
Subject: [PATCH 1/3] x86/numa: Fix SRAT lookup for CFMWS ranges with numa_fill_memblks()
Date: Mon, 18 Mar 2024 22:09:00 +0100 [thread overview]
Message-ID: <20240318210904.2188120-2-rrichter@amd.com> (raw)
In-Reply-To: <20240318210904.2188120-1-rrichter@amd.com>
With kconfig option NUMA_KEEP_MEMINFO disabled the SRAT lookup done
with numa_fill_memblks() fails returning NUMA_NO_MEMBLK (-1). An
existing SRAT memory range cannot be found for a CFMWS address range.
This causes the addition of a duplicate numa_memblk with a different
node id and a subsequent page fault and kernel crash during boot.
Note that the issue was initially introduced with [1]. But since
phys_to_target_node() was originally used that returned the valid node
0, an additional numa_memblk was not added. Though, the node id was
wrong too.
Fix this by enabling NUMA_KEEP_MEMINFO for x86 with ACPI and NUMA
enabled.
[1] fd49f99c1809 ("ACPI: NUMA: Add a node and memblk for each CFMWS not in SRAT")
Fixes: 8f1004679987 ("ACPI/NUMA: Apply SRAT proximity domain to entire CFMWS window")
Cc: Derick Marks <derick.w.marks@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Alison Schofield <alison.schofield@intel.com>
Signed-off-by: Robert Richter <rrichter@amd.com>
---
drivers/acpi/numa/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/acpi/numa/Kconfig b/drivers/acpi/numa/Kconfig
index 849c2bd820b9..2f4ac6ac6768 100644
--- a/drivers/acpi/numa/Kconfig
+++ b/drivers/acpi/numa/Kconfig
@@ -3,6 +3,7 @@ config ACPI_NUMA
bool "NUMA support"
depends on NUMA
depends on (X86 || ARM64 || LOONGARCH)
+ select NUMA_KEEP_MEMINFO if X86
default y if ARM64
config ACPI_HMAT
--
2.39.2
next prev parent reply other threads:[~2024-03-18 21:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-18 21:08 [PATCH 0/3] ACPI/NUMA: SRAT/CEDT fixes and updates Robert Richter
2024-03-18 21:09 ` Robert Richter [this message]
2024-03-18 21:14 ` [PATCH 1/3] x86/numa: Fix SRAT lookup for CFMWS ranges with numa_fill_memblks() Robert Richter
2024-03-18 21:31 ` Dan Williams
2024-03-18 21:26 ` Dan Williams
2024-03-18 21:50 ` Robert Richter
2024-03-19 11:54 ` [PATCH] cxl: Fix use of phys_to_target_node() outside of init section Robert Richter
2024-03-20 0:21 ` Dan Williams
2024-03-21 12:09 ` Robert Richter
2024-03-18 21:09 ` [PATCH 1/3] x86/numa: Fix SRAT lookup of CFMWS ranges with numa_fill_memblks() Robert Richter
2024-03-18 21:09 ` [PATCH 2/3] ACPI/NUMA: Print CXL Early Discovery Table (CEDT) Robert Richter
2024-03-18 21:30 ` Dan Williams
2024-03-18 21:55 ` Robert Richter
2024-03-18 21:09 ` [PATCH 3/3] ACPI/NUMA: Remove architecture dependent remainings Robert Richter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240318210904.2188120-2-rrichter@amd.com \
--to=rrichter@amd.com \
--cc=alison.schofield@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=derick.w.marks@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox