Add ACPI NUMA support for RISC-V

PATCH Applied Haibo Xu 10 participants 18 messages Jun 13, 2024 – Jul 24, 2024

Subsystems (5)

ACPI RISC-V arm64 Driver core +1 more subsystems

lore

Share & tools

lore

Haibo Xu

author

2024-06-13 08:36 UTC #0 lore raw

v4 cover Add ACPI NUMA support for RISC-V

This patch series enable RISC-V ACPI NUMA support which was based on the recently approved ACPI ECR[1].

Patch 1/4 add RISC-V specific acpi_numa.c file to parse NUMA information from SRAT and SLIT ACPI tables.
Patch 2/4 add the common SRAT RINTC affinity structure handler. Patch 3/4 change the ACPI_NUMA to a hidden option since it would be selected by default on all supported platform.
Patch 4/4 replace pr_info with pr_debug in arch_acpi_numa_init() to avoid potential boot noise on ACPI platforms that are not NUMA.

Based-on: https://github.com/linux-riscv/linux-riscv/tree/for-next

[1] https://drive.google.com/file/d/1YTdDx2IPm5IeZjAW932EYU-tUtgS08tX/view?usp=sharing

Testing:
Since the ACPI AIA/PLIC support patch set is still under upstream review, hence it is tested using the poll based HVC SBI console and RAM disk.
1) Build latest Qemu with the following patch backported
https://github.com/vlsunil/qemu/commit/42bd4eeefd5d4410a68f02d54fee406d8a1269b0

2) Build latest EDK-II
https://github.com/tianocore/edk2/blob/master/OvmfPkg/RiscVVirt/README.md

3) Build Linux with the following configs enabled
CONFIG_RISCV_SBI_V01=y
CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
CONFIG_NONPORTABLE=y
CONFIG_HVC_RISCV_SBI=y
CONFIG_NUMA=y
CONFIG_ACPI_NUMA=y

4) Build buildroot rootfs.cpio

5) Launch the Qemu machine
qemu-system-riscv64 -nographic \
-machine virt,pflash0=pflash0,pflash1=pflash1 -smp 4 -m 8G \
-blockdev node-name=pflash0,driver=file,read-only=on,filename=RISCV_VIRT_CODE.fd \
-blockdev node-name=pflash1,driver=file,filename=RISCV_VIRT_VARS.fd \
-object memory-backend-ram,size=4G,id=m0 \
-object memory-backend-ram,size=4G,id=m1 \
-numa node,memdev=m0,cpus=0-1,nodeid=0 \
-numa node,memdev=m1,cpus=2-3,nodeid=1 \
-numa dist,src=0,dst=1,val=30 \
-kernel linux/arch/riscv/boot/Image \
-initrd buildroot/output/images/rootfs.cpio \
-append "root=/dev/ram ro console=hvc0 earlycon=sbi"

[    0.000000] ACPI: SRAT: Node 0 PXM 0 [mem 0x80000000-0x17fffffff]
[    0.000000] ACPI: SRAT: Node 1 PXM 1 [mem 0x180000000-0x27fffffff]
[    0.000000] NUMA: NODE_DATA [mem 0x17fe3bc40-0x17fe3cfff]
[    0.000000] NUMA: NODE_DATA [mem 0x27fff4c40-0x27fff5fff]
...
[    0.000000] ACPI: NUMA: SRAT: PXM 0 -> HARTID 0x0 -> Node 0
[    0.000000] ACPI: NUMA: SRAT: PXM 0 -> HARTID 0x1 -> Node 0
[    0.000000] ACPI: NUMA: SRAT: PXM 1 -> HARTID 0x2 -> Node 1
[    0.000000] ACPI: NUMA: SRAT: PXM 1 -> HARTID 0x3 -> Node 1

---
Changes since v3
- Rebase to linux-riscv/for-next(Linux 6.10-rc1)
- Remove original patch 1/6 since it had been merged through

    ACPICA pull(commit fe1c408d50604f)
  - Remove original patch 4/6 since the related changes was
    introduced in commit 3a785e19f43267

Haibo Xu (4):
ACPI: RISCV: Add NUMA support based on SRAT and SLIT
ACPI: NUMA: Add handler for SRAT RINTC affinity structure
ACPI: NUMA: change the ACPI_NUMA to a hidden option
ACPI: NUMA: replace pr_info with pr_debug in arch_acpi_numa_init

 arch/arm64/Kconfig            |   1 -
 arch/loongarch/Kconfig        |   1 -
 arch/riscv/include/asm/acpi.h |  15 +++-
 arch/riscv/kernel/Makefile    |   1 +
 arch/riscv/kernel/acpi.c      |   5 --
 arch/riscv/kernel/acpi_numa.c | 131 ++++++++++++++++++++++++++++++++++
 arch/riscv/kernel/setup.c     |   4 +-
 arch/riscv/kernel/smpboot.c   |   2 -
 drivers/acpi/numa/Kconfig     |   5 +-
 drivers/acpi/numa/srat.c      |  32 ++++++++-
 drivers/base/arch_numa.c      |   2 +-
 include/linux/acpi.h          |   6 ++
 12 files changed, 187 insertions(+), 18 deletions(-)
 create mode 100644 arch/riscv/kernel/acpi_numa.c

Signature · 1 line

2.34.1

Haibo Xu

author

2024-06-13 08:36 UTC #1 lore raw

PATCH v4 1/4 ACPI: RISCV: Add NUMA support based on SRAT and SLIT

Add acpi_numa.c file to enable parse NUMA information from ACPI SRAT and SLIT tables. SRAT table provide CPUs(Hart) and memory nodes to proximity domain mapping, while SLIT table provide the distance metrics between proximity domains.

Signed-off-by Haibo Xu <[email protected]>

Reviewed-by Sunil V L <[email protected]>

---
 arch/riscv/include/asm/acpi.h |  15 +++-
 arch/riscv/kernel/Makefile    |   1 +
 arch/riscv/kernel/acpi.c      |   5 --
 arch/riscv/kernel/acpi_numa.c | 131 ++++++++++++++++++++++++++++++++++
 arch/riscv/kernel/setup.c     |   4 +-
 arch/riscv/kernel/smpboot.c   |   2 -
 include/linux/acpi.h          |   6 ++
 7 files changed, 154 insertions(+), 10 deletions(-)
 create mode 100644 arch/riscv/kernel/acpi_numa.c

arch/riscv/include/asm/acpi.h +13 -2

index 7dad0cf9d701..e0a1f84404f3 100644
@@ -61,11 +61,14 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { }
 
 void acpi_init_rintc_map(void);
 struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu);
-u32 get_acpi_id_for_cpu(int cpu);
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+	return acpi_cpu_get_madt_rintc(cpu)->uid;
+}
+
 int acpi_get_riscv_isa(struct acpi_table_header *table,
 		       unsigned int cpu, const char **isa);
 
-static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
 void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size,
 			     u32 *cboz_size, u32 *cbop_size);
 #else

