Skip to contentSkip to conversation

Device tree based NUMA support for Arm - Part#2

PATCH Superseded Wei Chen 3 participants 17 messages Oct 11, 2022 – Oct 19, 2022

v6 of 9 Superseded Latest is v9 →

lore
Share & tools
lore

Wei Chen

author
#0 lore raw

v6 cover Device tree based NUMA support for Arm - Part#2

(The Arm device tree based NUMA support patch set contains 35 patches. In order to make stuff easier for reviewers, I split them into 3 parts:
1. Preparation. I have re-sorted the patch series. And moved independent patches to the head of the series - merged in [1]
2. Move generically usable code from x86 to common - this series.
3. Add new code to support Arm.

This series only contains the second part patches. As the whole NUMA series has been reviewed for 1 round in [2], so this series would be v6)

Xen memory allocation and scheduler modules are NUMA aware. But actually, on x86 has implemented the architecture APIs to support NUMA. Arm was providing a set of fake architecture APIs to make it compatible with NUMA awared memory allocation and scheduler.

Arm system was working well as a single node NUMA system with these fake APIs, because we didn't have multiple nodes NUMA system on Arm. But in recent years, more and more Arm devices support multiple nodes NUMA system.

So now we have a new problem. When Xen is running on these Arm devices, Xen still treat them as single node SMP systems. The NUMA affinity capability of Xen memory allocation and scheduler becomes meaningless. Because they rely on input data that does not reflect real NUMA layout.

Xen still think the access time for all of the memory is the same for all CPUs. However, Xen may allocate memory to a VM from different NUMA nodes with different access speeds. This difference can be amplified in workloads inside VM, causing performance instability and timeouts.

So in this patch series, we implement a set of NUMA API to use device tree to describe the NUMA layout. We reuse most of the code of x86 NUMA to create and maintain the mapping between memory and CPU, create the matrix between any two NUMA nodes. Except ACPI and some x86 specified code, we have moved other code to common. In next stage, when we implement ACPI based NUMA for Arm64, we may move the ACPI NUMA code to common too, but in current stage, we keep it as x86 only.

This patch serires has been tested and booted well on one Arm64 NUMA machine and one HPE x86 NUMA machine.

[1] https://lists.xenproject.org/archives/html/xen-devel/2022-06/msg00499.html
[2] https://lists.xenproject.org/archives/html/xen-devel/2021-09/msg01903.html

---
v5 -> v6:
1. Revert arch_numa_broken to arch_numa_disabled, as acpi_numa can be set to -1 by users. So acpi_numa < 0 does not mean a broken firmware.
2. Replace numa_scan_node to numa_process_nodes in commit log.
3. Limit the scope of page_num_node, vnuma and page of numa_setup function.
4. Use memset to init page_num_node instead of for_each_online_node.
5. Use %u instead of %d for nodeid_t and j in numa_setup print messages.
6. Use min(PADDR_BITS, BITS_PER_LONG - 1) to calculate the shift when only one node is in the system.
7. Drop the marco: node_to_first_cpu(node)
8. Use arch_numa_unavailable to replace arch_numa_disabled for

    acpi_numa <= 0.

9. Remove Kconfig for HAS_NUMA_NODE_FWID.
10. Use numa_fw_nid_name for NUMA implementation to set their fw NUMA node name for print messages.

v4 -> v5:
1. Use arch_numa_broken instead of arch_numa_disabled for acpi_numa < 0 check. Because arch_numa_disabled might include acpi_numa < 0 (init failed) and acpi_numa == 0
(no data or data no init) cases.
2. Use nodeid_t instead of uint8_t for memnodemap.
3. Restore to use typeof(*memnodemap) for _memnodemap, this will avoid the further adjustments for _memnodemap's type.
4. Use __ro_after_init for numa_off.
5. Use pointer-to-const for proper function parameters.
6. Use unsigned int for variables that are not realy used for node ID.
7. Fix code comments code-style and adjust the length.
8. Fix code-styles.
9. Rename numa_scan_nodes to numa_process_nodes.
10. Defer introduce arch_numa_disabled for acpi_numa <= 0. And remove the paramter init_as_disable of arch_numa_disabled.
11. Fix typo "expandsion".
12. Fix Indentation for l1tf_safe_maddr.
13. Remove double blank lines.
14. Add a space between for_each_node_mask and '('.
Add a space page_list_for_each and '('.
15. Use bool for nodes_cover_memory return value.
16. Use a plain "int ret" to record compute_hash_shift return value.
17. Add a blank line before the function's main "return".
18. Add new Kconfig option HAS_NUMA_NODE_FWID to common/Kconfig.

v3 -> v4:
1. Add init_as_disable as arch_numa_disabled parameter in the patche where use it.
2. Drop unnecessary "else" from arch_numa_setup, and fix its indentation.
3. Restore compute_hash_shift's return value to int.
4. Remove unnecessary parentheses for macros.
5. Use unsigned int for proper variables.
6. Fix some code-style.
7. Move arch_get_ram_range function comment to header file.
8. Use bool for found, and add a new "err" for the return value of arch_get_ram_range.
9. Use -ENODATA instead of -EINVAL for non-RAM type ranges.
10. Use bool as return value for functions that only return

    0/1 or 0/-EINVAL.

11. Move mem_hotplug to a proper place in mm.h
12. Remove useless "size" in numa_scan_nodes.
13. Add CONFIG_HAS_NUMA_NODE_FWID to gate print the mapping between node id and architectural node id (fw node id).

v2 -> v3:
1. Drop enumeration of numa status.
2. Use helpers to get/update acpi_numa.
3. Insert spaces among parameters of strncmp in numa_setup.
4. Drop helpers to access mem_hotplug. Export mem_hotplug for all arch.
5. Remove acpi.h from common/numa.c.
6. Rename acpi_scan_nodes to numa_scan_nodes.
7. Replace u8 by uint8_t for memnodemap.
8. Use unsigned int for memnode_shift and adjust related functions (compute_hash_shift, populate_memnodemap) to use correct types for return values or parameters.
9. Use nodeid_t for nodeid and node numbers.
10. Use __read_mostly and __ro_after_init for appropriate variables.
11. Adjust the __read_mostly and __initdata location for some variables.
12. Convert from plain int to unsigned for cpuid and other proper
13. Remove unnecessary change items in history.
14. Rename arch_get_memory_map to arch_get_ram_range.
15. Use -ENOENT instead of -ENODEV to indicate end of memory map.
16. Add description to code comment that arch_get_ram_range returns RAM range in [start, end) format.
17. Rename bad_srat to numa_fw_bad.
18. Rename node_to_pxm to numa_node_to_arch_nid.
19. Merge patch#7 and #8 into patch#6.
20. Move NR_NODE_MEMBLKS from x86/acpi.h to common/numa.h
22. Use 2-64 for node range.

v1 -> v2:
1. Refine the commit messages of several patches.
2. Merge v1 patch#9,10 into one patch. Introduce the new functions in the same patch that this patch will be used first time.
3. Fold if ( end > mem_hotplug ) to mem_hotplug_update_boundary, in this case, we can drop mem_hotplug_boundary.
4. Remove fw_numa, use enumeration to replace numa_off and acpi_numa.
5. Correct return value of srat_disabled.
6. Introduce numa_enabled_with_firmware.
7. Refine the justification of using !node_data[nid].node_spanned_pages.
8. Use ASSERT to replace VIRTUAL_BUG_ON in phys_to_nid.
9. Adjust the conditional express for ASSERT.
10. Move MAX_NUMNODES from xen/numa.h to asm/numa.h for x86.
11. Use conditional macro to gate MAX_NUMNODES for other architectures.
12. Use arch_get_memory_map to replace arch_get_memory_bank_range and arch_get_memory_bank_number.
13. Remove the !start || !end check, because caller guarantee these two pointers will not be NULL.
14. Add code comment for numa_update_node_memblks to explain:
Assumes all memory regions belonging to a single node
are in one chunk. Holes between them will be included
in the node.
15. Merge this single patch instead of serval patches to move x86 SRAT code to common.
16. Export node_to_pxm to keep pxm information in NUMA scan nodes error messages.
17. Change the code style to target file's Xen code-style.
18. Adjust some __init and __initdata for some functions and variables.
19. Replace CONFIG_ACPI_NUMA by CONFIG_NUMA. Replace "SRAT" texts.
20. Turn numa_scan_nodes to static.
21. Change NR_NUMA_NODES upper bound from 4095 to 255.

