diff mbox series

[v3,1/6] hw/loongarch: Refine acpi srat table for numa memory

Message ID 20240515093927.3453674-2-maobibo@loongson.cn (mailing list archive)
State New, archived
Headers show
Series hw/loongarch: Refine numa memory map | expand

Commit Message

Bibo Mao May 15, 2024, 9:39 a.m. UTC 
One LoongArch virt machine platform, there is limitation for memory
map information. The minimum memory size is 256M and minimum memory
size for numa node0 is 256M also. With qemu numa qtest, it is possible
that memory size of numa node0 is 128M.

Limitations for minimum memory size for both total memory and numa
node0 is removed for acpi srat table creation.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 hw/loongarch/acpi-build.c | 58 +++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 24 deletions(-)

Comments

gaosong May 22, 2024, 1:36 a.m. UTC | #1 
在 2024/5/15 下午5:39, Bibo Mao 写道:
> One LoongArch virt machine platform, there is limitation for memory
> map information. The minimum memory size is 256M and minimum memory
> size for numa node0 is 256M also. With qemu numa qtest, it is possible
> that memory size of numa node0 is 128M.
>
> Limitations for minimum memory size for both total memory and numa
> node0 is removed for acpi srat table creation.
>
> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
> ---
Reviewed-by: Song Gao <gaosong@loongson.cn>