@@ -87,4 +90,12 @@ static inline void acpi_get_cbo_block_size(struct acpi_table_header *table,
 
 #endif /* CONFIG_ACPI */
 
+#ifdef CONFIG_ACPI_NUMA
+int acpi_numa_get_nid(unsigned int cpu);
+void acpi_map_cpus_to_nodes(void);
+#else
+static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
+static inline void acpi_map_cpus_to_nodes(void) { }
+#endif /* CONFIG_ACPI_NUMA */
+
 #endif /*_ASM_ACPI_H*/

arch/riscv/kernel/Makefile +1 -0

index 5b243d46f4b1..1e2afec141b5 100644
@@ -110,3 +110,4 @@ obj-$(CONFIG_COMPAT)		+= compat_vdso/
 
 obj-$(CONFIG_64BIT)		+= pi/
 obj-$(CONFIG_ACPI)		+= acpi.o
+obj-$(CONFIG_ACPI_NUMA)	+= acpi_numa.o

arch/riscv/kernel/acpi.c +0 -5

index e619edc8b0cc..040bdbfea2b4 100644
@@ -191,11 +191,6 @@ struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu)
 	return &cpu_madt_rintc[cpu];
 }
 
-u32 get_acpi_id_for_cpu(int cpu)
-{
-	return acpi_cpu_get_madt_rintc(cpu)->uid;
-}
-
 /*
  * __acpi_map_table() will be called before paging_init(), so early_ioremap()
  * or early_memremap() should be called here to for ACPI table mapping.

arch/riscv/kernel/acpi_numa.c new file +131 -0

131 lines not on this page · raw message

arch/riscv/kernel/setup.c +3 -1

index 4f73c0ae44b2..a2cde65b69e9 100644
@@ -281,8 +281,10 @@ void __init setup_arch(char **cmdline_p)
 	setup_smp();
 #endif
 
-	if (!acpi_disabled)
+	if (!acpi_disabled) {
 		acpi_init_rintc_map();
+		acpi_map_cpus_to_nodes();
+	}
 
 	riscv_init_cbo_blocksizes();
 	riscv_fill_hwcap();

arch/riscv/kernel/smpboot.c +0 -2

index 19baf0d574d3..0f8f1c95ac38 100644
@@ -96,7 +96,6 @@ static int __init acpi_parse_rintc(union acpi_subtable_headers *header, const un
 	if (hart == cpuid_to_hartid_map(0)) {
 		BUG_ON(found_boot_cpu);
 		found_boot_cpu = true;
-		early_map_cpu_to_node(0, acpi_numa_get_nid(cpu_count));
 		return 0;
 	}

@@ -106,7 +105,6 @@ static int __init acpi_parse_rintc(union acpi_subtable_headers *header, const un
 	}
 
 	cpuid_to_hartid_map(cpu_count) = hart;
-	early_map_cpu_to_node(cpu_count, acpi_numa_get_nid(cpu_count));
 	cpu_count++;
 
 	return 0;

include/linux/acpi.h +6 -0

index 28c3fb2bef0d..5a2b620ccd58 100644
@@ -264,6 +264,12 @@ static inline void
 acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { }
 #endif
 
+#ifdef CONFIG_RISCV
+void acpi_numa_rintc_affinity_init(struct acpi_srat_rintc_affinity *pa);
+#else
+static inline void acpi_numa_rintc_affinity_init(struct acpi_srat_rintc_affinity *pa) { }
+#endif
+
 #ifndef PHYS_CPUID_INVALID
 typedef u32 phys_cpuid_t;
 #define PHYS_CPUID_INVALID (phys_cpuid_t)(-1)

Signature · 1 line

2.34.1

Andrew Jones

2024-07-23 13:30 UTC #2 lore raw

Re: [PATCH v4 1/4] ACPI: RISCV: Add NUMA support based on SRAT and SLIT

Quoted 104 lines · Haibo Xu

Signed-off-by Haibo Xu <[email protected]>

Reviewed-by Sunil V L <[email protected]>

---
 arch/riscv/include/asm/acpi.h |  15 +++-
 arch/riscv/kernel/Makefile    |   1 +
 arch/riscv/kernel/acpi.c      |   5 --
 arch/riscv/kernel/acpi_numa.c | 131 ++++++++++++++++++++++++++++++++++
 arch/riscv/kernel/setup.c     |   4 +-
 arch/riscv/kernel/smpboot.c   |   2 -
 include/linux/acpi.h          |   6 ++
 7 files changed, 154 insertions(+), 10 deletions(-)
 create mode 100644 arch/riscv/kernel/acpi_numa.c

arch/riscv/include/asm/acpi.h +13 -2

index 7dad0cf9d701..e0a1f84404f3 100644
@@ -61,11 +61,14 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { }
 
 void acpi_init_rintc_map(void);
 struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu);
-u32 get_acpi_id_for_cpu(int cpu);
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+	return acpi_cpu_get_madt_rintc(cpu)->uid;
+}
+
 int acpi_get_riscv_isa(struct acpi_table_header *table,
 		       unsigned int cpu, const char **isa);
 
-static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
 void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size,
 			     u32 *cboz_size, u32 *cbop_size);
 #else

@@ -87,4 +90,12 @@ static inline void acpi_get_cbo_block_size(struct acpi_table_header *table,
 
 #endif /* CONFIG_ACPI */
 
+#ifdef CONFIG_ACPI_NUMA
+int acpi_numa_get_nid(unsigned int cpu);
+void acpi_map_cpus_to_nodes(void);
+#else
+static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
+static inline void acpi_map_cpus_to_nodes(void) { }
+#endif /* CONFIG_ACPI_NUMA */
+
 #endif /*_ASM_ACPI_H*/

arch/riscv/kernel/Makefile +1 -0

index 5b243d46f4b1..1e2afec141b5 100644
@@ -110,3 +110,4 @@ obj-$(CONFIG_COMPAT)		+= compat_vdso/
 
 obj-$(CONFIG_64BIT)		+= pi/
 obj-$(CONFIG_ACPI)		+= acpi.o
+obj-$(CONFIG_ACPI_NUMA)	+= acpi_numa.o

arch/riscv/kernel/acpi.c +0 -5

index e619edc8b0cc..040bdbfea2b4 100644
@@ -191,11 +191,6 @@ struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu)
 	return &cpu_madt_rintc[cpu];
 }
 
-u32 get_acpi_id_for_cpu(int cpu)
-{
-	return acpi_cpu_get_madt_rintc(cpu)->uid;
-}
-
 /*
  * __acpi_map_table() will be called before paging_init(), so early_ioremap()
  * or early_memremap() should be called here to for ACPI table mapping.

arch/riscv/kernel/acpi_numa.c new file +21 -0

new file mode 100644
index 000000000000..0231482d6946
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * ACPI 6.6 based NUMA setup for RISCV
+ * Lots of code was borrowed from arch/arm64/kernel/acpi_numa.c
+ *
+ * Copyright 2004 Andi Kleen, SuSE Labs.
+ * Copyright (C) 2013-2016, Linaro Ltd.
+ *		Author: Hanjun Guo <[email protected]>
+ * Copyright (C) 2024 Intel Corporation.
+ *
+ * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
+ *
+ * Called from acpi_numa_init while reading the SRAT and SLIT tables.
+ * Assumes all memory regions belonging to a single proximity domain
+ * are in one chunk. Holes between them will be included in the node.
+ */
+
+#define pr_fmt(fmt) "ACPI: NUMA: " fmt
+
+#include <linux/acpi.h>
+#include <linux/bitmap.h>

