SRAT/CEDT fixes and updates
v7 cover SRAT/CEDT fixes and updates
Some fixes and updates for SRAT/CEDT parsing code. Patches can be applied individually and are independent.
First patch fixes a page fault during boot (fix as suggested by Dan).
Patches 2 to 4 remove architectural code no longer needed.
Changelog:
v7:
* added Reviewed-by tags
* dropped printout patches (#5 to #7)
v6:
* rebased onto cxl/fixes
* fixed 0day build errors in patch #1:
https://github.com/intel-lab-lkp/linux/commits/Robert-Richter/x86-numa-Fix-SRAT-lookup-of-CFMWS-ranges-with-numa_fill_memblks/20240429-205337
v5:
* dropped: "x86/numa: Fix SRAT lookup of CFMWS ranges with numa_fill_memblks()"
* added: "ACPI/NUMA: Return memblk modification state from numa_fill_memblks()"
* conditionally print CEDT extended memblks
v4:
* updated SOB chains and desription
* added patch "x86/numa: Remove numa_fill_memblks() from sparsemem.h using __weak"
* Reordered patches to move CEDT table printout as an option at the end
* split print table patch and added: "ACPI/NUMA: Add log messages for memory ranges found in CEDT"
v3:
* Rebased onto v6.9-rc1
* Fixing x86 build error in sparsemem.h [Dan/Alison]
* Added CEDT node info [Alison]
* Use pr_debug() for table output [Dan]
* Refactoring split in 3 patches [Dan]
* Fixed performance regression introduced [kbot]
* Fixed checkpatch issues [Dan]
Robert Richter (4):
x86/numa: Fix SRAT lookup of CFMWS ranges with numa_fill_memblks() ACPI/NUMA: Remove architecture dependent remainings ACPI/NUMA: Squash acpi_numa_slit_init() into acpi_parse_slit() ACPI/NUMA: Squash acpi_numa_memory_affinity_init() into
acpi_parse_memory_affinity()
arch/x86/include/asm/sparsemem.h | 2 - arch/x86/mm/numa.c | 4 +- drivers/acpi/numa/srat.c | 82 +++++++++++++------------------- include/linux/acpi.h | 5 -- include/linux/numa.h | 7 +-- 5 files changed, 35 insertions(+), 65 deletions(-)
base-commit: 5d211c7090590033581175d6405ae40917ca3a06
Signature · 1 line
2.39.2
PATCH v7 1/4 x86/numa: Fix SRAT lookup of CFMWS ranges with numa_fill_memblks()
For configurations that have the kconfig option NUMA_KEEP_MEMINFO disabled, numa_fill_memblks() only returns with NUMA_NO_MEMBLK (-1). SRAT lookup fails then because 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.
Fix this by making numa_fill_memblks() always available regardless of NUMA_KEEP_MEMINFO.
As Dan suggested, the fix is implemented to remove numa_fill_memblks() from sparsemem.h and alos using __weak for the function.
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, a message is seen then in the logs:
kernel/numa.c: pr_info_once("Unknown target node for memory at 0x%llx, assuming node 0\n",
[1] commit fd49f99c1809 ("ACPI: NUMA: Add a node and memblk for each CFMWS not in SRAT")
--- arch/x86/include/asm/sparsemem.h | 2 -- arch/x86/mm/numa.c | 4 ++-- drivers/acpi/numa/srat.c | 5 +++++ include/linux/numa.h | 7 +------ 4 files changed, 8 insertions(+), 10 deletions(-)
arch/x86/include/asm/sparsemem.h +0 -2
@@ -37,8 +37,6 @@ extern int phys_to_target_node(phys_addr_t start);#define phys_to_target_node phys_to_target_nodeextern int memory_add_physaddr_to_nid (u64 start);#define memory_add_physaddr_to_nid memory_add_physaddr_to_nid -extern int numa_fill_memblks (u64 start,u64 end); -#define numa_fill_memblks numa_fill_memblks#endif #endif /* __ASSEMBLY__ */
arch/x86/mm/numa.c +2 -2
@@ -929,6 +929,8 @@ int memory_add_physaddr_to_nid(u64 start) }EXPORT_SYMBOL_GPL (memory_add_physaddr_to_nid); +#endif +static int __init cmp_memblk (const void *a,const void *b) {const struct numa_memblk *ma = *(const struct numa_memblk **)a;
@@ -1001,5 +1003,3 @@ int __init numa_fill_memblks(u64 start, u64 end) }return 0 ; } - -#endif
drivers/acpi/numa/srat.c +5 -0
@@ -208,6 +208,11 @@ int __init srat_disabled(void)return acpi_numa <0 ; } +__weak int __init numa_fill_memblks (u64 start,u64 end) +{ +return NUMA_NO_MEMBLK ; +} +#if defined(CONFIG_X86 ) || defined(CONFIG_ARM64 ) || defined(CONFIG_LOONGARCH )/* * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for
include/linux/numa.h +1 -6
@@ -36,12 +36,7 @@ int memory_add_physaddr_to_nid(u64 start);int phys_to_target_node (u64 start);#endif -#ifndef numa_fill_memblks -static inline int __init numa_fill_memblks (u64 start,u64 end) -{ -return NUMA_NO_MEMBLK ; -} -#endif +int numa_fill_memblks (u64 start,u64 end);#else /* !CONFIG_NUMA */ static inline int numa_nearest_node (int node,unsigned int state)
Signature · 1 line
2.39.2
Re: [PATCH v7 1/4] x86/numa: Fix SRAT lookup of CFMWS ranges with numa_fill_memblks()
Quoted 33 lines · Robert Richter
For configurations that have the kconfig option
NUMA_KEEP_MEMINFOdisabled,numa_fill_memblks()only returns withNUMA_NO_MEMBLK(-1). SRAT lookup fails then because an existing SRAT memory range cannot be found for a CFMWS address range. This causes the addition of a duplicatenuma_memblkwith a different node id and a subsequent page fault and kernel crash during boot.Fix this by making
numa_fill_memblks()always available regardless ofNUMA_KEEP_MEMINFO.As Dan suggested, the fix is implemented to remove
numa_fill_memblks()fromsparsemem.hand alos using__weakfor the function.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 additionalnuma_memblkwas not added. Though, the node id was wrong too, a message is seen then in the logs:
kernel/numa.c: pr_info_once("Unknown target node for memory at 0x%llx, assuming node 0\n",[1] commit
fd49f99c1809("ACPI: NUMA: Add a node and memblk for each CFMWS not in SRAT")Suggested-by Dan Williams <[email protected]>Fixes 8f1004679987 ("ACPI/NUMA: Apply SRAT proximity domain to entire CFMWS window")Cc Derick Marks <[email protected]>Cc Dan Williams <[email protected]>Cc Alison Schofield <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>Reviewed-by Alison Schofield <[email protected]>Reviewed-by Dan Williams <[email protected]>Signed-off-by Robert Richter <[email protected]>
Quoted 6 lines
--- arch/x86/include/asm/sparsemem.h | 2 -- arch/x86/mm/numa.c | 4 ++-- drivers/acpi/numa/srat.c | 5 +++++ include/linux/numa.h | 7 +------ 4 files changed, 8 insertions(+), 10 deletions(-)
This needs to go through the ACPI tree but because Robert asked and FWIW:
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquettePATCH v7 2/4 ACPI/NUMA: Remove architecture dependent remainings
In reply to Robert RichterWith the removal of the Itanium architecture [1] the last architecture dependent functions:
acpi_numa_slit_init(), acpi_numa_memory_affinity_init()
were removed. Remove its remainings in the header files too and make them static.
[1] commit cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
--- drivers/acpi/numa/srat.c | 16 ++-------------- include/linux/acpi.h | 5 ----- 2 files changed, 2 insertions(+), 19 deletions(-)
drivers/acpi/numa/srat.c +2 -14
@@ -213,13 +213,12 @@ __weak int __init numa_fill_memblks(u64 start, u64 end)return NUMA_NO_MEMBLK ; } -#if defined(CONFIG_X86 ) || defined(CONFIG_ARM64 ) || defined(CONFIG_LOONGARCH )/* * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for * I/O localities since SRAT does not list them. I/O localities are * not supported at this point. */ -void __init acpi_numa_slit_init (struct acpi_table_slit *slit) +static void __init acpi_numa_slit_init (struct acpi_table_slit *slit) {int i, j;
@@ -241,11 +240,7 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) } } -/* -* Default callback for parsing of the Proximity Domain <-> Memory -* Area mappings -*/ -int __init +static int __init acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma) {u64 start, end;
@@ -345,13 +340,6 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, (*fake_pxm)++;return 0 ; } -#else -static int __init acpi_parse_cfmws (union acpi_subtable_headers *header, -void *arg,const unsigned long table_end) -{ -return 0 ; -} -#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */ static int __init acpi_parse_slit (struct acpi_table_header *table) {
include/linux/acpi.h +0 -5
@@ -242,9 +242,6 @@ static inline bool acpi_gicc_is_usable(struct acpi_madt_generic_interrupt *gicc)return gicc->flags &ACPI_MADT_ENABLED ; } -/* the following numa functions are architecture-dependent */ -void acpi_numa_slit_init (struct acpi_table_slit *slit); -#if defined(CONFIG_X86 ) || defined(CONFIG_LOONGARCH )void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);#else
@@ -267,8 +264,6 @@ static inline void acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { }#endif -int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); -#ifndef PHYS_CPUID_INVALID typedef u32 phys_cpuid_t ;#define PHYS_CPUID_INVALID (phys_cpuid_t)(-1)
Signature · 1 line
2.39.2
PATCH v7 3/4 ACPI/NUMA: Squash acpi_numa_slit_init() into acpi_parse_slit()
In reply to Robert RichterAfter removing architectural code the helper function acpi_numa_slit_init() is no longer needed. Squash it into acpi_parse_slit(). No functional changes intended.
--- drivers/acpi/numa/srat.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
drivers/acpi/numa/srat.c +9 -14
@@ -218,10 +218,16 @@ __weak int __init numa_fill_memblks(u64 start, u64 end)* I/O localities since SRAT does not list them. I/O localities are * not supported at this point. */ -static void __init acpi_numa_slit_init (struct acpi_table_slit *slit) +static int __init acpi_parse_slit (struct acpi_table_header *table) { +struct acpi_table_slit *slit = (struct acpi_table_slit *)table;int i, j; +if (!slit_valid (slit)) { +pr_info ("SLIT table looks invalid. Not used.\n" ); +return -EINVAL ; + } +for (i =0 ; i < slit->locality_count; i++) {const int from_node =pxm_to_node (i);
@@ -238,6 +244,8 @@ static void __init acpi_numa_slit_init(struct acpi_table_slit *slit) slit->entry[slit->locality_count * i + j]); } } + +return 0 ; } static int __init
@@ -341,19 +349,6 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header,return 0 ; } -static int __init acpi_parse_slit (struct acpi_table_header *table) -{ -struct acpi_table_slit *slit = (struct acpi_table_slit *)table; - -if (!slit_valid (slit)) { -pr_info ("SLIT table looks invalid. Not used.\n" ); -return -EINVAL ; - } -acpi_numa_slit_init (slit); - -return 0 ; -} -void __init __weak acpi_numa_x2apic_affinity_init (struct acpi_srat_x2apic_cpu_affinity *pa) {
Signature · 1 line
2.39.2
PATCH v7 4/4 ACPI/NUMA: Squash acpi_numa_memory_affinity_init() into acpi_parse_memory_affinity()
In reply to Robert RichterAfter removing architectural code the helper function acpi_numa_memory_affinity_init() is no longer needed. Squash it into acpi_parse_memory_affinity(). No functional changes intended.
While at it, fixing checkpatch complaints in code moved.
--- drivers/acpi/numa/srat.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-)
drivers/acpi/numa/srat.c +17 -23
@@ -248,22 +248,30 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)return 0 ; } +static int parsed_numa_memblks__initdata ; +static int __init -acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma) +acpi_parse_memory_affinity (union acpi_subtable_headers *header, +const unsigned long table_end) { +struct acpi_srat_mem_affinity *ma;u64 start, end;u32 hotpluggable;int node, pxm; + ma = (struct acpi_srat_mem_affinity *)header; + +acpi_table_print_srat_entry (&header->common); +if (srat_disabled ()) - goto out_err; +return 0 ;if (ma->header.length <sizeof (struct acpi_srat_mem_affinity )) {pr_err ("SRAT: Unexpected header length: %d\n" , ma->header.length); goto out_err_bad_srat; }if ((ma->flags &ACPI_SRAT_MEM_ENABLED ) ==0 ) - goto out_err; +return 0 ; hotpluggable =IS_ENABLED (CONFIG_MEMORY_HOTPLUG ) && (ma->flags &ACPI_SRAT_MEM_HOT_PLUGGABLE );
@@ -301,11 +309,15 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) max_possible_pfn =max (max_possible_pfn,PFN_UP (end -1 )); + parsed_numa_memblks++; +return 0 ; + out_err_bad_srat: +/* Just disable SRAT, but do not fail and ignore errors. */ bad_srat (); -out_err: -return -EINVAL ; + +return 0 ; } static int __init acpi_parse_cfmws(union acpi_subtable_headers *header,
@@ -438,24 +450,6 @@ acpi_parse_gi_affinity(union acpi_subtable_headers *header, }#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */ -static int __initdata parsed_numa_memblks; - -static int __init -acpi_parse_memory_affinity (union acpi_subtable_headers * header, -const unsigned long end) -{ -struct acpi_srat_mem_affinity *memory_affinity; - - memory_affinity = (struct acpi_srat_mem_affinity *)header; - -acpi_table_print_srat_entry (&header->common); - -/* let architecture-dependent part to do it */ -if (!acpi_numa_memory_affinity_init (memory_affinity)) - parsed_numa_memblks++; -return 0 ; -} -static int __init acpi_parse_srat (struct acpi_table_header *table) {struct acpi_table_srat *srat = (struct acpi_table_srat *)table;
Signature · 1 line
2.39.2
Rafael J. Wysocki
maintainerQuoted 59 lines · Robert Richter
Some fixes and updates for SRAT/CEDT parsing code. Patches can be applied individually and are independent.
First patch fixes a page fault during boot (fix as suggested by Dan).
Patches 2 to 4 remove architectural code no longer needed.
Changelog:
v7:
* added Reviewed-by tags
* dropped printout patches (#5 to #7)v6:
* rebased onto cxl/fixes
* fixed 0day build errors in patch #1:https://github.com/intel-lab-lkp/linux/commits/Robert-Richter/x86-numa-Fix-SRAT-lookup-of-CFMWS-ranges-with-numa_fill_memblks/20240429-205337v5:
* dropped: "x86/numa: Fix SRAT lookup of CFMWS ranges withnuma_fill_memblks()"
* added: "ACPI/NUMA: Return memblk modification state fromnuma_fill_memblks()"
* conditionally print CEDT extended memblksv4:
* updated SOB chains and desription
* added patch "x86/numa: Removenuma_fill_memblks()fromsparsemem.husing__weak"
* Reordered patches to move CEDT table printout as an option at the end
* split print table patch and added: "ACPI/NUMA: Add log messages for memory ranges found in CEDT"v3:
* Rebased onto v6.9-rc1
* Fixing x86 build error insparsemem.h[Dan/Alison]
* Added CEDT node info [Alison]
* Usepr_debug()for table output [Dan]
* Refactoring split in 3 patches [Dan]
* Fixed performance regression introduced [kbot]
* Fixed checkpatch issues [Dan]Robert Richter (4):
x86/numa: Fix SRAT lookup of CFMWS ranges withnuma_fill_memblks()ACPI/NUMA: Remove architecture dependent remainings ACPI/NUMA: Squashacpi_numa_slit_init()intoacpi_parse_slit()ACPI/NUMA: Squashacpi_numa_memory_affinity_init()into
acpi_parse_memory_affinity()arch/x86/include/asm/sparsemem.h | 2 - arch/x86/mm/numa.c | 4 +- drivers/acpi/numa/srat.c | 82 +++++++++++++------------------- include/linux/acpi.h | 5 -- include/linux/numa.h | 7 +-- 5 files changed, 35 insertions(+), 65 deletions(-)
Quoted 2 lines
base-commit:
5d211c7090590033581175d6405ae40917ca3a06--
Whole series applied as 6.10 material, thanks!