Wei Chen (6):
xen/x86: Provide helpers for common code to access acpi_numa xen/x86: move generically usable NUMA code from x86 to common xen/x86: Use ASSERT instead of VIRTUAL_BUG_ON for phys_to_nid xen/x86: use arch_get_ram_range to get information from E820 map xen/x86: move NUMA process nodes nodes code from x86 to common
xen: introduce a Kconfig option to configure NUMA nodes number

 xen/arch/Kconfig                 |  11 +
 xen/arch/x86/include/asm/acpi.h  |   2 -
 xen/arch/x86/include/asm/mm.h    |   2 -
 xen/arch/x86/include/asm/numa.h  |  61 +--
 xen/arch/x86/include/asm/setup.h |   1 -
 xen/arch/x86/mm.c                |   2 -
 xen/arch/x86/numa.c              | 441 +----------------
 xen/arch/x86/smpboot.c           |   2 +-
 xen/arch/x86/srat.c              | 335 +------------
 xen/common/Makefile              |   1 +
 xen/common/numa.c                | 802 +++++++++++++++++++++++++++++++
 xen/common/page_alloc.c          |   2 +
 xen/include/xen/mm.h             |   2 +
 xen/include/xen/numa.h           |  96 +++-
 14 files changed, 959 insertions(+), 801 deletions(-)
 create mode 100644 xen/common/numa.c
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH v6 1/6 xen/x86: Provide helpers for common code to access acpi_numa

acpi_numa is a specific NUMA switch for ACPI NUMA implementation. Other NUMA implementation may not need this switch. But this switch is not only used by ACPI code, it is also used directly in some general NUMA logic code. So far this hasn't caused any problem because Xen only has x86 implementing ACPI NUMA, but now Arm is implementing device tree based NUMA. Accesssing acpi_numa directly in some functions will be a block of reusing NUMA common code. It is also difficult for us to replace it with a new generic switch, because it is hard to prove that the new switch states can guarantee the original code will work correctly.

So in this patch, we provide two helpers for common code to update and get states of acpi_numa. And other new NUMA implementations just need to provide the same helpers for common code. In this case, the generic NUMA logic code can be reused by all NUMA implementations.

---
v5 -> v6:
1. Revert arch_numa_broken to arch_numa_disabled, as acpi_numa can be set to -1 by users. So acpi_numa < 0 does not mean a broken firmware.
v4 -> v5:
1. Use arch_numa_broken instead of arch_numa_disabled for acpi_numa < 0 check. Because arch_numa_disabled might include acpi_numa < 0 (init failed) and acpi_numa == 0 (no data or data no init) cases.
v3 -> v4:
1. Drop parameter from arch_numa_disabled, the parameter will be introduced in later patch where use it.
2. Drop unnecessary "else" from arch_numa_setup, and fix its indentation.
v2 -> v3:
1. Drop enumeration of numa status.
2. Use helpers to get/update acpi_numa.
3. Insert spaces among parameters of strncmp in numa_setup. v1 -> v2:
1. Remove fw_numa.
2. Use enumeration to replace numa_off and acpi_numa.
3. Correct return value of srat_disabled.
4. Introduce numa_enabled_with_firmware.

---
 xen/arch/x86/include/asm/numa.h |  5 +++--
 xen/arch/x86/numa.c             | 38 ++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 15 deletions(-)
xen/arch/x86/include/asm/numa.h +3 -2
index c32ccffde3..237f2c6dbf 100644
@@ -32,8 +32,9 @@ extern void numa_add_cpu(int cpu);
 extern void numa_init_array(void);
 extern bool numa_off;
 
-
-extern int srat_disabled(void);
+extern int arch_numa_setup(const char *opt);
+extern bool arch_numa_disabled(void);
+extern bool srat_disabled(void);
 extern void numa_set_node(int cpu, nodeid_t node);
 extern nodeid_t setup_node(unsigned int pxm);
 extern void srat_detect_node(int cpu);
xen/arch/x86/numa.c +25 -13
index 322157fab7..1c3198445d 100644
@@ -50,9 +50,28 @@ nodemask_t __read_mostly node_online_map = { { [0] = 1UL } };
 bool numa_off;
 s8 acpi_numa = 0;
 
-int srat_disabled(void)
+int __init arch_numa_setup(const char *opt)
 {
-    return numa_off || acpi_numa < 0;
+#ifdef CONFIG_ACPI_NUMA
+    if ( !strncmp(opt, "noacpi", 6) )
+    {
+        numa_off = false;
+        acpi_numa = -1;
+        return 0;
+    }
+#endif
+
+    return -EINVAL;
+}
+
+bool arch_numa_disabled(void)
+{
+    return acpi_numa < 0;
+}
+
+bool srat_disabled(void)
+{
+    return numa_off || arch_numa_disabled();
 }
 
 /*
@@ -294,28 +313,21 @@ void numa_set_node(int cpu, nodeid_t node)
 /* [numa=off] */
 static int __init cf_check numa_setup(const char *opt)
 {
-    if ( !strncmp(opt,"off",3) )
+    if ( !strncmp(opt, "off", 3) )
         numa_off = true;
-    else if ( !strncmp(opt,"on",2) )
+    else if ( !strncmp(opt, "on", 2) )
         numa_off = false;
 #ifdef CONFIG_NUMA_EMU
     else if ( !strncmp(opt, "fake=", 5) )
     {
         numa_off = false;
-        numa_fake = simple_strtoul(opt+5,NULL,0);
+        numa_fake = simple_strtoul(opt + 5, NULL, 0);
         if ( numa_fake >= MAX_NUMNODES )
             numa_fake = MAX_NUMNODES;
     }
-#endif
-#ifdef CONFIG_ACPI_NUMA
-    else if ( !strncmp(opt,"noacpi",6) )
-    {
-        numa_off = false;
-        acpi_numa = -1;
-    }
 #endif
     else
-        return -EINVAL;
+        return arch_numa_setup(opt);
 
     return 0;
 } 
Signature · 1 line
2.25.1
Reviewed-by on v6 1/6
#2 lore raw

Re: [PATCH v6 1/6] xen/x86: Provide helpers for common code to access acpi_numa

Quoted 10 lines · Wei Chen

acpi_numa is a specific NUMA switch for ACPI NUMA implementation. Other NUMA implementation may not need this switch. But this switch is not only used by ACPI code, it is also used directly in some general NUMA logic code. So far this hasn't caused any problem because Xen only has x86 implementing ACPI NUMA, but now Arm is implementing device tree based NUMA. Accesssing acpi_numa directly in some functions will be a block of reusing NUMA common code. It is also difficult for us to replace it with a new generic switch, because it is hard to prove that the new switch states can guarantee the original code will work correctly.

Quoted 6 lines

So in this patch, we provide two helpers for common code to update and get states of acpi_numa. And other new NUMA implementations just need to provide the same helpers for common code. In this case, the generic NUMA logic code can be reused by all NUMA implementations.

author
#3 lore raw

PATCH v6 2/6 xen/x86: move generically usable NUMA code from x86 to common

In reply to Wei Chen

There are some codes in x86/numa.c can be shared by common architectures to implememnt NUMA support. Just like some variables and functions to check and store NUMA memory map. And some variables and functions to do NUMA initialization.

In this patch, we move them to common/numa.c and xen/numa.h and use the CONFIG_NUMA to gate them for non-NUMA supported architectures. As the target header file is Xen-style, so we trim some spaces and replace tabs for the codes that has been moved to xen/numa.h at the same time.

As acpi_scan_nodes has been used in a common function, it doesn't make sense to use acpi_xxx in common code, so we rename it to numa_process_nodes in this patch too. After that if we still use CONFIG_ACPI_NUMA in to gate numa_process_nodes in numa_initmem_init, that doesn't make sense. As CONFIG_NUMA will be selected by CONFIG_ACPI_NUMA for x86. So, we replace CONFIG_ACPI_NUMA by CONFIG_NUMA to gate numa_process_nodes.