arch/riscv/kernel/acpi_numa.c line 31

Quoted 10 lines

arch/riscv/kernel/acpi_numa.c new file +10 -0

+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/memblock.h>
+#include <linux/mmzone.h>
+#include <linux/module.h>
+#include <linux/topology.h>
+
+#include <asm/numa.h>
+
+static int acpi_early_node_map[NR_CPUS] __initdata = { NUMA_NO_NODE };

This only sets acpi_early_node_map[0] to NUMA_NO_NODE. Assuming we want to ensure all of them are initialized to NUMA_NO_NODE, then we need

static int acpi_early_node_map[NR_CPUS] __initdata = { [0 ... NR_CPUS - 1] = NUMA_NO_NODE };

Thanks,
drew

Haibo Xu

2024-07-23 14:21 UTC #3 lore raw

Re: [PATCH v4 1/4] ACPI: RISCV: Add NUMA support based on SRAT and SLIT

Quoted 120 lines · Andrew Jones

Quoted 104 lines · Haibo Xu

Signed-off-by Haibo Xu <[email protected]>

Reviewed-by Sunil V L <[email protected]>

---
 arch/riscv/include/asm/acpi.h |  15 +++-
 arch/riscv/kernel/Makefile    |   1 +
 arch/riscv/kernel/acpi.c      |   5 --
 arch/riscv/kernel/acpi_numa.c | 131 ++++++++++++++++++++++++++++++++++
 arch/riscv/kernel/setup.c     |   4 +-
 arch/riscv/kernel/smpboot.c   |   2 -
 include/linux/acpi.h          |   6 ++
 7 files changed, 154 insertions(+), 10 deletions(-)
 create mode 100644 arch/riscv/kernel/acpi_numa.c

arch/riscv/include/asm/acpi.h +13 -2

index 7dad0cf9d701..e0a1f84404f3 100644
@@ -61,11 +61,14 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { }
 
 void acpi_init_rintc_map(void);
 struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu);
-u32 get_acpi_id_for_cpu(int cpu);
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+     return acpi_cpu_get_madt_rintc(cpu)->uid;
+}
+
 int acpi_get_riscv_isa(struct acpi_table_header *table,
                     unsigned int cpu, const char **isa);
 
-static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
 void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size,
                           u32 *cboz_size, u32 *cbop_size);
 #else

@@ -87,4 +90,12 @@ static inline void acpi_get_cbo_block_size(struct acpi_table_header *table,
 
 #endif /* CONFIG_ACPI */
 
+#ifdef CONFIG_ACPI_NUMA
+int acpi_numa_get_nid(unsigned int cpu);
+void acpi_map_cpus_to_nodes(void);
+#else
+static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
+static inline void acpi_map_cpus_to_nodes(void) { }
+#endif /* CONFIG_ACPI_NUMA */
+
 #endif /*_ASM_ACPI_H*/

arch/riscv/kernel/Makefile +1 -0

index 5b243d46f4b1..1e2afec141b5 100644
@@ -110,3 +110,4 @@ obj-$(CONFIG_COMPAT)              += compat_vdso/
 
 obj-$(CONFIG_64BIT)          += pi/
 obj-$(CONFIG_ACPI)           += acpi.o
+obj-$(CONFIG_ACPI_NUMA)      += acpi_numa.o

arch/riscv/kernel/acpi.c +0 -5

index e619edc8b0cc..040bdbfea2b4 100644
@@ -191,11 +191,6 @@ struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu)
      return &cpu_madt_rintc[cpu];
 }
 
-u32 get_acpi_id_for_cpu(int cpu)
-{
-     return acpi_cpu_get_madt_rintc(cpu)->uid;
-}
-
 /*
  * __acpi_map_table() will be called before paging_init(), so early_ioremap()
  * or early_memremap() should be called here to for ACPI table mapping.

arch/riscv/kernel/acpi_numa.c new file +21 -0

new file mode 100644
index 000000000000..0231482d6946
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * ACPI 6.6 based NUMA setup for RISCV
+ * Lots of code was borrowed from arch/arm64/kernel/acpi_numa.c
+ *
+ * Copyright 2004 Andi Kleen, SuSE Labs.
+ * Copyright (C) 2013-2016, Linaro Ltd.
+ *           Author: Hanjun Guo <[email protected]>
+ * Copyright (C) 2024 Intel Corporation.
+ *
+ * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
+ *
+ * Called from acpi_numa_init while reading the SRAT and SLIT tables.
+ * Assumes all memory regions belonging to a single proximity domain
+ * are in one chunk. Holes between them will be included in the node.
+ */
+
+#define pr_fmt(fmt) "ACPI: NUMA: " fmt
+
+#include <linux/acpi.h>
+#include <linux/bitmap.h>

arch/riscv/kernel/acpi_numa.c line 31

Quoted 10 lines

arch/riscv/kernel/acpi_numa.c new file +10 -0

+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/memblock.h>
+#include <linux/mmzone.h>
+#include <linux/module.h>
+#include <linux/topology.h>
+
+#include <asm/numa.h>
+
+static int acpi_early_node_map[NR_CPUS] __initdata = { NUMA_NO_NODE };

This only sets acpi_early_node_map[0] to NUMA_NO_NODE. Assuming we want to ensure all of them are initialized to NUMA_NO_NODE, then we need

Quoted 2 lines

static int acpi_early_node_map[NR_CPUS] __initdata = { [0 ... NR_CPUS - 1] = NUMA_NO_NODE };

Good catch! Thanks!

@Palmer Dabbelt
I noticed this series had been merged to riscv/linux.git (for-next), could you help include the above change from Drew?
Or shall I send out a new series?

Regards,
Haibo

Quoted 2 lines

Thanks,
drew

Anup Patel

2024-07-23 14:50 UTC #4 lore raw

Re: [PATCH v4 1/4] ACPI: RISCV: Add NUMA support based on SRAT and SLIT

Quoted 125 lines · Haibo Xu

Quoted 120 lines · Andrew Jones

Quoted 104 lines · Haibo Xu

Signed-off-by Haibo Xu <[email protected]>

Reviewed-by Sunil V L <[email protected]>

---
 arch/riscv/include/asm/acpi.h |  15 +++-
 arch/riscv/kernel/Makefile    |   1 +
 arch/riscv/kernel/acpi.c      |   5 --
 arch/riscv/kernel/acpi_numa.c | 131 ++++++++++++++++++++++++++++++++++
 arch/riscv/kernel/setup.c     |   4 +-
 arch/riscv/kernel/smpboot.c   |   2 -
 include/linux/acpi.h          |   6 ++
 7 files changed, 154 insertions(+), 10 deletions(-)
 create mode 100644 arch/riscv/kernel/acpi_numa.c

arch/riscv/include/asm/acpi.h +13 -2

index 7dad0cf9d701..e0a1f84404f3 100644
@@ -61,11 +61,14 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { }
 
 void acpi_init_rintc_map(void);
 struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu);