Thanks.
Song Gao
>   hw/loongarch/acpi-build.c | 58 +++++++++++++++++++++++----------------
>   1 file changed, 34 insertions(+), 24 deletions(-)
>
> diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
> index 5ef010d4da..af45ce526d 100644
> --- a/hw/loongarch/acpi-build.c
> +++ b/hw/loongarch/acpi-build.c
> @@ -166,8 +166,9 @@ static void
>   build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>   {
>       int i, arch_id, node_id;
> -    uint64_t mem_len, mem_base;
> -    int nb_numa_nodes = machine->numa_state->num_nodes;
> +    hwaddr len, base, gap;
> +    NodeInfo *numa_info;
> +    int nodes, nb_numa_nodes = machine->numa_state->num_nodes;
>       LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(machine);
>       MachineClass *mc = MACHINE_GET_CLASS(lvms);
>       const CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(machine);
> @@ -196,35 +197,44 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
>           build_append_int_noprefix(table_data, 0, 4); /* Reserved */
>       }
>   
> -    /* Node0 */
> -    build_srat_memory(table_data, VIRT_LOWMEM_BASE, VIRT_LOWMEM_SIZE,
> -                      0, MEM_AFFINITY_ENABLED);
> -    mem_base = VIRT_HIGHMEM_BASE;
> -    if (!nb_numa_nodes) {
> -        mem_len = machine->ram_size - VIRT_LOWMEM_SIZE;
> -    } else {
> -        mem_len = machine->numa_state->nodes[0].node_mem - VIRT_LOWMEM_SIZE;
> +    base = VIRT_LOWMEM_BASE;
> +    gap = VIRT_LOWMEM_SIZE;
> +    numa_info = machine->numa_state->nodes;
> +    nodes = nb_numa_nodes;
> +    if (!nodes) {
> +        nodes = 1;
>       }
> -    if (mem_len)
> -        build_srat_memory(table_data, mem_base, mem_len, 0, MEM_AFFINITY_ENABLED);
> -
> -    /* Node1 - Nodemax */
> -    if (nb_numa_nodes) {
> -        mem_base += mem_len;
> -        for (i = 1; i < nb_numa_nodes; ++i) {
> -            if (machine->numa_state->nodes[i].node_mem > 0) {
> -                build_srat_memory(table_data, mem_base,
> -                                  machine->numa_state->nodes[i].node_mem, i,
> -                                  MEM_AFFINITY_ENABLED);
> -                mem_base += machine->numa_state->nodes[i].node_mem;
> -            }
> +
> +    for (i = 0; i < nodes; i++) {
> +        if (nb_numa_nodes) {
> +            len = numa_info[i].node_mem;
> +        } else {
> +            len = machine->ram_size;
> +        }
> +
> +        /*
> +         * memory for the node splited into two part
> +         *   lowram:  [base, +gap)
> +         *   highram: [VIRT_HIGHMEM_BASE, +(len - gap))
> +         */
> +        if (len >= gap) {
> +            build_srat_memory(table_data, base, len, i, MEM_AFFINITY_ENABLED);
> +            len -= gap;
> +            base = VIRT_HIGHMEM_BASE;
> +            gap = machine->ram_size - VIRT_LOWMEM_SIZE;
> +        }
> +
> +        if (len) {
> +            build_srat_memory(table_data, base, len, i, MEM_AFFINITY_ENABLED);
> +            base += len;
> +            gap  -= len;
>           }
>       }
>   
>       if (machine->device_memory) {
>           build_srat_memory(table_data, machine->device_memory->base,
>                             memory_region_size(&machine->device_memory->mr),
> -                          nb_numa_nodes - 1,
> +                          nodes - 1,
>                             MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
>       }
>
diff mbox series

Patch

diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
index 5ef010d4da..af45ce526d 100644
--- a/hw/loongarch/acpi-build.c
+++ b/hw/loongarch/acpi-build.c
@@ -166,8 +166,9 @@  static void
 build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
 {
     int i, arch_id, node_id;
-    uint64_t mem_len, mem_base;
-    int nb_numa_nodes = machine->numa_state->num_nodes;
+    hwaddr len, base, gap;
+    NodeInfo *numa_info;
+    int nodes, nb_numa_nodes = machine->numa_state->num_nodes;
     LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(machine);
     MachineClass *mc = MACHINE_GET_CLASS(lvms);
     const CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(machine);
@@ -196,35 +197,44 @@  build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
         build_append_int_noprefix(table_data, 0, 4); /* Reserved */
     }
 
-    /* Node0 */
-    build_srat_memory(table_data, VIRT_LOWMEM_BASE, VIRT_LOWMEM_SIZE,
-                      0, MEM_AFFINITY_ENABLED);
-    mem_base = VIRT_HIGHMEM_BASE;
-    if (!nb_numa_nodes) {
-        mem_len = machine->ram_size - VIRT_LOWMEM_SIZE;
-    } else {
-        mem_len = machine->numa_state->nodes[0].node_mem - VIRT_LOWMEM_SIZE;
+    base = VIRT_LOWMEM_BASE;
+    gap = VIRT_LOWMEM_SIZE;
+    numa_info = machine->numa_state->nodes;
+    nodes = nb_numa_nodes;
+    if (!nodes) {
+        nodes = 1;
     }
-    if (mem_len)
-        build_srat_memory(table_data, mem_base, mem_len, 0, MEM_AFFINITY_ENABLED);
-
-    /* Node1 - Nodemax */
-    if (nb_numa_nodes) {
-        mem_base += mem_len;
-        for (i = 1; i < nb_numa_nodes; ++i) {
-            if (machine->numa_state->nodes[i].node_mem > 0) {
-                build_srat_memory(table_data, mem_base,
-                                  machine->numa_state->nodes[i].node_mem, i,
-                                  MEM_AFFINITY_ENABLED);
-                mem_base += machine->numa_state->nodes[i].node_mem;
-            }
+
+    for (i = 0; i < nodes; i++) {
+        if (nb_numa_nodes) {
+            len = numa_info[i].node_mem;
+        } else {
+            len = machine->ram_size;
+        }
+
+        /*
+         * memory for the node splited into two part
+         *   lowram:  [base, +gap)
+         *   highram: [VIRT_HIGHMEM_BASE, +(len - gap))
+         */
+        if (len >= gap) {
+            build_srat_memory(table_data, base, len, i, MEM_AFFINITY_ENABLED);
+            len -= gap;
+            base = VIRT_HIGHMEM_BASE;
+            gap = machine->ram_size - VIRT_LOWMEM_SIZE;
+        }
+
+        if (len) {
+            build_srat_memory(table_data, base, len, i, MEM_AFFINITY_ENABLED);
+            base += len;
+            gap  -= len;
         }
     }
 
     if (machine->device_memory) {
         build_srat_memory(table_data, machine->device_memory->base,
                           memory_region_size(&machine->device_memory->mr),
-                          nb_numa_nodes - 1,
+                          nodes - 1,
                           MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
     }