As arch_numa_disabled has been implememnted for ACPI NUMA, we can rename srat_disabled to numa_disabled and move it to common code as well.

The macro node_to_first_cpu(node) hasn't been used anywhere, so we drop it in this patch too.

---
v5 -> v6:
1. Replace numa_scan_node to numa_process_nodes in commit log.
2. Limit the scope of page_num_node, vnuma and page of numa_setup function.
3. Use memset to init page_num_node instead of for_each_online_node.
4. Use %u instead of %d for nodeid_t and j in numa_setup print messages.
5. Use min(PADDR_BITS, BITS_PER_LONG - 1) to calculate the shift when only one node is in the system.
6. Drop the marco: node_to_first_cpu(node)
v4 -> v5:
1. Use nodeid_t instead of uint8_t for memnodemap.
2. Restore to use typeof(*memnodemap) for _memnodemap, this will avoid the further adjustments for _memnodemap's type.
3. Use __ro_after_init for numa_off.
4. Use pointer-to-const for proper function parameters.
5. Use unsigned int for variables that are not realy used for node ID.
6. Fix code comments code-style and adjust the length.
7. Fix code-styles.
8. Rename numa_scan_nodes to numa_process_nodes.
9. Use a plain "int ret" to record compute_hash_shift return value.
v3 -> v4:
1. Restore compute_hash_shift's return value to int.
2. Remove unnecessary parentheses for macros.
3. Use unsigned int for proper variables.
4. Fix some code-style.
v2 -> v3:
1. Remove acpi.h from common/numa.c.
2. Rename acpi_scan_nodes to numa_scan_nodes.
3. Replace u8 by uint8_t for memnodemap.
4. Use unsigned int for memnode_shift and adjust related functions (compute_hash_shift, populate_memnodemap) to use correct types for return values or parameters.
5. Use nodeid_t for nodeid and node numbers.
6. Use __read_mostly and __ro_after_init for appropriate variables.
7. Adjust the __read_mostly and __initdata location for some variables.
8. convert from plain int to unsigned for cpuid and other proper variables.
9. Use __attribute_pure__ instead of __attribute__((pure)).
10. Replace CONFIG_ACPI_NUMA by CONFIG_NUMA in numa_initmem_init.
11. Add const for some functions' parameters.
12. Move srat_disabled to common code with new name numa_disabled.
13. Fix some spaces code-style for numa_emulation.
14. Change from int to unsigned int for numa_fake.
v1 -> v2:
1. New patch in v2.

---
 xen/arch/x86/include/asm/acpi.h  |   1 -
 xen/arch/x86/include/asm/numa.h  |  57 +---
 xen/arch/x86/include/asm/setup.h |   1 -
 xen/arch/x86/numa.c              | 433 +---------------------------
 xen/arch/x86/smpboot.c           |   2 +-
 xen/arch/x86/srat.c              |  10 +-
 xen/common/Makefile              |   1 +
 xen/common/numa.c                | 464 +++++++++++++++++++++++++++++++
 xen/include/xen/numa.h           |  66 +++++
 9 files changed, 539 insertions(+), 496 deletions(-)
 create mode 100644 xen/common/numa.c
xen/arch/x86/include/asm/acpi.h +0 -1
index 9a9cc4c240..5c2dd5da2d 100644
@@ -102,7 +102,6 @@ extern unsigned long acpi_wakeup_address;
 #define ARCH_HAS_POWER_INIT	1
 
 extern s8 acpi_numa;
-extern int acpi_scan_nodes(u64 start, u64 end);
 #define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
 
 extern struct acpi_sleep_info acpi_sinfo;
xen/arch/x86/include/asm/numa.h +1 -56

73 lines not on this page · raw message

xen/arch/x86/include/asm/setup.h +0 -1
index 21037b7f31..ae470ea12f 100644
@@ -20,7 +20,6 @@ void early_time_init(void);
 
 void set_nr_cpu_ids(unsigned int max_cpus);
 
-void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
 void arch_init_memory(void);
 void subarch_init_memory(void);
 
xen/arch/x86/numa.c +1 -432

465 lines not on this page · raw message

xen/arch/x86/smpboot.c +1 -1
index b46fd9ab18..9df08e9366 100644
@@ -1350,7 +1350,7 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm)
 
     x86_acpiid_to_apicid[acpi_id] = apic_id;
 
-    if ( !srat_disabled() )
+    if ( !numa_disabled() )
     {
         nodeid_t node = setup_node(pxm);
 
xen/arch/x86/srat.c +5 -5
index fbcd8749c4..ce507dac9e 100644
@@ -238,7 +238,7 @@ acpi_numa_x2apic_affinity_init(const struct acpi_srat_x2apic_cpu_affinity *pa)
 	unsigned pxm;
 	nodeid_t node;
 
-	if (srat_disabled())
+	if (numa_disabled())
 		return;
 	if (pa->header.length < sizeof(struct acpi_srat_x2apic_cpu_affinity)) {
 		bad_srat();
@@ -274,7 +274,7 @@ acpi_numa_processor_affinity_init(const struct acpi_srat_cpu_affinity *pa)
 	unsigned pxm;
 	nodeid_t node;
 
-	if (srat_disabled())
+	if (numa_disabled())
 		return;
 	if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
 		bad_srat();
@@ -314,7 +314,7 @@ acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *ma)
 	unsigned int i;
 	bool next = false;
 
-	if (srat_disabled())
+	if (numa_disabled())
 		return;
 	if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) {
 		bad_srat();
@@ -543,8 +543,8 @@ void __init srat_parse_regions(paddr_t addr)
 	pfn_pdx_hole_setup(mask >> PAGE_SHIFT);
 }
 