-u32 get_acpi_id_for_cpu(int cpu);
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+     return acpi_cpu_get_madt_rintc(cpu)->uid;
+}
+
 int acpi_get_riscv_isa(struct acpi_table_header *table,
                     unsigned int cpu, const char **isa);
 
-static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
 void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size,
                           u32 *cboz_size, u32 *cbop_size);
 #else

@@ -87,4 +90,12 @@ static inline void acpi_get_cbo_block_size(struct acpi_table_header *table,
 
 #endif /* CONFIG_ACPI */
 
+#ifdef CONFIG_ACPI_NUMA
+int acpi_numa_get_nid(unsigned int cpu);
+void acpi_map_cpus_to_nodes(void);
+#else
+static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
+static inline void acpi_map_cpus_to_nodes(void) { }
+#endif /* CONFIG_ACPI_NUMA */
+
 #endif /*_ASM_ACPI_H*/

arch/riscv/kernel/Makefile +1 -0

index 5b243d46f4b1..1e2afec141b5 100644
@@ -110,3 +110,4 @@ obj-$(CONFIG_COMPAT)              += compat_vdso/
 
 obj-$(CONFIG_64BIT)          += pi/
 obj-$(CONFIG_ACPI)           += acpi.o
+obj-$(CONFIG_ACPI_NUMA)      += acpi_numa.o

arch/riscv/kernel/acpi.c +0 -5

index e619edc8b0cc..040bdbfea2b4 100644
@@ -191,11 +191,6 @@ struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu)
      return &cpu_madt_rintc[cpu];
 }
 
-u32 get_acpi_id_for_cpu(int cpu)
-{
-     return acpi_cpu_get_madt_rintc(cpu)->uid;
-}
-
 /*
  * __acpi_map_table() will be called before paging_init(), so early_ioremap()
  * or early_memremap() should be called here to for ACPI table mapping.

arch/riscv/kernel/acpi_numa.c new file +21 -0

new file mode 100644
index 000000000000..0231482d6946
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * ACPI 6.6 based NUMA setup for RISCV
+ * Lots of code was borrowed from arch/arm64/kernel/acpi_numa.c
+ *
+ * Copyright 2004 Andi Kleen, SuSE Labs.
+ * Copyright (C) 2013-2016, Linaro Ltd.
+ *           Author: Hanjun Guo <[email protected]>
+ * Copyright (C) 2024 Intel Corporation.
+ *
+ * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
+ *
+ * Called from acpi_numa_init while reading the SRAT and SLIT tables.
+ * Assumes all memory regions belonging to a single proximity domain
+ * are in one chunk. Holes between them will be included in the node.
+ */
+
+#define pr_fmt(fmt) "ACPI: NUMA: " fmt
+
+#include <linux/acpi.h>
+#include <linux/bitmap.h>

arch/riscv/kernel/acpi_numa.c line 31

Quoted 10 lines

arch/riscv/kernel/acpi_numa.c new file +10 -0

+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/memblock.h>
+#include <linux/mmzone.h>
+#include <linux/module.h>
+#include <linux/topology.h>
+
+#include <asm/numa.h>
+
+static int acpi_early_node_map[NR_CPUS] __initdata = { NUMA_NO_NODE };

This only sets acpi_early_node_map[0] to NUMA_NO_NODE. Assuming we want to ensure all of them are initialized to NUMA_NO_NODE, then we need

Quoted 2 lines

static int acpi_early_node_map[NR_CPUS] __initdata = { [0 ... NR_CPUS - 1] = NUMA_NO_NODE };

Quoted 6 lines

Good catch! Thanks!
@Palmer Dabbelt
I noticed this series had been merged to riscv/linux.git (for-next), could you help include the above change from Drew?
Or shall I send out a new series?

Since it's already in for-next, I suggest having a Fixes patch and add that to for-next because for-next is supposed to have a stable commit history.

Regards,
Anup

Haibo Xu

2024-07-23 14:54 UTC #5 lore raw

Re: [PATCH v4 1/4] ACPI: RISCV: Add NUMA support based on SRAT and SLIT

Quoted 129 lines · Anup Patel

Quoted 127 lines · Haibo Xu

Quoted 120 lines · Andrew Jones

Quoted 104 lines · Haibo Xu

Signed-off-by Haibo Xu <[email protected]>

Reviewed-by Sunil V L <[email protected]>

---
 arch/riscv/include/asm/acpi.h |  15 +++-
 arch/riscv/kernel/Makefile    |   1 +
 arch/riscv/kernel/acpi.c      |   5 --
 arch/riscv/kernel/acpi_numa.c | 131 ++++++++++++++++++++++++++++++++++
 arch/riscv/kernel/setup.c     |   4 +-
 arch/riscv/kernel/smpboot.c   |   2 -
 include/linux/acpi.h          |   6 ++
 7 files changed, 154 insertions(+), 10 deletions(-)
 create mode 100644 arch/riscv/kernel/acpi_numa.c

arch/riscv/include/asm/acpi.h +13 -2

index 7dad0cf9d701..e0a1f84404f3 100644
@@ -61,11 +61,14 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { }
 
 void acpi_init_rintc_map(void);
 struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu);
-u32 get_acpi_id_for_cpu(int cpu);
+static inline u32 get_acpi_id_for_cpu(int cpu)
+{
+     return acpi_cpu_get_madt_rintc(cpu)->uid;
+}
+
 int acpi_get_riscv_isa(struct acpi_table_header *table,
                     unsigned int cpu, const char **isa);
 
-static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
 void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size,
                           u32 *cboz_size, u32 *cbop_size);
 #else

@@ -87,4 +90,12 @@ static inline void acpi_get_cbo_block_size(struct acpi_table_header *table,
 
 #endif /* CONFIG_ACPI */
 
+#ifdef CONFIG_ACPI_NUMA
+int acpi_numa_get_nid(unsigned int cpu);
+void acpi_map_cpus_to_nodes(void);
+#else
+static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; }
+static inline void acpi_map_cpus_to_nodes(void) { }
+#endif /* CONFIG_ACPI_NUMA */
+
 #endif /*_ASM_ACPI_H*/

arch/riscv/kernel/Makefile +1 -0

index 5b243d46f4b1..1e2afec141b5 100644
@@ -110,3 +110,4 @@ obj-$(CONFIG_COMPAT)              += compat_vdso/
 
 obj-$(CONFIG_64BIT)          += pi/
 obj-$(CONFIG_ACPI)           += acpi.o
+obj-$(CONFIG_ACPI_NUMA)      += acpi_numa.o

arch/riscv/kernel/acpi.c +0 -5

index e619edc8b0cc..040bdbfea2b4 100644
@@ -191,11 +191,6 @@ struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu)
      return &cpu_madt_rintc[cpu];
 }
 
