ACPI/NUMA: SRAT/CEDT fixes and updates
cover ACPI/NUMA: 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. It should be marked stable.
2nd patch adds diagnostic printouts for CEDT.
3rd patch removes architectural code no longer needed.
Robert Richter (3):
x86/numa: Fix SRAT lookup of CFMWS ranges with numa_fill_memblks() ACPI/NUMA: Print CXL Early Discovery Table (CEDT) ACPI/NUMA: Remove architecture dependent remainings
drivers/acpi/numa/Kconfig | 1 + drivers/acpi/numa/srat.c | 178 ++++++++++++++++++++++++++++---------- include/linux/acpi.h | 5 -- 3 files changed, 133 insertions(+), 51 deletions(-)
Signature · 1 line
2.39.2
PATCH 1/3 x86/numa: Fix SRAT lookup for CFMWS ranges with numa_fill_memblks()
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")
--- drivers/acpi/numa/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/numa/Kconfig +1 -0
@@ -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
Signature · 1 line
2.39.2
Re: [PATCH 1/3] x86/numa: Fix SRAT lookup for CFMWS ranges with numa_fill_memblks()
Quoted 14 lines · Robert Richter
With kconfig option
NUMA_KEEP_MEMINFOdisabled the SRAT lookup done withnuma_fill_memblks()fails returningNUMA_NO_MEMBLK(-1). 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.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.Fix this by enabling
NUMA_KEEP_MEMINFOfor x86 with ACPI and NUMA enabled.
Quoted 7 lines
[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 <[email protected]>Cc Dan Williams <[email protected]>Cc Alison Schofield <[email protected]>Signed-off-by Robert Richter <[email protected]>
This patch should be dropped in favor of the other 1/3 patch, it is a leftover.
Thanks,
-Robert
Re: [PATCH 1/3] x86/numa: Fix SRAT lookup for CFMWS ranges with numa_fill_memblks()
Quoted 17 lines · Robert Richter
Quoted 16 lines · Robert Richter
With kconfig option
NUMA_KEEP_MEMINFOdisabled the SRAT lookup done withnuma_fill_memblks()fails returningNUMA_NO_MEMBLK(-1). 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.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.Fix this by enabling
NUMA_KEEP_MEMINFOfor x86 with ACPI and NUMA enabled.[1]
fd49f99c1809("ACPI: NUMA: Add a node and memblk for each CFMWS not in SRAT")
Quoted 8 lines
Quoted 5 lines
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]>Signed-off-by Robert Richter <[email protected]>This patch should be dropped in favor of the other 1/3 patch, it is a leftover.
What "other" patch? Did I respond to the wrong one?
Re: [PATCH 1/3] x86/numa: Fix SRAT lookup for CFMWS ranges with numa_fill_memblks()
In reply to Robert RichterQuoted 30 lines · Robert Richter
With kconfig option
NUMA_KEEP_MEMINFOdisabled the SRAT lookup done withnuma_fill_memblks()fails returningNUMA_NO_MEMBLK(-1). 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.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.Fix this by enabling
NUMA_KEEP_MEMINFOfor 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 <[email protected]>Cc Dan Williams <[email protected]>Cc Alison Schofield <[email protected]>Signed-off-by Robert Richter <[email protected]>--- drivers/acpi/numa/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/acpi/numa/Kconfig +0
-0
drivers/acpi/numa/Kconfig config ACPI_NUMA · line 7
Quoted 5 lines
drivers/acpi/numa/Kconfig +1
-0@@ -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
A fix is needed, yes, but this is the wrong one. NUMA_KEEP_MEMINFO is only about marking numa_meminfo data as not "__init". Since numa_fill_memblks() *is* an __init function, it should have no dependency on NUMA_KEEP_MEMINFO.
The fix here involves moving the definition of numa_fill_memblks() out of the "#ifdef CONFIG_NUMA_KEEP_MEMINFO" in arch/x86/include/asm/sparsemem.h so that it does not fallback to the default definition in include/linux/numa.h.
It should also be the case that cxl_acpi needs this:
drivers/cxl/Kconfig +1 -0
@@ -6,6 +6,7 @@ menuconfig CXL_BUS select FW_UPLOAD select PCI_DOE select FIRMWARE_TABLE + select NUMA_KEEP_MEMINFO if NUMA help CXL is a bus that is electrically compatible with PCI Express, but layers three protocols on that signalling (CXL.io, CXL.cache, and
Re: [PATCH 1/3] x86/numa: Fix SRAT lookup for CFMWS ranges with numa_fill_memblks()
Hi Dan,
thanks for the quick review.
Yes, this is the 'old' patch. But only the subject was corrected. I will send a v2 anyway. See below.
Quoted 26 lines · Dan Williams
Quoted 25 lines · Robert Richter
With kconfig option
NUMA_KEEP_MEMINFOdisabled the SRAT lookup done withnuma_fill_memblks()fails returningNUMA_NO_MEMBLK(-1). 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.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.Fix this by enabling
NUMA_KEEP_MEMINFOfor 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 <[email protected]>Cc Dan Williams <[email protected]>Cc Alison Schofield <[email protected]>Signed-off-by Robert Richter <[email protected]>--- drivers/acpi/numa/Kconfig | 1 + 1 file changed, 1 insertion(+)
Quoted 15 lines
drivers/acpi/numa/Kconfig config ACPI_NUMA · line 7
Quoted 10 lines
drivers/acpi/numa/Kconfig +1
-0@@ -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 ARM64A fix is needed, yes, but this is the wrong one.
NUMA_KEEP_MEMINFOis only about markingnuma_meminfodata as not "__init". Sincenuma_fill_memblks()*is* an__initfunction, it should have no dependency onNUMA_KEEP_MEMINFO.
Right, the option is about just keeping it in non-init mem, but the parsing is durint __init. Will take a look.
Quoted 13 lines
The fix here involves moving the definition of
numa_fill_memblks()out of the "#ifdefCONFIG_NUMA_KEEP_MEMINFO" inarch/x86/include/asm/sparsemem.hso that it does not fallback to the default definition ininclude/linux/numa.h.It should also be the case that
cxl_acpineeds this:drivers/cxl/Kconfig +0
-0
drivers/cxl/Kconfig menuconfig CXL_BUS · line 9
Quoted 4 lines
drivers/cxl/Kconfig +1
-0@@ -6,6 +6,7 @@ menuconfig CXL_BUS select FW_UPLOAD select PCI_DOE select FIRMWARE_TABLE + select NUMA_KEEP_MEMINFO if NUMA
Ok, will take a look here too.
Thanks,
-Robert
Quoted 3 lines
drivers/cxl/Kconfig +0
-0help CXL is a bus that is electrically compatible with PCI Express, but layers three protocols on that signalling (CXL.io, CXL.cache, and
PATCH 1/1 cxl: Fix use of phys_to_target_node() outside of init section
In reply to Dan WilliamsHi Dan,
patch below. I have not included it into v2 of the SRAT/CEDT changes as it is cxl specific and can be applied separately.
Thanks,
-Robert
Quoted 7 lines · Dan Williams
It should also be the case that
cxl_acpineeds this:drivers/cxl/Kconfig +0
-0
drivers/cxl/Kconfig menuconfig CXL_BUS · line 12
Quoted 7 lines
drivers/cxl/Kconfig +1
-0@@ -6,6 +6,7 @@ menuconfig CXL_BUS select FW_UPLOAD select PCI_DOE select FIRMWARE_TABLE + select NUMA_KEEP_MEMINFO if NUMA help CXL is a bus that is electrically compatible with PCI Express, but layers three protocols on that signalling (CXL.io, CXL.cache, and
From be5b495980bae41d879909212db02dac0fba978e Mon Sep 17 00:00:00 2001
From: Robert Richter <[email protected]>
Date: Tue, 19 Mar 2024 09:28:33 +0100
Subject: [PATCH] cxl: Fix use of phys_to_target_node() outside of init section
The CXL driver uses both functions phys_to_target_node() and memory_add_physaddr_to_nid(). The x86 architecture relies on the NUMA_KEEP_MEMINFO kernel option to be set. Enable the option for the driver accordingly.
--- drivers/cxl/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/cxl/Kconfig +1 -0
@@ -6,6 +6,7 @@ menuconfig CXL_BUS select FW_UPLOAD select PCI_DOE select FIRMWARE_TABLE + select NUMA_KEEP_MEMINFO if (NUMA && X86) help CXL is a bus that is electrically compatible with PCI Express, but layers three protocols on that signalling (CXL.io, CXL.cache, and
Signature · 1 line
2.39.2
Re: [PATCH] cxl: Fix use of phys_to_target_node() outside of init section
Quoted 13 lines · Robert Richter
Hi Dan,
patch below. I have not included it into v2 of the SRAT/CEDT changes as it is cxl specific and can be applied separately.
Thanks,
-Robert
Quoted 2 lines · Dan Williams
It should also be the case that
cxl_acpineeds this:
Quoted 14 lines
drivers/cxl/Kconfig menuconfig CXL_BUS · line 12
Quoted 12 lines
drivers/cxl/Kconfig +1
-0@@ -6,6 +6,7 @@ menuconfig CXL_BUS select FW_UPLOAD select PCI_DOE select FIRMWARE_TABLE + select NUMA_KEEP_MEMINFO if NUMA help CXL is a bus that is electrically compatible with PCI Express, but layers three protocols on that signalling (CXL.io, CXL.cache, andFrom
be5b495980bae41d879909212db02dac0fba978eMon Sep 17 00:00:00 2001
Hi Robert,
When you send inline patches like this can you remember to include a scissors line? That way tools like "b4 am" automatically know where to trim things. So add a line like the following:
-- >8 --
...see "git mailinfo --help" for details.
Also note that if you reply with an updated patch in a series include the "vX NN/MM" suffix, like "Subject: [PATCH v3 2/3] ..." so that b4 am knows to perform a "partial reroll".
Quoted 30 lines
From: Robert Richter <[email protected]>
Date: Tue, 19 Mar 2024 09:28:33 +0100
Subject: [PATCH] cxl: Fix use ofphys_to_target_node()outside of init sectionThe CXL driver uses both functions
phys_to_target_node()andmemory_add_physaddr_to_nid(). The x86 architecture relies on theNUMA_KEEP_MEMINFOkernel option to be set. Enable the option for the driver accordingly.Suggested-by Dan Williams <[email protected]>Signed-off-by Robert Richter <[email protected]>--- drivers/cxl/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/cxl/Kconfig +1
-0@@ -6,6 +6,7 @@ menuconfig CXL_BUS select FW_UPLOAD select PCI_DOE select FIRMWARE_TABLE + select NUMA_KEEP_MEMINFO if (NUMA && X86) help CXL is a bus that is electrically compatible with PCI Express, but layers three protocols on that signalling (CXL.io, CXL.cache, andSignature · 1 line
2.39.2
Re: [PATCH] cxl: Fix use of phys_to_target_node() outside of init section
Quoted 31 lines · Dan Williams
Quoted 13 lines · Robert Richter
Hi Dan,
patch below. I have not included it into v2 of the SRAT/CEDT changes as it is cxl specific and can be applied separately.
Thanks,
-Robert
Quoted 2 lines · Dan Williams
It should also be the case that
cxl_acpineeds this:Quoted 14 lines
drivers/cxl/Kconfig menuconfig CXL_BUS · line 12
Quoted 12 lines
drivers/cxl/Kconfig +1
-0@@ -6,6 +6,7 @@ menuconfig CXL_BUS select FW_UPLOAD select PCI_DOE select FIRMWARE_TABLE + select NUMA_KEEP_MEMINFO if NUMA help CXL is a bus that is electrically compatible with PCI Express, but layers three protocols on that signalling (CXL.io, CXL.cache, andFrom
be5b495980bae41d879909212db02dac0fba978eMon Sep 17 00:00:00 2001Hi Robert,
Quoted 7 lines
When you send inline patches like this can you remember to include a scissors line? That way tools like "b4 am" automatically know where to trim things. So add a line like the following:
-- >8 --
...see "git mailinfo --help" for details.
Thanks for the inside on your patch processing. Will use that in the future.
Quoted 4 lines
Also note that if you reply with an updated patch in a series include the "vX NN/MM" suffix, like "Subject: [PATCH v3 2/3] ..." so that b4 am knows to perform a "partial reroll".
This patch is in addition to the other SRAT patches and can be applied directly to the cxl tree. That is why there is no version update here. But I replied to this series for reference. I saw the b4 shazam --no-parent option, would that help here?
Thanks,
-Robert
Quoted 33 lines
Quoted 31 lines
From: Robert Richter <[email protected]>
Date: Tue, 19 Mar 2024 09:28:33 +0100
Subject: [PATCH] cxl: Fix use ofphys_to_target_node()outside of init sectionThe CXL driver uses both functions
phys_to_target_node()andmemory_add_physaddr_to_nid(). The x86 architecture relies on theNUMA_KEEP_MEMINFOkernel option to be set. Enable the option for the driver accordingly.Suggested-by Dan Williams <[email protected]>Signed-off-by Robert Richter <[email protected]>--- drivers/cxl/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/cxl/Kconfig +1
-0@@ -6,6 +6,7 @@ menuconfig CXL_BUS select FW_UPLOAD select PCI_DOE select FIRMWARE_TABLE + select NUMA_KEEP_MEMINFO if (NUMA && X86) help CXL is a bus that is electrically compatible with PCI Express, but layers three protocols on that signalling (CXL.io, CXL.cache, andSignature · 1 line
2.39.2
PATCH 1/3 x86/numa: Fix SRAT lookup of CFMWS ranges with numa_fill_memblks()
In reply to Robert RichterWith 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")
--- drivers/acpi/numa/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/numa/Kconfig +1 -0
@@ -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
Signature · 1 line
2.39.2
PATCH 2/3 ACPI/NUMA: Print CXL Early Discovery Table (CEDT)
In reply to Robert RichterThe CEDT contains similar entries as the SRAT. For diagnostic reasons print the CEDT same style as the SRAT.
--- drivers/acpi/numa/srat.c | 112 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+)
drivers/acpi/numa/srat.c +112 -0
@@ -300,6 +300,114 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)return -EINVAL ; } +static int __init +__acpi_table_print_cedt_entry (union acpi_subtable_headers *__header, +void *arg,const unsigned long table_end) +{ +struct acpi_cedt_header *header = (struct acpi_cedt_header *)__header; + +switch (header->type) { +case ACPI_CEDT_TYPE_CHBS : + { +struct acpi_cedt_chbs *p = + (struct acpi_cedt_chbs *)header; + +if (header->length <sizeof (struct acpi_cedt_chbs )) { +pr_warn ("CEDT: unsupported CHBS entry: size %d\n" , + header->length); +break ; + } + +pr_info ("CEDT: CHBS (0x%llx length 0x%llx uid %lu) %s (%d)\n" , + (unsigned long long )p->base, + (unsigned long long )p->length, + (unsigned long )p->uid, + (p->cxl_version ==ACPI_CEDT_CHBS_VERSION_CXL11 ) ? +"cxl11" : + (p->cxl_version ==ACPI_CEDT_CHBS_VERSION_CXL20 ) ? +"cxl20" : +"unsupported version" , + p->cxl_version); + } +break ; +case ACPI_CEDT_TYPE_CFMWS : + { +struct acpi_cedt_cfmws *p = + (struct acpi_cedt_cfmws *)header; +int eiw_to_ways[] = {1 ,2 ,4 ,8 ,16 ,3 ,6 ,12 }; +int targets =-1 ; + +if (header->length <sizeof (struct acpi_cedt_cfmws )) { +pr_warn ("CEDT: unsupported CFMWS entry: size %d\n" , + header->length); +break ; + } + +if (p->interleave_ways <ARRAY_SIZE (eiw_to_ways)) + targets = eiw_to_ways[p->interleave_ways]; +if (header->length <struct_size ( + p, interleave_targets, targets)) + targets =-1 ; + +pr_info ("CEDT: CFMWS (0x%llx length 0x%llx) with %d target%s" , + (unsigned long long )p->base_hpa, + (unsigned long long )p->window_size, + targets, targets >1 ?"s" :"" ); +for (int i =0 ; i < targets; i++) +pr_cont ("%s%lu" , i ?", " :" (" , + (unsigned long )p->interleave_targets[i]); +pr_cont ("%s%s%s%s%s%s\n" , + targets >0 ?")" :"" , + (p->restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE2 ) ? +" type2" :"" , + (p->restrictions &ACPI_CEDT_CFMWS_RESTRICT_TYPE3 ) ? +" type3" :"" , + (p->restrictions &ACPI_CEDT_CFMWS_RESTRICT_VOLATILE ) ? +" volatile" :"" , + (p->restrictions &ACPI_CEDT_CFMWS_RESTRICT_PMEM ) ? +" pmem" :"" , + (p->restrictions &ACPI_CEDT_CFMWS_RESTRICT_FIXED ) ? +" fixed" :"" ); + } +break ; +case ACPI_CEDT_TYPE_CXIMS : + { +struct acpi_cedt_cxims *p = + (struct acpi_cedt_cxims *)header; + +if (header->length <sizeof (struct acpi_cedt_cxims )) { +pr_warn ("CEDT: unsupported CXIMS entry: size %d\n" , + header->length); +break ; + } + +pr_info ("CEDT: CXIMS (hbig %u nr_xormaps %u)\n" , + (unsigned int )p->hbig, + (unsigned int )p->nr_xormaps); + } +break ; +default : +pr_warn ("CEDT: Found unsupported entry (type = 0x%x)\n" , + header->type); +break ; + } + +return 0 ; +} + +static void __init acpi_table_print_cedt_entry (enum acpi_cedt_type id) +{ +acpi_table_parse_cedt (id, __acpi_table_print_cedt_entry,NULL ); +} + +static void __init acpi_table_print_cedt (void ) +{ +/* Print only implemented CEDT types */ +acpi_table_print_cedt_entry (ACPI_CEDT_TYPE_CHBS ); +acpi_table_print_cedt_entry (ACPI_CEDT_TYPE_CFMWS ); +acpi_table_print_cedt_entry (ACPI_CEDT_TYPE_CXIMS ); +} +static int __init acpi_parse_cfmws (union acpi_subtable_headers *header,void *arg,const unsigned long table_end) {
@@ -341,6 +449,7 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, return 0; }#else +static inline void acpi_table_print_cedt (void ) {}static int __init acpi_parse_cfmws (union acpi_subtable_headers *header,void *arg,const unsigned long table_end) {
@@ -526,6 +635,9 @@ int __init acpi_numa_init(void)/* SLIT: System Locality Information Table */ acpi_table_parse (ACPI_SIG_SLIT , acpi_parse_slit); +/* CEDT: CXL Early Discovery Table */ +acpi_table_print_cedt (); +/* * CXL Fixed Memory Window Structures (CFMWS) must be parsed * after the SRAT. Create NUMA Nodes for CXL memory ranges that
Signature · 1 line
2.39.2
Re: [PATCH 2/3] ACPI/NUMA: Print CXL Early Discovery Table (CEDT)
Quoted 2 lines · Robert Richter
The CEDT contains similar entries as the SRAT. For diagnostic reasons print the CEDT same style as the SRAT.
I will defer to Rafael here, but with acpica-tools, cxl-cli, and /proc/iomem is there much value to adding this to the boot-up logs by default?
Re: [PATCH 2/3] ACPI/NUMA: Print CXL Early Discovery Table (CEDT)
Quoted 7 lines · Dan Williams
Quoted 2 lines · Robert Richter
The CEDT contains similar entries as the SRAT. For diagnostic reasons print the CEDT same style as the SRAT.
I will defer to Rafael here, but with acpica-tools, cxl-cli, and
/proc/iomemis there much value to adding this to the boot-up logs by default?
Compared to the number of SRAT printks there are just a few CEDT entries. I have added it as CEDT and SRAT entries have the similar effect to NUMA, so diagnostics should be at the same level.
Thanks,
-Robert
PATCH 3/3 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 an make them static.
[1] cf8e8658100d arch: Remove Itanium (IA-64) architecture
--- drivers/acpi/numa/srat.c | 68 +++++++++++++--------------------------- include/linux/acpi.h | 5 --- 2 files changed, 21 insertions(+), 52 deletions(-)
drivers/acpi/numa/srat.c +21 -47
@@ -208,16 +208,21 @@ int __init srat_disabled(void)return acpi_numa <0 ; } -#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 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);
@@ -234,19 +239,25 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) slit->entry[slit->locality_count * i + j]); } } + +return 0 ; } -/* -* Default callback for parsing of the Proximity Domain <-> Memory -* Area mappings -*/ -int __init -acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma) +static int __initdata parsed_numa_memblks; + +static int __init +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;if (ma->header.length <sizeof (struct acpi_srat_mem_affinity )) {
@@ -293,6 +304,8 @@ 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:bad_srat ();
@@ -448,27 +461,6 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, (*fake_pxm)++;return 0 ; } -#else -static inline void acpi_table_print_cedt (void ) {} -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) -{ -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)
@@ -559,24 +551,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;
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