-/* Use the information discovered above to actually set up the nodes. */
-int __init acpi_scan_nodes(paddr_t start, paddr_t end)
+/* Use discovered information to actually set up the nodes. */
+int __init numa_process_nodes(paddr_t start, paddr_t end)
 {
 	int i;
 	nodemask_t all_nodes_parsed;
xen/common/Makefile +1 -0
index 3baf83d527..9a3a12b12d 100644
@@ -26,6 +26,7 @@ obj-$(CONFIG_MEM_ACCESS) += mem_access.o
 obj-y += memory.o
 obj-y += multicall.o
 obj-y += notifier.o
+obj-$(CONFIG_NUMA) += numa.o
 obj-y += page_alloc.o
 obj-$(CONFIG_HAS_PDX) += pdx.o
 obj-$(CONFIG_PERF_COUNTERS) += perfc.o
xen/common/numa.c new file +464 -0

464 lines not on this page · raw message

xen/include/xen/numa.h +66 -0

70 lines not on this page · raw message

Signature · 1 line
2.25.1
#4 lore raw

Re: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

Quoted 7 lines · Wei Chen

v5 -> v6:
1. Replace numa_scan_node to numa_process_nodes in commit log.
2. Limit the scope of page_num_node, vnuma and page of numa_setup function.
3. Use memset to init page_num_node instead of for_each_online_node.
4. Use %u instead of %d for nodeid_t and j in numa_setup print messages.

The only instances of nodeid_t typed variable uses that I was able to find are in dump_numa(). I guess you can leave them that way, but strictly speaking %u isn't correct to use for nodeid_t (as it promotes to int, not to unsigned int).

Quoted 2 lines

5. Use min(PADDR_BITS, BITS_PER_LONG - 1) to calculate the shift when only one node is in the system.

This change needs mentioning / justifying in the description.

Quoted 45 lines
xen/common/numa.c new file +45 -0
+static void cf_check dump_numa(unsigned char key)
+{
+    s_time_t now = NOW();
+    unsigned int i, j, n;
+    struct domain *d;
+
+    printk("'%c' pressed -> dumping numa info (now = %"PRI_stime")\n", key,
+           now);
+
+    for_each_online_node ( i )
+    {
+        paddr_t pa = pfn_to_paddr(node_start_pfn(i) + 1);
+
+        printk("NODE%u start->%lu size->%lu free->%lu\n",
+               i, node_start_pfn(i), node_spanned_pages(i),
+               avail_node_heap_pages(i));
+        /* Sanity check phys_to_nid() */
+        if ( phys_to_nid(pa) != i )
+            printk("phys_to_nid(%"PRIpaddr") -> %u should be %u\n",
+                   pa, phys_to_nid(pa), i);
+    }
+
+    j = cpumask_first(&cpu_online_map);
+    n = 0;
+    for_each_online_cpu ( i )
+    {
+        if ( i != j + n || cpu_to_node[j] != cpu_to_node[i] )
+        {
+            if ( n > 1 )
+                printk("CPU%u...%u -> NODE%u\n", j, j + n - 1, cpu_to_node[j]);
+            else
+                printk("CPU%u -> NODE%u\n", j, cpu_to_node[j]);
+            j = i;
+            n = 1;
+        }
+        else
+            ++n;
+    }
+    if ( n > 1 )
+        printk("CPU%u...%u -> NODE%u\n", j, j + n - 1, cpu_to_node[j]);
+    else
+        printk("CPU%u -> NODE%u\n", j, cpu_to_node[j]);
+
+    rcu_read_lock(&domlist_read_lock);
+

xen/common/numa.c line 378

Quoted 10 lines
xen/common/numa.c new file +10 -0
+    printk("Memory location of each domain:\n");
+    for_each_domain ( d )
+    {
+        const struct page_info *page;
+        unsigned int page_num_node[MAX_NUMNODES];
+        const struct vnuma_info *vnuma;
+
+        process_pending_softirqs();
+
+        printk("Domain %u (total: %u):\n", d->domain_id, domain_tot_pages(d));

Perhaps switch to using %pd here?

Quoted 1 line

+ memset(page_num_node, 0, sizeof(unsigned int) * MAX_NUMNODES);

Simply (and less fragile) sizeof(page_num_node)?

Jan

author
#5 lore raw

RE: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

Hi Jan,

Quoted 20 lines

-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 2022年10月18日 21:46
To: Wei Chen <[email protected]>
Cc: nd <[email protected]>; Andrew Cooper <[email protected]>; Roger Pau Monné <[email protected]>; Wei Liu <[email protected]>; George Dunlap <[email protected]>; Julien Grall <[email protected]>; Stefano Stabellini <[email protected]>; [email protected]
Subject: Re: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

Quoted 7 lines · Wei Chen

v5 -> v6:
1. Replace numa_scan_node to numa_process_nodes in commit log.
2. Limit the scope of page_num_node, vnuma and page of numa_setup function.
3. Use memset to init page_num_node instead of for_each_online_node.
4. Use %u instead of %d for nodeid_t and j in numa_setup print messages.

Quoted 4 lines

The only instances of nodeid_t typed variable uses that I was able to find are in dump_numa(). I guess you can leave them that way, but strictly speaking %u isn't correct to use for nodeid_t (as it promotes to int, not to unsigned int).

In this case, I will restore them to %d.

Quoted 6 lines
Quoted 3 lines

5. Use min(PADDR_BITS, BITS_PER_LONG - 1) to calculate the shift when only one node is in the system.

This change needs mentioning / justifying in the description.

I will do it.

Quoted 17 lines
Quoted 5 lines
xen/common/numa.c new file +5 -0
+static void cf_check dump_numa(unsigned char key)
+{
+    s_time_t now = NOW();
+    unsigned int i, j, n;
+

xen/common/numa.c

Quoted 10 lines
xen/common/numa.c new file +10 -0
+    printk("Memory location of each domain:\n");
+    for_each_domain ( d )
+    {
+        const struct page_info *page;
+        unsigned int page_num_node[MAX_NUMNODES];
+        const struct vnuma_info *vnuma;
+
+        process_pending_softirqs();
+
+        printk("Domain %u (total: %u):\n", d->domain_id,

domain_tot_pages(d));

Quoted 2 lines

Perhaps switch to using %pd here?

Did you mean %d for d->domain_id here?

Quoted 3 lines
Quoted 1 line

+ memset(page_num_node, 0, sizeof(unsigned int) * MAX_NUMNODES);

Simply (and less fragile) sizeof(page_num_node)?

Ok.

Thanks,
Wei Chen

Quoted 2 lines

Jan

#6 lore raw

Re: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

Quoted 22 lines · Wei Chen
Quoted 22 lines

-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 2022年10月18日 21:46

Quoted 5 lines · Wei Chen
xen/common/numa.c new file +5 -0
+static void cf_check dump_numa(unsigned char key)
+{
+    s_time_t now = NOW();
+    unsigned int i, j, n;
+

xen/common/numa.c

Quoted 10 lines
xen/common/numa.c new file +10 -0
+    printk("Memory location of each domain:\n");
+    for_each_domain ( d )
+    {
+        const struct page_info *page;
+        unsigned int page_num_node[MAX_NUMNODES];
+        const struct vnuma_info *vnuma;
+
+        process_pending_softirqs();
+
+        printk("Domain %u (total: %u):\n", d->domain_id,

domain_tot_pages(d));

Quoted 4 lines
Quoted 2 lines

Perhaps switch to using %pd here?

Did you mean %d for d->domain_id here?

No, I did mean %pd:

        printk("%pd (total: %u):\n", d, ...);

Jan

author
#7 lore raw

RE: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

Hi Jan,

Quoted 34 lines

-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 2022年10月19日 14:46
To: Wei Chen <[email protected]>
Cc: nd <[email protected]>; Andrew Cooper <[email protected]>; Roger Pau Monné <[email protected]>; Wei Liu <[email protected]>; George Dunlap <[email protected]>; Julien Grall <[email protected]>; Stefano Stabellini <[email protected]>; [email protected]
Subject: Re: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

Quoted 22 lines · Wei Chen
Quoted 22 lines

-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 2022年10月18日 21:46

Quoted 5 lines · Wei Chen
xen/common/numa.c new file +5 -0
+static void cf_check dump_numa(unsigned char key)
+{
+    s_time_t now = NOW();
+    unsigned int i, j, n;
+

xen/common/numa.c

Quoted 10 lines
xen/common/numa.c new file +10 -0
+    printk("Memory location of each domain:\n");
+    for_each_domain ( d )
+    {
+        const struct page_info *page;
+        unsigned int page_num_node[MAX_NUMNODES];
+        const struct vnuma_info *vnuma;
+
+        process_pending_softirqs();
+
+        printk("Domain %u (total: %u):\n", d->domain_id,

domain_tot_pages(d));

Quoted 9 lines
Quoted 4 lines
Quoted 2 lines

Perhaps switch to using %pd here?

Did you mean %d for d->domain_id here?

No, I did mean %pd:

        printk("%pd (total: %u):\n", d, ...);

Oh, I forgot to change "d->domain_id" to "d", and got and format error.

It works now.

Thanks,
Wei Chen.

Quoted 1 line

Jan

#8 lore raw

RE: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

In reply to Jan Beulich

Hi Jan and Wei,

Quoted 13 lines

-----Original Message-----
Subject: Re: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

Quoted 7 lines · Wei Chen

v5 -> v6:
1. Replace numa_scan_node to numa_process_nodes in commit log.
2. Limit the scope of page_num_node, vnuma and page of numa_setup function.
3. Use memset to init page_num_node instead of for_each_online_node.
4. Use %u instead of %d for nodeid_t and j in numa_setup print messages.

Quoted 4 lines

The only instances of nodeid_t typed variable uses that I was able to find are in dump_numa(). I guess you can leave them that way, but strictly speaking %u isn't correct to use for nodeid_t (as it promotes to int, not to unsigned int).

Sorry for suddenly jumping into the discussion. Firstly thanks Jan for the review :))

I am a little bit confused here, nodeid_t is defined as:
typedef u8 nodeid_t;

so I think here %u should be probably fine (I may have missed something though)?

Kind regards,
Henry

#9 lore raw

Re: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

Quoted 18 lines · Henry Wang
Quoted 13 lines

-----Original Message-----
Subject: Re: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

Quoted 7 lines · Wei Chen

v5 -> v6:
1. Replace numa_scan_node to numa_process_nodes in commit log.
2. Limit the scope of page_num_node, vnuma and page of numa_setup function.
3. Use memset to init page_num_node instead of for_each_online_node.
4. Use %u instead of %d for nodeid_t and j in numa_setup print messages.

Quoted 4 lines

The only instances of nodeid_t typed variable uses that I was able to find are in dump_numa(). I guess you can leave them that way, but strictly speaking %u isn't correct to use for nodeid_t (as it promotes to int, not to unsigned int).

Quoted 8 lines

Sorry for suddenly jumping into the discussion. Firstly thanks Jan for the review :))

I am a little bit confused here, nodeid_t is defined as:
typedef u8 nodeid_t;

so I think here %u should be probably fine (I may have missed something though)?

%u is indeed "probably fine" (hence me saying that they can be left that way), but from a strict language perspective it isn't: unsigned types more narrow than "int" promote to "int", not "unsigned int" (and type promotion kicks in when passing arguments to functions where only ellipsis is specified, i.e. parameter type information isn't available).

Jan

#10 lore raw

RE: [PATCH v6 2/6] xen/x86: move generically usable NUMA code from x86 to common

Hi Jan,

Quoted 16 lines

-----Original Message-----
From: Jan Beulich <[email protected]>

Quoted 14 lines
Quoted 7 lines
Quoted 2 lines

4. Use %u instead of %d for nodeid_t and j in numa_setup print messages.

The only instances of nodeid_t typed variable uses that I was able to find are in dump_numa(). I guess you can leave them that way, but strictly speaking %u isn't correct to use for nodeid_t (as it promotes to int, not to unsigned int).

Sorry for suddenly jumping into the discussion. Firstly thanks Jan for the review :))

I am a little bit confused here, nodeid_t is defined as:
typedef u8 nodeid_t;

Quoted 8 lines
Quoted 2 lines

so I think here %u should be probably fine (I may have missed something though)?

%u is indeed "probably fine" (hence me saying that they can be left that way), but from a strict language perspective it isn't: unsigned types more narrow than "int" promote to "int", not "unsigned int" (and type promotion kicks in when passing arguments to functions where only ellipsis is specified, i.e. parameter type information isn't available).

Ah yes, sorry I should have thought deeper. Thanks for your detailed explanation.

Kind regards,
Henry

Quoted 2 lines

Jan

author
#11 lore raw

PATCH v6 3/6 xen/x86: Use ASSERT instead of VIRTUAL_BUG_ON for phys_to_nid

In reply to Wei Chen

VIRTUAL_BUG_ON is an empty macro used in phys_to_nid. This results in two lines of error-checking code in phys_to_nid that is not actually working and causing two compilation errors:
1. error: "MAX_NUMNODES" undeclared (first use in this function). This is because in the common header file, "MAX_NUMNODES" is defined after the common header file includes the ARCH header file, where phys_to_nid has attempted to use "MAX_NUMNODES". This error was resolved after we moved the phys_to_nid from x86 ARCH header file to common header file.
2. error: wrong type argument to unary exclamation mark. This is because, the error-checking code contains !node_data[nid]. But node_data is a data structure variable, it's not a pointer.

So, in this patch, we use ASSERT instead of VIRTUAL_BUG_ON to enable the two lines of error-checking code. And fix the left compilation errors by replacing !node_data[nid] to !node_data[nid].node_spanned_pages. Although NUMA allows one node can only have CPUs but without any memory. And node with 0 bytes of memory might have an entry in memnodemap[] theoretically. But that doesn't mean phys_to_nid can find any valid address from a node with 0 bytes memory.

---
v5 -> v6:
1. No Change.
v4 -> v5:
1. No change.
v3 -> v4:
1. No change.
v2 -> v3:
1. Remove unnecessary change items in history.
2. Add Acked-by.
v1 -> v2:
1. Use ASSERT to replace VIRTUAL_BUG_ON in phys_to_nid.
2. Adjust the conditional express for ASSERT.
3. Refine the justification of using !node_data[nid].node_spanned_pages.

---
 xen/include/xen/numa.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
xen/include/xen/numa.h +2 -4
index 5b3877344b..04556f3a6f 100644
@@ -35,8 +35,6 @@ struct node {
 extern int compute_hash_shift(const struct node *nodes,
                               unsigned int numnodes, const nodeid_t *nodeids);
 
-#define VIRTUAL_BUG_ON(x)
-
 extern bool numa_off;
 
 extern void numa_add_cpu(unsigned int cpu);
@@ -69,9 +67,9 @@ extern struct node_data node_data[];
 static inline nodeid_t __attribute_pure__ phys_to_nid(paddr_t addr)
 {
     nodeid_t nid;
-    VIRTUAL_BUG_ON((paddr_to_pdx(addr) >> memnode_shift) >= memnodemapsize);
+    ASSERT((paddr_to_pdx(addr) >> memnode_shift) < memnodemapsize);
     nid = memnodemap[paddr_to_pdx(addr) >> memnode_shift];
-    VIRTUAL_BUG_ON(nid >= MAX_NUMNODES || !node_data[nid]);
+    ASSERT(nid < MAX_NUMNODES && node_data[nid].node_spanned_pages);
     return nid;
 }
 
Signature · 1 line
2.25.1
author
#12 lore raw

PATCH v6 4/6 xen/x86: use arch_get_ram_range to get information from E820 map

In reply to Wei Chen

The sanity check of nodes_cover_memory is also a requirement of other architectures that support NUMA. But now, the code of nodes_cover_memory is tied to the x86 E820. In this case, we introduce arch_get_ram_range to decouple architecture specific memory map from this function. This means, other architectures like Arm can also use it to check its node and memory coverage from bootmem info.

Depends arch_get_ram_range, we make nodes_cover_memory become architecture independent. We also use neutral words to replace SRAT and E820 in the print message of this function. This will to make the massage seems more common.

As arch_get_ram_range use unsigned int for index, we also adjust the index in nodes_cover_memory from int to unsigned int.

---
v5 -> v6:
1. No Change.
v4 -> v5:
1. Add Rb.
2. Adjust the code comments.
v3 -> v4:
1. Move function comment to header file.
2. Use bool for found, and add a new "err" for the return value of arch_get_ram_range.
3. Use -ENODATA instead of -EINVAL for non-RAM type ranges. v2 -> v3:
1. Rename arch_get_memory_map to arch_get_ram_range.
2. Use -ENOENT instead of -ENODEV to indicate end of memory map.
3. Add description to code comment that arch_get_ram_range returns RAM range in [start, end) format.
v1 -> v2:
1. Use arch_get_memory_map to replace arch_get_memory_bank_range and arch_get_memory_bank_number.
2. Remove the !start || !end check, because caller guarantee these two pointers will not be NULL.

---
 xen/arch/x86/numa.c    | 15 +++++++++++++++
 xen/arch/x86/srat.c    | 30 ++++++++++++++++++------------
 xen/include/xen/numa.h | 13 +++++++++++++
 3 files changed, 46 insertions(+), 12 deletions(-)
xen/arch/x86/numa.c +15 -0
index 90b2a22591..fa8caaa084 100644
@@ -9,6 +9,7 @@
 #include <xen/nodemask.h>
 #include <xen/numa.h>
 #include <asm/acpi.h>
+#include <asm/e820.h>
 
 #ifndef Dprintk
 #define Dprintk(x...)
@@ -93,3 +94,17 @@ unsigned int __init arch_get_dma_bitsize(void)
                  flsl(node_start_pfn(node) + node_spanned_pages(node) / 4 - 1)
                  + PAGE_SHIFT, 32);
 }