-u32 get_acpi_id_for_cpu(int cpu)
-{
-     return acpi_cpu_get_madt_rintc(cpu)->uid;
-}
-
 /*
  * __acpi_map_table() will be called before paging_init(), so early_ioremap()
  * or early_memremap() should be called here to for ACPI table mapping.

arch/riscv/kernel/acpi_numa.c new file +21 -0

new file mode 100644
index 000000000000..0231482d6946
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * ACPI 6.6 based NUMA setup for RISCV
+ * Lots of code was borrowed from arch/arm64/kernel/acpi_numa.c
+ *
+ * Copyright 2004 Andi Kleen, SuSE Labs.
+ * Copyright (C) 2013-2016, Linaro Ltd.
+ *           Author: Hanjun Guo <[email protected]>
+ * Copyright (C) 2024 Intel Corporation.
+ *
+ * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
+ *
+ * Called from acpi_numa_init while reading the SRAT and SLIT tables.
+ * Assumes all memory regions belonging to a single proximity domain
+ * are in one chunk. Holes between them will be included in the node.
+ */
+
+#define pr_fmt(fmt) "ACPI: NUMA: " fmt
+
+#include <linux/acpi.h>
+#include <linux/bitmap.h>

arch/riscv/kernel/acpi_numa.c line 31

Quoted 10 lines

arch/riscv/kernel/acpi_numa.c new file +10 -0

+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/memblock.h>
+#include <linux/mmzone.h>
+#include <linux/module.h>
+#include <linux/topology.h>
+
+#include <asm/numa.h>
+
+static int acpi_early_node_map[NR_CPUS] __initdata = { NUMA_NO_NODE };

This only sets acpi_early_node_map[0] to NUMA_NO_NODE. Assuming we want to ensure all of them are initialized to NUMA_NO_NODE, then we need

Quoted 2 lines

static int acpi_early_node_map[NR_CPUS] __initdata = { [0 ... NR_CPUS - 1] = NUMA_NO_NODE };

Good catch! Thanks!

Quoted 9 lines

Quoted 4 lines
@Palmer Dabbelt
I noticed this series had been merged to riscv/linux.git (for-next), could you help include the above change from Drew?
Or shall I send out a new series?
Since it's already in for-next, I suggest having a Fixes patch and add that to for-next because for-next is supposed to have a stable commit history.

Ok, I will send out the fix soon! Thanks!

Quoted 2 lines

Regards,
Anup

Haibo Xu

author

2024-06-13 08:37 UTC #6 lore raw

PATCH v4 2/4 ACPI: NUMA: Add handler for SRAT RINTC affinity structure

In reply to Haibo Xu

Add RINTC affinity structure handler during parsing SRAT table.

Signed-off-by Haibo Xu <[email protected]>

Reviewed-by Sunil V L <[email protected]>

---
 drivers/acpi/numa/srat.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

drivers/acpi/numa/srat.c +31 -1

index e3f26e71637a..44f91f2c6c5d 100644
@@ -167,6 +167,19 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
 		}
 	}
 	break;
+
+	case ACPI_SRAT_TYPE_RINTC_AFFINITY:
+		{
+			struct acpi_srat_rintc_affinity *p =
+			    (struct acpi_srat_rintc_affinity *)header;
+			pr_debug("SRAT Processor (acpi id[0x%04x]) in proximity domain %d %s\n",
+				 p->acpi_processor_uid,
+				 p->proximity_domain,
+				 (p->flags & ACPI_SRAT_RINTC_ENABLED) ?
+				 "enabled" : "disabled");
+		}
+		break;
+
 	default:
 		pr_warn("Found unsupported SRAT entry (type = 0x%x)\n",
 			header->type);

@@ -450,6 +463,21 @@ acpi_parse_gi_affinity(union acpi_subtable_headers *header,
 }
 #endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */
 
+static int __init
+acpi_parse_rintc_affinity(union acpi_subtable_headers *header,
+			  const unsigned long end)
+{
+	struct acpi_srat_rintc_affinity *rintc_affinity;
+
+	rintc_affinity = (struct acpi_srat_rintc_affinity *)header;
+	acpi_table_print_srat_entry(&header->common);
+
+	/* let architecture-dependent part to do it */
+	acpi_numa_rintc_affinity_init(rintc_affinity);
+
+	return 0;
+}
+
 static int __init acpi_parse_srat(struct acpi_table_header *table)
 {
 	struct acpi_table_srat *srat = (struct acpi_table_srat *)table;

@@ -485,7 +513,7 @@ int __init acpi_numa_init(void)
 
 	/* SRAT: System Resource Affinity Table */
 	if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
-		struct acpi_subtable_proc srat_proc[4];
+		struct acpi_subtable_proc srat_proc[5];
 
 		memset(srat_proc, 0, sizeof(srat_proc));
 		srat_proc[0].id = ACPI_SRAT_TYPE_CPU_AFFINITY;

@@ -496,6 +524,8 @@ int __init acpi_numa_init(void)
 		srat_proc[2].handler = acpi_parse_gicc_affinity;
 		srat_proc[3].id = ACPI_SRAT_TYPE_GENERIC_AFFINITY;
 		srat_proc[3].handler = acpi_parse_gi_affinity;
+		srat_proc[4].id = ACPI_SRAT_TYPE_RINTC_AFFINITY;
+		srat_proc[4].handler = acpi_parse_rintc_affinity;
 
 		acpi_table_parse_entries_array(ACPI_SIG_SRAT,
 					sizeof(struct acpi_table_srat),

Signature · 1 line

2.34.1

Haibo Xu

author

2024-06-13 08:37 UTC #7 lore raw

PATCH v4 3/4 ACPI: NUMA: change the ACPI_NUMA to a hidden option

In reply to Haibo Xu

x86/arm64/loongarch would select ACPI_NUMA by default and riscv would do the same thing, so change it to a hidden option and the select statements except for the X86_64_ACPI_NUMA can also go away.

Suggested-by Sunil V L <[email protected]>

Signed-off-by Haibo Xu <[email protected]>

Reviewed-by Sunil V L <[email protected]>

---
 arch/arm64/Kconfig        | 1 -
 arch/loongarch/Kconfig    | 1 -
 drivers/acpi/numa/Kconfig | 5 +----
 3 files changed, 1 insertion(+), 6 deletions(-)

arch/arm64/Kconfig +0 -1

index 5d91259ee7b5..5079ad4e21a5 100644
@@ -1484,7 +1484,6 @@ config HOTPLUG_CPU
 config NUMA
 	bool "NUMA Memory Allocation and Scheduler Support"
 	select GENERIC_ARCH_NUMA
-	select ACPI_NUMA if ACPI
 	select OF_NUMA
 	select HAVE_SETUP_PER_CPU_AREA
 	select NEED_PER_CPU_EMBED_FIRST_CHUNK

arch/loongarch/Kconfig +0 -1

index e38139c576ee..8d9e06e4ad84 100644
@@ -470,7 +470,6 @@ config NR_CPUS
 config NUMA
 	bool "NUMA Support"
 	select SMP
-	select ACPI_NUMA if ACPI
 	help
 	  Say Y to compile the kernel with NUMA (Non-Uniform Memory Access)
 	  support.  This option improves performance on systems with more

drivers/acpi/numa/Kconfig +1 -4

index 849c2bd820b9..f33194d1e43f 100644
@@ -1,9 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 config ACPI_NUMA
-	bool "NUMA support"
-	depends on NUMA
-	depends on (X86 || ARM64 || LOONGARCH)
-	default y if ARM64
+	def_bool NUMA && !X86
 
 config ACPI_HMAT
 	bool "ACPI Heterogeneous Memory Attribute Table Support"

Signature · 1 line

2.34.1

Haibo Xu

2024-06-17 13:34 UTC #8 lore raw

Re: [PATCH v4 3/4] ACPI: NUMA: change the ACPI_NUMA to a hidden option

@Catalin Marinas @Huacai Chen

Could you please have a look at this patch for the ACPI_NUMA config on ARM64 and LOONGARCH respectively.

Thanks!

Quoted 57 lines · Haibo Xu

Suggested-by Sunil V L <[email protected]>

Signed-off-by Haibo Xu <[email protected]>

Reviewed-by Sunil V L <[email protected]>

---
 arch/arm64/Kconfig        | 1 -
 arch/loongarch/Kconfig    | 1 -
 drivers/acpi/numa/Kconfig | 5 +----
 3 files changed, 1 insertion(+), 6 deletions(-)

arch/arm64/Kconfig +0 -1

index 5d91259ee7b5..5079ad4e21a5 100644
@@ -1484,7 +1484,6 @@ config HOTPLUG_CPU
 config NUMA
        bool "NUMA Memory Allocation and Scheduler Support"
        select GENERIC_ARCH_NUMA
-       select ACPI_NUMA if ACPI
        select OF_NUMA
        select HAVE_SETUP_PER_CPU_AREA
        select NEED_PER_CPU_EMBED_FIRST_CHUNK

arch/loongarch/Kconfig +0 -1

index e38139c576ee..8d9e06e4ad84 100644
@@ -470,7 +470,6 @@ config NR_CPUS
 config NUMA
        bool "NUMA Support"
        select SMP
-       select ACPI_NUMA if ACPI
        help
          Say Y to compile the kernel with NUMA (Non-Uniform Memory Access)
          support.  This option improves performance on systems with more

drivers/acpi/numa/Kconfig +1 -5

index 849c2bd820b9..f33194d1e43f 100644
@@ -1,9 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 config ACPI_NUMA
-       bool "NUMA support"
-       depends on NUMA
-       depends on (X86 || ARM64 || LOONGARCH)
-       default y if ARM64
+       def_bool NUMA && !X86
 
 config ACPI_HMAT
        bool "ACPI Heterogeneous Memory Attribute Table Support"
--

2.34.1

Will Deacon

maintainer Acked-by

2024-06-18 15:18 UTC #9 lore raw

Re: [PATCH v4 3/4] ACPI: NUMA: change the ACPI_NUMA to a hidden option

Quoted 22 lines · Haibo Xu

@Catalin Marinas @Huacai Chen
Could you please have a look at this patch for the ACPI_NUMA config on ARM64 and LOONGARCH respectively.
Thanks!
Quoted 14 lines · Haibo Xu
x86/arm64/loongarch would select ACPI_NUMA by default and riscv would do the same thing, so change it to a hidden option and the select statements except for the X86_64_ACPI_NUMA can also go away.
Suggested-by Arnd Bergmann <[email protected]>
Suggested-by Sunil V L <[email protected]>
Signed-off-by Haibo Xu <[email protected]>
Reviewed-by Sunil V L <[email protected]>
---
 arch/arm64/Kconfig        | 1 -
 arch/loongarch/Kconfig    | 1 -
 drivers/acpi/numa/Kconfig | 5 +----
 3 files changed, 1 insertion(+), 6 deletions(-)

This looks fine from an arm64 perspective:

Acked-by Will Deacon <[email protected]>

Will

Haibo Xu

2024-06-19 01:18 UTC #10 lore raw

Re: [PATCH v4 3/4] ACPI: NUMA: change the ACPI_NUMA to a hidden option

Quoted 25 lines · Will Deacon

Quoted 22 lines · Haibo Xu
@Catalin Marinas @Huacai Chen
Could you please have a look at this patch for the ACPI_NUMA config on ARM64 and LOONGARCH respectively.
Thanks!
Quoted 14 lines · Haibo Xu
x86/arm64/loongarch would select ACPI_NUMA by default and riscv would do the same thing, so change it to a hidden option and the select statements except for the X86_64_ACPI_NUMA can also go away.
Suggested-by Arnd Bergmann <[email protected]>
Suggested-by Sunil V L <[email protected]>
Signed-off-by Haibo Xu <[email protected]>
Reviewed-by Sunil V L <[email protected]>
---
 arch/arm64/Kconfig        | 1 -
 arch/loongarch/Kconfig    | 1 -
 drivers/acpi/numa/Kconfig | 5 +----
 3 files changed, 1 insertion(+), 6 deletions(-)

Quoted 4 lines

This looks fine from an arm64 perspective:
Acked-by Will Deacon <[email protected]>

Thank you, Will!

Quoted 1 line

Will

Huacai Chen

maintainer Acked-by

2024-06-19 02:24 UTC #11 lore raw

Re: [PATCH v4 3/4] ACPI: NUMA: change the ACPI_NUMA to a hidden option

Quoted 27 lines · Haibo Xu

Quoted 25 lines · Will Deacon
Quoted 22 lines · Haibo Xu
@Catalin Marinas @Huacai Chen
Could you please have a look at this patch for the ACPI_NUMA config on ARM64 and LOONGARCH respectively.
Thanks!
Quoted 14 lines · Haibo Xu
x86/arm64/loongarch would select ACPI_NUMA by default and riscv would do the same thing, so change it to a hidden option and the select statements except for the X86_64_ACPI_NUMA can also go away.
Suggested-by Arnd Bergmann <[email protected]>
Suggested-by Sunil V L <[email protected]>
Signed-off-by Haibo Xu <[email protected]>
Reviewed-by Sunil V L <[email protected]>
---
 arch/arm64/Kconfig        | 1 -
 arch/loongarch/Kconfig    | 1 -
 drivers/acpi/numa/Kconfig | 5 +----
 3 files changed, 1 insertion(+), 6 deletions(-)

Quoted 3 lines

Quoted 3 lines
This looks fine from an arm64 perspective:
Acked-by Will Deacon <[email protected]>

Looks fine for LoongArch:

Acked-by Huacai Chen <[email protected]>

Quoted 5 lines

Quoted 1 line
Thank you, Will!
Quoted 1 line
Will

Haibo Xu

author

2024-06-13 08:37 UTC #12 lore raw

PATCH v4 4/4 ACPI: NUMA: replace pr_info with pr_debug in arch_acpi_numa_init

In reply to Haibo Xu

There are lots of ACPI enabled systems that aren't NUMA and If the firmware didn't provide the SRAT/SLIT, then there will be a message "Failed to initialise from firmware" from arch_acpi_numa_init() which adding noise to the boot on all of those kind of systems. Replace the pr_info with pr_debug in arch_acpi_numa_init() to avoid it.

Suggested-by Sunil V L <[email protected]>

Signed-off-by Haibo Xu <[email protected]>

Reviewed-by Sunil V L <[email protected]>

---
 drivers/base/arch_numa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/base/arch_numa.c +1 -1

index 5b59d133b6af..555aee3ee8e7 100644
@@ -445,7 +445,7 @@ static int __init arch_acpi_numa_init(void)
 
 	ret = acpi_numa_init();
 	if (ret) {
-		pr_info("Failed to initialise from firmware\n");
+		pr_debug("Failed to initialise from firmware\n");
 		return ret;
 	}

Signature · 1 line

2.34.1

Hanjun Guo

Reviewed-by on the v4 series

2024-06-24 02:26 UTC #13 lore raw

In reply to Haibo Xu

Quoted 10 lines · Haibo Xu

This patch series enable RISC-V ACPI NUMA support which was based on the recently approved ACPI ECR[1].
Patch 1/4 add RISC-V specific acpi_numa.c file to parse NUMA information from SRAT and SLIT ACPI tables.
Patch 2/4 add the common SRAT RINTC affinity structure handler. Patch 3/4 change the ACPI_NUMA to a hidden option since it would be selected by default on all supported platform.
Patch 4/4 replace pr_info with pr_debug in arch_acpi_numa_init() to avoid potential boot noise on ACPI platforms that are not NUMA.

Looks good to me,

Reviewed-by Hanjun Guo <[email protected]>

Sunil V L

2024-07-01 05:52 UTC #14 lore raw

In reply to Haibo Xu

Quoted 11 lines · Haibo Xu

This patch series enable RISC-V ACPI NUMA support which was based on the recently approved ACPI ECR[1].
Patch 1/4 add RISC-V specific acpi_numa.c file to parse NUMA information from SRAT and SLIT ACPI tables.
Patch 2/4 add the common SRAT RINTC affinity structure handler. Patch 3/4 change the ACPI_NUMA to a hidden option since it would be selected by default on all supported platform.
Patch 4/4 replace pr_info with pr_debug in arch_acpi_numa_init() to avoid potential boot noise on ACPI platforms that are not NUMA.

Quoted 3 lines

Based-on: https://github.com/linux-riscv/linux-riscv/tree/for-next
[1] https://drive.google.com/file/d/1YTdDx2IPm5IeZjAW932EYU-tUtgS08tX/view?usp=sharing

Hi Palmer,

Can this series be taken for -next?

Thanks,
Sunil

[email protected]

CI Applied

2024-07-23 12:58 UTC #15 lore raw

In reply to Haibo Xu

This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:

Hello:

This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:

Quoted 11 lines · On Thu, 13 Jun 2024 16:54:32 +0800 you wrote:

This patch series enable RISC-V ACPI NUMA support which was based on the recently approved ACPI ECR[1].
Patch 1/4 add RISC-V specific acpi_numa.c file to parse NUMA information from SRAT and SLIT ACPI tables.
Patch 2/4 add the common SRAT RINTC affinity structure handler. Patch 3/4 change the ACPI_NUMA to a hidden option since it would be selected by default on all supported platform.
Patch 4/4 replace pr_info with pr_debug in arch_acpi_numa_init() to avoid potential boot noise on ACPI platforms that are not NUMA.

Quoted 1 line

[...]

Here is the summary with links:
- [v4,1/4] ACPI: RISCV: Add NUMA support based on SRAT and SLIT

    https://git.kernel.org/riscv/c/eabd9db64ea8
  - [v4,2/4] ACPI: NUMA: Add handler for SRAT RINTC affinity structure
    https://git.kernel.org/riscv/c/39494aec8a04
  - [v4,3/4] ACPI: NUMA: change the ACPI_NUMA to a hidden option
    https://git.kernel.org/riscv/c/adc3e82d2537
  - [v4,4/4] ACPI: NUMA: replace pr_info with pr_debug in arch_acpi_numa_init
    https://git.kernel.org/riscv/c/5f76d4211ee4

You are awesome, thank you!

Signature · 2 lines

Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Palmer Dabbelt

maintainer

2024-07-24 14:50 UTC #16 lore raw

In reply to Haibo Xu

Quoted 11 lines · On Thu, 13 Jun 2024 01:54:32 PDT (-0700), [email protected] wrote:

This patch series enable RISC-V ACPI NUMA support which was based on the recently approved ACPI ECR[1].
Patch 1/4 add RISC-V specific acpi_numa.c file to parse NUMA information from SRAT and SLIT ACPI tables.
Patch 2/4 add the common SRAT RINTC affinity structure handler. Patch 3/4 change the ACPI_NUMA to a hidden option since it would be selected by default on all supported platform.
Patch 4/4 replace pr_info with pr_debug in arch_acpi_numa_init() to avoid potential boot noise on ACPI platforms that are not NUMA.

Quoted 1 line

Based-on: https://github.com/linux-riscv/linux-riscv/tree/for-next

No big deal, but that's not actually my repo. Looks like it's just mirroring something, I use the kernel.org git stuff these days. I dropped it from the cover letter for the merge, it's not super useful anyway because it's a branch so nobody will know what it means later.

Aside from that things look good, I've got this queued up for the tester.

Quoted 74 lines

[1] https://drive.google.com/file/d/1YTdDx2IPm5IeZjAW932EYU-tUtgS08tX/view?usp=sharing
Testing:
Since the ACPI AIA/PLIC support patch set is still under upstream review, hence it is tested using the poll based HVC SBI console and RAM disk.
1) Build latest Qemu with the following patch backported
https://github.com/vlsunil/qemu/commit/42bd4eeefd5d4410a68f02d54fee406d8a1269b0
2) Build latest EDK-II
https://github.com/tianocore/edk2/blob/master/OvmfPkg/RiscVVirt/README.md
3) Build Linux with the following configs enabled
CONFIG_RISCV_SBI_V01=y
CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
CONFIG_NONPORTABLE=y
CONFIG_HVC_RISCV_SBI=y
CONFIG_NUMA=y
CONFIG_ACPI_NUMA=y
4) Build buildroot rootfs.cpio
5) Launch the Qemu machine
   qemu-system-riscv64 -nographic \
   -machine virt,pflash0=pflash0,pflash1=pflash1 -smp 4 -m 8G \
   -blockdev node-name=pflash0,driver=file,read-only=on,filename=RISCV_VIRT_CODE.fd \
   -blockdev node-name=pflash1,driver=file,filename=RISCV_VIRT_VARS.fd \
   -object memory-backend-ram,size=4G,id=m0 \
   -object memory-backend-ram,size=4G,id=m1 \
   -numa node,memdev=m0,cpus=0-1,nodeid=0 \
   -numa node,memdev=m1,cpus=2-3,nodeid=1 \
   -numa dist,src=0,dst=1,val=30 \
   -kernel linux/arch/riscv/boot/Image \
   -initrd buildroot/output/images/rootfs.cpio \
   -append "root=/dev/ram ro console=hvc0 earlycon=sbi"