+
+int __init arch_get_ram_range(unsigned int idx, paddr_t *start, paddr_t *end)
+{
+    if ( idx >= e820.nr_map )
+        return -ENOENT;
+
+    if ( e820.map[idx].type != E820_RAM )
+        return -ENODATA;
+
+    *start = e820.map[idx].addr;
+    *end = *start + e820.map[idx].size;
+
+    return 0;
+}
xen/arch/x86/srat.c +18 -12
index ce507dac9e..1a108a34c6 100644
@@ -452,37 +452,43 @@ acpi_numa_memory_affinity_init(const struct acpi_srat_mem_affinity *ma)
    Make sure the PXMs cover all memory. */
 static int __init nodes_cover_memory(void)
 {
-	int i;
+	unsigned int i;
 
-	for (i = 0; i < e820.nr_map; i++) {
-		int j, found;
+	for (i = 0; ; i++) {
+		int err;
+		unsigned int j;
+		bool found;
 		paddr_t start, end;
 
-		if (e820.map[i].type != E820_RAM) {
-			continue;
-		}
+		/* Try to loop memory map from index 0 to end to get RAM ranges. */
+		err = arch_get_ram_range(i, &start, &end);
 
-		start = e820.map[i].addr;
-		end = e820.map[i].addr + e820.map[i].size;
+		/* Reached the end of the memory map? */
+		if (err == -ENOENT)
+			break;
+
+		/* Skip non-RAM entries. */
+		if (err)
+			continue;
 
 		do {
-			found = 0;
+			found = false;
 			for_each_node_mask(j, memory_nodes_parsed)
 				if (start < nodes[j].end
 				    && end > nodes[j].start) {
 					if (start >= nodes[j].start) {
 						start = nodes[j].end;
-						found = 1;
+						found = true;
 					}
 					if (end <= nodes[j].end) {
 						end = nodes[j].start;
-						found = 1;
+						found = true;
 					}
 				}
 		} while (found && start < end);
 
 		if (start < end) {
-			printk(KERN_ERR "SRAT: No PXM for e820 range: "
+			printk(KERN_ERR "NUMA: No NODE for RAM range: "
 				"[%"PRIpaddr", %"PRIpaddr"]\n", start, end - 1);
 			return 0;
 		}
xen/include/xen/numa.h +13 -0
index 04556f3a6f..9da0e7d555 100644
@@ -80,6 +80,19 @@ static inline nodeid_t __attribute_pure__ phys_to_nid(paddr_t addr)
 #define node_end_pfn(nid)       (NODE_DATA(nid)->node_start_pfn + \
                                  NODE_DATA(nid)->node_spanned_pages)
 
+/*
+ * This function provides the ability for caller to get one RAM entry
+ * from architectural memory map by index.
+ *
+ * This function will return zero if it can return a proper RAM entry.
+ * Otherwise it will return -ENOENT for out of scope index, or other
+ * error codes, e.g. return -ENODATA for non-RAM type memory entry.
+ *
+ * Note: the range is exclusive at the end, e.g. [*start, *end).
+ */
+extern int arch_get_ram_range(unsigned int idx,
+                              paddr_t *start, paddr_t *end);
+
 #endif
 
 #endif /* _XEN_NUMA_H */
Signature · 1 line
2.25.1
author
#13 lore raw

PATCH v6 5/6 xen/x86: move NUMA process nodes nodes code from x86 to common

In reply to Wei Chen

x86 has implemented a set of codes to process NUMA nodes. These codes will parse NUMA memory and processor information from ACPI SRAT table. But except some ACPI specific codes, most of the process code like memory blocks validation, node memory range updates and some sanity check can be reused by other NUMA implementation.

So in this patch, we move some variables and related functions for NUMA memory and processor to common as library. At the same time, numa_set_processor_nodes_parsed has been introduced for ACPI specific code to update processor parsing results. With this helper, we can reuse most of NUMA memory affinity init code from ACPI. As bad_srat and node_to_pxm functions have been used in common code to do architectural fallback and node to architectural node info translation. But it doesn't make sense to reuse the functions names in common code, we have rename them to neutral names as well.

PXM is an ACPI specific item, we can't use it in common code directly. As an alternative, we extend the parameters of numa_update_node_memblks. The caller can pass the PXM as print messages' prefix or as architectural node id. And we introduced an numa_fw_nid_name for each NUMA implementation to set their specific firmware NUMA node name. In this case, we do not need to retain a lot of per-arch code but still can print architectural log messages for different NUMA implementations. A default value "NONAME" will be set to indicate an unset numa_fw_nid_name.

mem_hotplug is accessed by common code if memory hotplug is activated. Even if this is only supported by x86, export the variable so that other architectures could support it in the future.

As asm/acpi.h has been removed from common/numa.c, we have to move NR_NODE_MEMBLKS from asm/acpi.h to xen/numa.h in this patch as well.

---
v5 -> v6:
1. Fix code-style.
2. Use arch_numa_unavailable to replace arch_numa_disabled for

    acpi_numa <= 0.

3. Remove Kconfig for HAS_NUMA_NODE_FWID.
4. Use numa_fw_nid_name for NUMA implementation to set their fw NUMA node name for print messages.
v4 -> v5:
1. Introduce arch_numa_disabled for acpi_numa <= 0 in this patch.
2. Remove the paramter init_as_disable of arch_numa_disabled.
3. Fix typo "expandsion".
4. Add const to proper varibales.
5. Fix Indentation for l1tf_safe_maddr.
6. Remove double blank lines.
7. Add a space between for_each_node_mask and '('.
Add a space page_list_for_each and '('.
8. Use bool for nodes_cover_memory return value.
9. Use a plain "int ret" to record compute_hash_shift return value.
10. Add a blank line before the function's main "return".
11. Add new Kconfig option HAS_NUMA_NODE_FWID to common/Kconfig. v3 -> v4:
1. Use bool as return value for functions that only return 0/1 or 0/-EINVAL.
2. Move mem_hotplug to a proper place in mm.h
3. Remove useless "size" in numa_scan_nodes.
4. Use unsigned int or const for proper variables.
5. Fix code-style.
6. Add init_as_disable as arch_numa_disabled parameter.
7. Add CONFIG_HAS_NUMA_NODE_FWID to gate print the mapping between node id and architectural node id (fw node id).
v2 -> v3:
1. Add __ro_after_init to proper variables.
2. Rename bad_srat to numa_fw_bad.
3. Rename node_to_pxm to numa_node_to_arch_nid.
4. Merge patch#7 and #8 into this patch.
5. Correct int to unsigned int in proper places.
6. Move NR_NODE_MEMBLKS from x86/acpi.h to common/numa.h
7. Drop helpers to access mem_hotplug, we export mem_hotplug from x86/mm.c to common/page_alloc.c
v1 -> v2:
1. Add code comment for numa_update_node_memblks to explain:
Assumes all memory regions belonging to a single node are in one chunk. Holes between them will be included in the node.
2. Merge this single patch instead of serval patches to move x86 SRAT code to common.
3. Export node_to_pxm to keep pxm information in NUMA scan nodes error messages.
4. Change the code style to target file's Xen code-style.
5. Adjust some __init and __initdata for some functions and variables.
6. Merge two patches into this patch:
1. replace CONFIG_ACPI_NUMA by CONFIG_NUMA.
2. replace "SRAT" texts.
7. Turn numa_scan_nodes to static.

---
 xen/arch/x86/include/asm/acpi.h |   1 -
 xen/arch/x86/include/asm/mm.h   |   2 -
 xen/arch/x86/include/asm/numa.h |   3 +-
 xen/arch/x86/mm.c               |   2 -
 xen/arch/x86/numa.c             |   5 +
 xen/arch/x86/srat.c             | 335 +++----------------------------
 xen/common/numa.c               | 340 +++++++++++++++++++++++++++++++-
 xen/common/page_alloc.c         |   2 +
 xen/include/xen/mm.h            |   2 +
 xen/include/xen/numa.h          |  10 +-
 10 files changed, 381 insertions(+), 321 deletions(-)
xen/arch/x86/include/asm/acpi.h +0 -1
index 5c2dd5da2d..c453450a74 100644
@@ -102,7 +102,6 @@ extern unsigned long acpi_wakeup_address;
 #define ARCH_HAS_POWER_INIT	1
 
 extern s8 acpi_numa;
-#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
 
 extern struct acpi_sleep_info acpi_sinfo;
 #define acpi_video_flags bootsym(video_flags)
xen/arch/x86/include/asm/mm.h +0 -2
index 0fc826de46..95ff71a83a 100644
@@ -474,8 +474,6 @@ static inline int get_page_and_type(struct page_info *page,
     ASSERT(((_p)->count_info & PGC_count_mask) != 0);          \
     ASSERT(page_get_owner(_p) == (_d))
 
-extern paddr_t mem_hotplug;
-
 /******************************************************************************
  * With shadow pagetables, the different kinds of address start
  * to get get confusing.
xen/arch/x86/include/asm/numa.h +1 -2
index 6c87942d43..2ca3475271 100644
@@ -10,6 +10,7 @@ typedef u8 nodeid_t;
 extern int srat_rev;
 
 extern nodeid_t pxm_to_node(unsigned int pxm);
+extern unsigned int numa_node_to_arch_nid(nodeid_t n);
 
 #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
 
@@ -22,8 +23,6 @@ extern void init_cpu_to_node(void);
 
 #define arch_want_default_dmazone() (num_online_nodes() > 1)
 
-extern int valid_numa_range(paddr_t start, paddr_t end, nodeid_t node);
-
 void srat_parse_regions(paddr_t addr);
 extern u8 __node_distance(nodeid_t a, nodeid_t b);
 unsigned int arch_get_dma_bitsize(void);
xen/arch/x86/mm.c +0 -2
index db1817b691..68f9989e1f 100644
@@ -157,8 +157,6 @@ l1_pgentry_t __section(".bss.page_aligned") __aligned(PAGE_SIZE)
 l1_pgentry_t __section(".bss.page_aligned") __aligned(PAGE_SIZE)
     l1_fixmap_x[L1_PAGETABLE_ENTRIES];
 
-paddr_t __read_mostly mem_hotplug;
-
 /* Frame table size in pages. */
 unsigned long max_page;
 unsigned long total_pages;
xen/arch/x86/numa.c +5 -0
index fa8caaa084..4227bd5930 100644
@@ -46,6 +46,11 @@ bool arch_numa_disabled(void)
     return acpi_numa < 0;
 }
 
+bool arch_numa_unavailable(void)
+{
+    return acpi_numa <= 0;
+}
+
 /*
  * Setup early cpu_to_node.
  *
xen/arch/x86/srat.c +23 -312

426 lines not on this page · raw message

xen/common/numa.c +339 -1

363 lines not on this page · raw message

xen/common/page_alloc.c +2 -0
index 62afb07bc6..80447a341d 100644
@@ -159,6 +159,8 @@
 #define PGT_TYPE_INFO_INITIALIZER 0
 #endif
 
+paddr_t __read_mostly mem_hotplug;
+
 /*
  * Comma-separated list of hexadecimal page numbers containing bad bytes.
  * e.g. 'badpage=0x3f45,0x8a321'.
xen/include/xen/mm.h +2 -0
index a925028ab3..9d14aed74b 100644
@@ -147,6 +147,8 @@ int assign_page(
 /* Dump info to serial console */
 void arch_dump_shared_mem_info(void);
 
+extern paddr_t mem_hotplug;
+
 /*
  * Extra fault info types which are used to further describe
  * the source of an access violation.
xen/include/xen/numa.h +9 -1
index 9da0e7d555..04ecaf7769 100644
@@ -11,6 +11,7 @@
 #define NUMA_NO_DISTANCE 0xFF
 
 #define MAX_NUMNODES    (1 << NODES_SHIFT)
+#define NR_NODE_MEMBLKS (MAX_NUMNODES * 2)
 
 #define vcpu_to_node(v) (cpu_to_node((v)->processor))
 
@@ -36,14 +37,16 @@ extern int compute_hash_shift(const struct node *nodes,
                               unsigned int numnodes, const nodeid_t *nodeids);
 
 extern bool numa_off;
+extern const char *numa_fw_nid_name;
 
 extern void numa_add_cpu(unsigned int cpu);
 extern void numa_init_array(void);
 extern void numa_set_node(unsigned int cpu, nodeid_t node);
 extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
-extern int numa_process_nodes(paddr_t start, paddr_t end);
+extern void numa_fw_bad(void);
 
 extern int arch_numa_setup(const char *opt);
+extern bool arch_numa_unavailable(void);
 extern bool arch_numa_disabled(void);
 extern void setup_node_bootmem(nodeid_t nodeid, paddr_t start, paddr_t end);
 
@@ -92,6 +95,11 @@ static inline nodeid_t __attribute_pure__ phys_to_nid(paddr_t addr)
  */
 extern int arch_get_ram_range(unsigned int idx,
                               paddr_t *start, paddr_t *end);
+extern bool valid_numa_range(paddr_t start, paddr_t end, nodeid_t node);
+extern bool numa_memblks_available(void);
+extern bool numa_update_node_memblks(nodeid_t node, unsigned int arch_nid,
+                                     paddr_t start, paddr_t size, bool hotplug);
+extern void numa_set_processor_nodes_parsed(nodeid_t node);
 
 #endif
 
Signature · 1 line
2.25.1
#14 lore raw

Re: [PATCH v6 5/6] xen/x86: move NUMA process nodes nodes code from x86 to common

xen/arch/x86/numa.c bool arch_numa_disabled(void) · line 49

Quoted 7 lines · Wei Chen
xen/arch/x86/numa.c +1 -0
@@ -46,6 +46,11 @@ bool arch_numa_disabled(void)
     return acpi_numa < 0;
 }
 
+bool arch_numa_unavailable(void)

__init ?

xen/arch/x86/numa.c nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; · line 49

Quoted 5 lines
xen/arch/x86/numa.c +1 -0
@@ -31,11 +46,334 @@ nodemask_t __read_mostly node_online_map = { { [0] = 1UL } };
 
 bool __ro_after_init numa_off;
 
+const char *__ro_after_init numa_fw_nid_name = "NONAME";

Didn't you mean to leave this at NULL for the DT case? (But yes, this way you avoid a conditional at every printk() using it.)

I'm also uncertain of "NOMAME" - personally I think e.g. "???" would be better, just in case a message actually is logged with this still un-overridden.

Quoted 82 lines
xen/arch/x86/numa.c +82 -0
+bool __init numa_update_node_memblks(nodeid_t node, unsigned int arch_nid,
+                                     paddr_t start, paddr_t size, bool hotplug)
+{
+    unsigned int i;
+    bool next = false;
+    paddr_t end = start + size;
+    paddr_t nd_start = start;
+    paddr_t nd_end = end;
+    struct node *nd = &nodes[node];
+
+    /*
+     * For the node that already has some memory blocks, we will
+     * expand the node memory range temporarily to check memory
+     * interleaves with other nodes. We will not use this node
+     * temp memory range to check overlaps, because it will mask
+     * the overlaps in same node.
+     *
+     * Node with 0 bytes memory doesn't need this expansion.
+     */
+    if ( nd->start != nd->end )
+    {
+        if ( nd_start > nd->start )
+            nd_start = nd->start;
+
+        if ( nd_end < nd->end )
+            nd_end = nd->end;
+    }
+
+    /* It is fine to add this area to the nodes data it will be used later */
+    switch ( conflicting_memblks(node, start, end, nd_start, nd_end, &i) )
+    {
+    case OVERLAP:
+        if ( memblk_nodeid[i] == node )
+        {
+            bool mismatch = !hotplug != !test_bit(i, memblk_hotplug);
+
+            printk("%sNUMA: %s %u [%"PRIpaddr", %"PRIpaddr"] overlaps with itself [%"PRIpaddr", %"PRIpaddr"]\n",
+                   mismatch ? KERN_ERR : KERN_WARNING, numa_fw_nid_name,
+                   arch_nid, start, end - 1,
+                   node_memblk_range[i].start, node_memblk_range[i].end - 1);
+            if ( mismatch )
+                return false;
+            break;
+        }
+
+        printk(KERN_ERR
+               "NUMA: %s %u [%"PRIpaddr", %"PRIpaddr"] overlaps with %s %u [%"PRIpaddr", %"PRIpaddr"]\n",
+               numa_fw_nid_name, arch_nid, start, end - 1, numa_fw_nid_name,
+               numa_node_to_arch_nid(memblk_nodeid[i]),
+               node_memblk_range[i].start, node_memblk_range[i].end - 1);
+        return false;
+
+    case INTERLEAVE:
+        printk(KERN_ERR
+               "NUMA: %s %u: [%"PRIpaddr", %"PRIpaddr"] interleaves with %s %u memblk [%"PRIpaddr", %"PRIpaddr"]\n",
+               numa_fw_nid_name, arch_nid, nd_start, nd_end - 1,
+               numa_fw_nid_name, numa_node_to_arch_nid(memblk_nodeid[i]),
+               node_memblk_range[i].start, node_memblk_range[i].end - 1);
+        return false;
+
+    case NO_CONFLICT:
+        break;
+    }
+
+    if ( !hotplug )
+    {
+        node_set(node, memory_nodes_parsed);
+        nd->start = nd_start;
+        nd->end = nd_end;
+    }
+
+    printk(KERN_INFO "NUMA: Node %u %s %u [%"PRIpaddr", %"PRIpaddr"]%s\n",
+           node, numa_fw_nid_name, arch_nid, start, end - 1,
+           hotplug ? " (hotplug)" : "");
+
+    /* Keep node_memblk_range[] sorted by address. */
+    for ( i = 0; i < num_node_memblks; ++i )
+        if ( node_memblk_range[i].start > start ||
+             (node_memblk_range[i].start == start &&
+             node_memblk_range[i].end > end) )
+            break;
+

xen/arch/x86/numa.c nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; · line 141

Quoted 10 lines
xen/arch/x86/numa.c +10 -0
+    memmove(&node_memblk_range[i + 1], &node_memblk_range[i],
+            (num_node_memblks - i) * sizeof(*node_memblk_range));
+    node_memblk_range[i].start = start;
+    node_memblk_range[i].end = end;
+
+    memmove(&memblk_nodeid[i + 1], &memblk_nodeid[i],
+            (num_node_memblks - i) * sizeof(*memblk_nodeid));
+    memblk_nodeid[i] = node;
+
+    if ( hotplug ) {

Nit: Placement of brace.

xen/common/page_alloc.c line 162

Quoted 7 lines
xen/common/page_alloc.c +1 -0
@@ -159,6 +159,8 @@
 #define PGT_TYPE_INFO_INITIALIZER 0
 #endif
 
+paddr_t __read_mostly mem_hotplug;

Not __ro_after_init?

Jan

author
#15 lore raw

RE: [PATCH v6 5/6] xen/x86: move NUMA process nodes nodes code from x86 to common

Hi Jan,

Quoted 18 lines

-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 2022年10月18日 22:08
To: Wei Chen <[email protected]>
Cc: nd <[email protected]>; Andrew Cooper <[email protected]>; Roger Pau Monné <[email protected]>; Wei Liu <[email protected]>; George Dunlap <[email protected]>; Julien Grall <[email protected]>; Stefano Stabellini <[email protected]>; [email protected]
Subject: Re: [PATCH v6 5/6] xen/x86: move NUMA process nodes nodes code from x86 to common

Quoted 6 lines · Wei Chen
xen/arch/x86/numa.c +0 -0
@@ -46,6 +46,11 @@ bool arch_numa_disabled(void)
     return acpi_numa < 0;
 }
 
Quoted 3 lines

xen/arch/x86/numa.c bool arch_numa_disabled(void) · line 49

Quoted 1 line
xen/arch/x86/numa.c +1 -0
+bool arch_numa_unavailable(void)

__init ?

Yes, this function will only be called in an init function. I will add it.

Quoted 11 lines

xen/arch/x86/numa.c nodemask_t __read_mostly node_online_map = { { [0]

Quoted 2 lines
xen/arch/x86/numa.c +0 -0
@@ -31,11 +46,334 @@ nodemask_t __read_mostly node_online_map = { { [0]

= 1UL } };

xen/arch/x86/numa.c nodemask_t __read_mostly node_online_map = { { [0] · line 48

Quoted 4 lines
xen/arch/x86/numa.c +1 -0
 bool __ro_after_init numa_off;
 
+const char *__ro_after_init numa_fw_nid_name = "NONAME";

Didn't you mean to leave this at NULL for the DT case? (But yes, this way you avoid a conditional at every printk() using it.)

Yes.

Quoted 4 lines

I'm also uncertain of "NOMAME" - personally I think e.g. "???" would be better, just in case a message actually is logged with this still un-overridden.

Ok, I will use "???" for this default value.

Quoted 4 lines

xen/arch/x86/numa.c nodemask_t __read_mostly node_online_map = { { [0] · line 49

Quoted 1 line
xen/arch/x86/numa.c +1 -0
+bool __init numa_update_node_memblks(nodeid_t node, unsigned int

arch_nid,

xen/arch/x86/numa.c nodemask_t __read_mostly node_online_map = { { [0] · line 50

Quoted 1 line
xen/arch/x86/numa.c +1 -0
+                                     paddr_t start, paddr_t size, bool

hotplug)

Quoted 11 lines

xen/arch/x86/numa.c nodemask_t __read_mostly node_online_map = { { [0] · line 58

Quoted 8 lines
xen/arch/x86/numa.c +8 -0
+    node_memblk_range[i].start = start;
+    node_memblk_range[i].end = end;
+
+    memmove(&memblk_nodeid[i + 1], &memblk_nodeid[i],
+            (num_node_memblks - i) * sizeof(*memblk_nodeid));
+    memblk_nodeid[i] = node;
+
+    if ( hotplug ) {

Nit: Placement of brace.

Ok.

Quoted 9 lines

xen/common/page_alloc.c line 162

Quoted 7 lines
xen/common/page_alloc.c +1 -0
@@ -159,6 +159,8 @@
 #define PGT_TYPE_INFO_INITIALIZER 0
 #endif
 
+paddr_t __read_mostly mem_hotplug;

Not __ro_after_init?

I will add it.

Thanks,
Wei Chen

Quoted 2 lines

Jan

author
#16 lore raw

PATCH v6 6/6 xen: introduce a Kconfig option to configure NUMA nodes number

In reply to Wei Chen

Currently the maximum number of NUMA nodes is a hardcoded value. This provides little flexibility unless changing the code.

Introduce a new Kconfig option to change the maximum number of NUMA nodes conveniently. Also considering that not all architectures support NUMA, this Kconfig option is only visible on NUMA enabled architectures. Architectures not supporting NUMA still use 1 for MAX_NUMNODES.

As NODES_SHIFT is currently unused, we're taking this opportunity to remove it.

---
v5 -> v6:
1. No change.
v4 -> v5:
1. No change.
v3 -> v4:
1. Update the commit log to follow Jan's suggestion.
2. Add Ack-by.
v2 -> v3:
1. Fix indent.
2. Use 2-64 for node range.
v1 -> v2:
1. Add NODES_SHIFT remove message in commit log
2. Change NR_NUMA_NODES upper bound from 4095 to 255.

---
 xen/arch/Kconfig                | 11 +++++++++++
 xen/arch/x86/include/asm/numa.h |  2 --
 xen/include/xen/numa.h          | 11 ++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)
xen/arch/Kconfig +11 -0
index f16eb0df43..7028f7b74f 100644
@@ -17,3 +17,14 @@ config NR_CPUS
 	  For CPU cores which support Simultaneous Multi-Threading or similar
 	  technologies, this the number of logical threads which Xen will
 	  support.
+
+config NR_NUMA_NODES
+	int "Maximum number of NUMA nodes supported"
+	range 2 64
+	default "64"
+	depends on NUMA
+	help
+	  Controls the build-time size of various arrays and bitmaps
+	  associated with multiple-nodes management. It is the upper bound of
+	  the number of NUMA nodes that the scheduler, memory allocation and
+	  other NUMA-aware components can handle.
xen/arch/x86/include/asm/numa.h +0 -2
index 2ca3475271..7866afa408 100644
@@ -3,8 +3,6 @@
 
 #include <xen/cpumask.h>
 
-#define NODES_SHIFT 6
-
 typedef u8 nodeid_t;
 
 extern int srat_rev;
xen/include/xen/numa.h +6 -5
index 04ecaf7769..71a5f837b3 100644
@@ -3,14 +3,15 @@
 
 #include <asm/numa.h>
 
-#ifndef NODES_SHIFT
-#define NODES_SHIFT     0
-#endif
-
 #define NUMA_NO_NODE     0xFF
 #define NUMA_NO_DISTANCE 0xFF
 
-#define MAX_NUMNODES    (1 << NODES_SHIFT)
+#ifdef CONFIG_NR_NUMA_NODES
+#define MAX_NUMNODES CONFIG_NR_NUMA_NODES
+#else
+#define MAX_NUMNODES 1
+#endif
+
 #define NR_NODE_MEMBLKS (MAX_NUMNODES * 2)
 
 #define vcpu_to_node(v) (cpu_to_node((v)->processor))
Signature · 1 line
2.25.1