[    0.000000] ACPI: SRAT: Node 0 PXM 0 [mem 0x80000000-0x17fffffff]
[    0.000000] ACPI: SRAT: Node 1 PXM 1 [mem 0x180000000-0x27fffffff]
[    0.000000] NUMA: NODE_DATA [mem 0x17fe3bc40-0x17fe3cfff]
[    0.000000] NUMA: NODE_DATA [mem 0x27fff4c40-0x27fff5fff]
...
[    0.000000] ACPI: NUMA: SRAT: PXM 0 -> HARTID 0x0 -> Node 0
[    0.000000] ACPI: NUMA: SRAT: PXM 0 -> HARTID 0x1 -> Node 0
[    0.000000] ACPI: NUMA: SRAT: PXM 1 -> HARTID 0x2 -> Node 1
[    0.000000] ACPI: NUMA: SRAT: PXM 1 -> HARTID 0x3 -> Node 1
---
Changes since v3
- Rebase to linux-riscv/for-next(Linux 6.10-rc1)
- Remove original patch 1/6 since it had been merged through
    ACPICA pull(commit fe1c408d50604f)
  - Remove original patch 4/6 since the related changes was
    introduced in commit 3a785e19f43267
Haibo Xu (4):
ACPI: RISCV: Add NUMA support based on SRAT and SLIT
ACPI: NUMA: Add handler for SRAT RINTC affinity structure
ACPI: NUMA: change the ACPI_NUMA to a hidden option
ACPI: NUMA: replace pr_info with pr_debug in arch_acpi_numa_init
 arch/arm64/Kconfig            |   1 -
 arch/loongarch/Kconfig        |   1 -
 arch/riscv/include/asm/acpi.h |  15 +++-
 arch/riscv/kernel/Makefile    |   1 +
 arch/riscv/kernel/acpi.c      |   5 --
 arch/riscv/kernel/acpi_numa.c | 131 ++++++++++++++++++++++++++++++++++
 arch/riscv/kernel/setup.c     |   4 +-
 arch/riscv/kernel/smpboot.c   |   2 -
 drivers/acpi/numa/Kconfig     |   5 +-
 drivers/acpi/numa/srat.c      |  32 ++++++++-
 drivers/base/arch_numa.c      |   2 +-
 include/linux/acpi.h          |   6 ++
 12 files changed, 187 insertions(+), 18 deletions(-)
 create mode 100644 arch/riscv/kernel/acpi_numa.c

Haibo Xu

2024-07-24 14:56 UTC #17 lore raw

Quoted 15 lines · Palmer Dabbelt

Quoted 11 lines · On Thu, 13 Jun 2024 01:54:32 PDT (-0700), [email protected] wrote:
This patch series enable RISC-V ACPI NUMA support which was based on the recently approved ACPI ECR[1].
Patch 1/4 add RISC-V specific acpi_numa.c file to parse NUMA information from SRAT and SLIT ACPI tables.
Patch 2/4 add the common SRAT RINTC affinity structure handler. Patch 3/4 change the ACPI_NUMA to a hidden option since it would be selected by default on all supported platform.
Patch 4/4 replace pr_info with pr_debug in arch_acpi_numa_init() to avoid potential boot noise on ACPI platforms that are not NUMA.
Quoted 1 line
Based-on: https://github.com/linux-riscv/linux-riscv/tree/for-next

Quoted 8 lines

No big deal, but that's not actually my repo. Looks like it's just mirroring something, I use the kernel.org git stuff these days. I dropped it from the cover letter for the merge, it's not super useful anyway because it's a branch so nobody will know what it means later.
Aside from that things look good, I've got this queued up for the tester.

Thanks!

Quoted 74 lines

Quoted 74 lines
[1] https://drive.google.com/file/d/1YTdDx2IPm5IeZjAW932EYU-tUtgS08tX/view?usp=sharing
Testing:
Since the ACPI AIA/PLIC support patch set is still under upstream review, hence it is tested using the poll based HVC SBI console and RAM disk.
1) Build latest Qemu with the following patch backported
https://github.com/vlsunil/qemu/commit/42bd4eeefd5d4410a68f02d54fee406d8a1269b0
2) Build latest EDK-II
https://github.com/tianocore/edk2/blob/master/OvmfPkg/RiscVVirt/README.md
3) Build Linux with the following configs enabled
CONFIG_RISCV_SBI_V01=y
CONFIG_SERIAL_EARLYCON_RISCV_SBI=y
CONFIG_NONPORTABLE=y
CONFIG_HVC_RISCV_SBI=y
CONFIG_NUMA=y
CONFIG_ACPI_NUMA=y
4) Build buildroot rootfs.cpio
5) Launch the Qemu machine
   qemu-system-riscv64 -nographic \
   -machine virt,pflash0=pflash0,pflash1=pflash1 -smp 4 -m 8G \
   -blockdev node-name=pflash0,driver=file,read-only=on,filename=RISCV_VIRT_CODE.fd \
   -blockdev node-name=pflash1,driver=file,filename=RISCV_VIRT_VARS.fd \
   -object memory-backend-ram,size=4G,id=m0 \
   -object memory-backend-ram,size=4G,id=m1 \
   -numa node,memdev=m0,cpus=0-1,nodeid=0 \
   -numa node,memdev=m1,cpus=2-3,nodeid=1 \
   -numa dist,src=0,dst=1,val=30 \
   -kernel linux/arch/riscv/boot/Image \
   -initrd buildroot/output/images/rootfs.cpio \
   -append "root=/dev/ram ro console=hvc0 earlycon=sbi"
[    0.000000] ACPI: SRAT: Node 0 PXM 0 [mem 0x80000000-0x17fffffff]
[    0.000000] ACPI: SRAT: Node 1 PXM 1 [mem 0x180000000-0x27fffffff]
[    0.000000] NUMA: NODE_DATA [mem 0x17fe3bc40-0x17fe3cfff]
[    0.000000] NUMA: NODE_DATA [mem 0x27fff4c40-0x27fff5fff]
...
[    0.000000] ACPI: NUMA: SRAT: PXM 0 -> HARTID 0x0 -> Node 0
[    0.000000] ACPI: NUMA: SRAT: PXM 0 -> HARTID 0x1 -> Node 0
[    0.000000] ACPI: NUMA: SRAT: PXM 1 -> HARTID 0x2 -> Node 1
[    0.000000] ACPI: NUMA: SRAT: PXM 1 -> HARTID 0x3 -> Node 1
---
Changes since v3
- Rebase to linux-riscv/for-next(Linux 6.10-rc1)
- Remove original patch 1/6 since it had been merged through
    ACPICA pull(commit fe1c408d50604f)
  - Remove original patch 4/6 since the related changes was
    introduced in commit 3a785e19f43267
Haibo Xu (4):
ACPI: RISCV: Add NUMA support based on SRAT and SLIT
ACPI: NUMA: Add handler for SRAT RINTC affinity structure
ACPI: NUMA: change the ACPI_NUMA to a hidden option
ACPI: NUMA: replace pr_info with pr_debug in arch_acpi_numa_init
 arch/arm64/Kconfig            |   1 -
 arch/loongarch/Kconfig        |   1 -
 arch/riscv/include/asm/acpi.h |  15 +++-
 arch/riscv/kernel/Makefile    |   1 +
 arch/riscv/kernel/acpi.c      |   5 --
 arch/riscv/kernel/acpi_numa.c | 131 ++++++++++++++++++++++++++++++++++
 arch/riscv/kernel/setup.c     |   4 +-
 arch/riscv/kernel/smpboot.c   |   2 -
 drivers/acpi/numa/Kconfig     |   5 +-
 drivers/acpi/numa/srat.c      |  32 ++++++++-
 drivers/base/arch_numa.c      |   2 +-
 include/linux/acpi.h          |   6 ++
 12 files changed, 187 insertions(+), 18 deletions(-)
 create mode 100644 arch/riscv/kernel/acpi_numa.c