hw/i386/acpi-build: Get NUMA information from struct NumaState
PATCH v2 1/1 hw/i386/acpi-build: Get NUMA information from struct NumaState
We can get NUMA information completely from MachineState::numa_state. Remove PCMachineState::numa_nodes and PCMachineState::node_mem, since they are just copied from MachineState::numa_state.
--- hw/i386/acpi-build.c | 12 +++++++----- hw/i386/pc.c | 9 --------- include/hw/i386/pc.h | 4 ---- 3 files changed, 7 insertions(+), 18 deletions(-)
hw/i386/acpi-build.c +7 -5
@@ -1902,6 +1902,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)X86MachineState *x86ms =X86_MACHINE (machine);const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids (machine);PCMachineState *pcms =PC_MACHINE (machine); +int nb_numa_nodes = machine->numa_state->num_nodes; +NodeInfo *numa_info = machine->numa_state->nodes;ram_addr_t hotplugabble_address_space_size =object_property_get_int (OBJECT (pcms),PC_MACHINE_DEVMEM_REGION_SIZE ,NULL );
@@ -1945,9 +1947,9 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) next_base =0 ; numa_start = table_data->len; -for (i =1 ; i < pcms->numa_nodes +1 ; ++i) { +for (i =1 ; i < nb_numa_nodes +1 ; ++i) { mem_base = next_base; - mem_len = pcms->node_mem[i -1 ]; + mem_len = numa_info[i -1 ].node_mem; next_base = mem_base + mem_len;/* Cut out the 640K hole */
@@ -1995,7 +1997,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) } slots = (table_data->len - numa_start) /sizeof *numamem; -for (; slots < pcms->numa_nodes +2 ; slots++) { +for (; slots < nb_numa_nodes +2 ; slots++) { numamem =acpi_data_push (table_data,sizeof *numamem);build_srat_memory (numamem,0 ,0 ,0 ,MEM_AFFINITY_NOFLAGS ); }
@@ -2011,7 +2013,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)if (hotplugabble_address_space_size) { numamem =acpi_data_push (table_data,sizeof *numamem);build_srat_memory (numamem, machine->device_memory->base, - hotplugabble_address_space_size, pcms->numa_nodes -1 , + hotplugabble_address_space_size, nb_numa_nodes -1 ,MEM_AFFINITY_HOTPLUGGABLE |MEM_AFFINITY_ENABLED ); }
@@ -2513,7 +2515,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) } }#endif -if (pcms->numa_nodes) { +if (machine->numa_state->num_nodes) {acpi_add_table (table_offsets, tables_blob);build_srat (tables_blob, tables->linker, machine);if (machine->numa_state->have_numa_distance) {
hw/i386/pc.c +0 -9
@@ -800,18 +800,9 @@ void pc_machine_done(Notifier *notifier, void *data)void pc_guest_info_init (PCMachineState *pcms) { -int i; -MachineState *ms =MACHINE (pcms);X86MachineState *x86ms =X86_MACHINE (pcms); x86ms->apic_xrupt_override = true; - pcms->numa_nodes = ms->numa_state->num_nodes; - pcms->node_mem =g_malloc0 (pcms->numa_nodes * -sizeof *pcms->node_mem); -for (i =0 ; i < ms->numa_state->num_nodes; i++) { - pcms->node_mem[i] = ms->numa_state->nodes[i].node_mem; - } - pcms->machine_done.notify = pc_machine_done;qemu_add_machine_init_done_notifier (&pcms->machine_done); }
include/hw/i386/pc.h +0 -4
@@ -47,10 +47,6 @@ typedef struct PCMachineState {bool default_bus_bypass_iommu;uint64_t max_fw_size; -/* NUMA information: */ -uint64_t numa_nodes; -uint64_t *node_mem; -/* ACPI Memory hotplug IO base address */ hwaddr memhp_io_base; } PCMachineState;
Signature · 1 line
2.21.3
Hi Igor,
Any comments on this 2nd version of the patch ?
Thanks,
Jingqi
Quoted 102 lines · Jingqi
We can get NUMA information completely from
MachineState::numa_state. RemovePCMachineState::numa_nodesandPCMachineState::node_mem, since they are just copied fromMachineState::numa_state.Signed-off-by Jingqi Liu <[email protected]>--- hw/i386/acpi-build.c | 12 +++++++----- hw/i386/pc.c | 9 --------- include/hw/i386/pc.h | 4 ---- 3 files changed, 7 insertions(+), 18 deletions(-)hw/i386/acpi-build.c +7
-5@@ -1902,6 +1902,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)X86MachineState *x86ms =X86_MACHINE (machine);const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids (machine);PCMachineState *pcms =PC_MACHINE (machine); +int nb_numa_nodes = machine->numa_state->num_nodes; +NodeInfo *numa_info = machine->numa_state->nodes;ram_addr_t hotplugabble_address_space_size =object_property_get_int (OBJECT (pcms),PC_MACHINE_DEVMEM_REGION_SIZE ,NULL );@@ -1945,9 +1947,9 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) next_base =0 ; numa_start = table_data->len; -for (i =1 ; i < pcms->numa_nodes +1 ; ++i) { +for (i =1 ; i < nb_numa_nodes +1 ; ++i) { mem_base = next_base; - mem_len = pcms->node_mem[i -1 ]; + mem_len = numa_info[i -1 ].node_mem; next_base = mem_base + mem_len;/* Cut out the 640K hole */ @@ -1995,7 +1997,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine) } slots = (table_data->len - numa_start) /sizeof *numamem; -for (; slots < pcms->numa_nodes +2 ; slots++) { +for (; slots < nb_numa_nodes +2 ; slots++) { numamem =acpi_data_push (table_data,sizeof *numamem);build_srat_memory (numamem,0 ,0 ,0 ,MEM_AFFINITY_NOFLAGS ); }@@ -2011,7 +2013,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)if (hotplugabble_address_space_size) { numamem =acpi_data_push (table_data,sizeof *numamem);build_srat_memory (numamem, machine->device_memory->base, - hotplugabble_address_space_size, pcms->numa_nodes -1 , + hotplugabble_address_space_size, nb_numa_nodes -1 ,MEM_AFFINITY_HOTPLUGGABLE |MEM_AFFINITY_ENABLED ); }@@ -2513,7 +2515,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) } }#endif -if (pcms->numa_nodes) { +if (machine->numa_state->num_nodes) {acpi_add_table (table_offsets, tables_blob);build_srat (tables_blob, tables->linker, machine);if (machine->numa_state->have_numa_distance) {hw/i386/pc.c +0
-9@@ -800,18 +800,9 @@ void pc_machine_done(Notifier *notifier, void *data)void pc_guest_info_init (PCMachineState *pcms) { -int i; -MachineState *ms =MACHINE (pcms);X86MachineState *x86ms =X86_MACHINE (pcms); x86ms->apic_xrupt_override = true; - pcms->numa_nodes = ms->numa_state->num_nodes; - pcms->node_mem =g_malloc0 (pcms->numa_nodes * -sizeof *pcms->node_mem); -for (i =0 ; i < ms->numa_state->num_nodes; i++) { - pcms->node_mem[i] = ms->numa_state->nodes[i].node_mem; - } - pcms->machine_done.notify = pc_machine_done;qemu_add_machine_init_done_notifier (&pcms->machine_done); }include/hw/i386/pc.h +0
-4@@ -47,10 +47,6 @@ typedef struct PCMachineState {bool default_bus_bypass_iommu;uint64_t max_fw_size; -/* NUMA information: */ -uint64_t numa_nodes; -uint64_t *node_mem; -/* ACPI Memory hotplug IO base address */ hwaddr memhp_io_base; } PCMachineState;
On 8/6/21 5:19 AM, Jingqi Liu wrote:
Maybe prepend with:
Since commits aa57020774b ("numa: move numa global variable nb_numa_nodes into MachineState") and 7e721e7b10e ("numa: move numa global variable numa_info into MachineState"), we can ...
Quoted 10 lines
We can get NUMA information completely from
MachineState::numa_state. RemovePCMachineState::numa_nodesandPCMachineState::node_mem, since they are just copied fromMachineState::numa_state.Signed-off-by Jingqi Liu <[email protected]>--- hw/i386/acpi-build.c | 12 +++++++----- hw/i386/pc.c | 9 --------- include/hw/i386/pc.h | 4 ---- 3 files changed, 7 insertions(+), 18 deletions(-)
Quoted 8 lines · Philippe Mathieu-Daudé
On 8/6/21 5:19 AM, Jingqi Liu wrote:
Maybe prepend with:
Since commits
aa57020774b("numa: move numa global variablenb_numa_nodesinto MachineState") and7e721e7b10e("numa: move numa global variablenuma_infointo MachineState"), we can ...
Seems this description is clearer.
I'll add it in next version.
Thanks,
Jingqi
Quoted 13 lines
Quoted 10 lines
We can get NUMA information completely from
MachineState::numa_state. RemovePCMachineState::numa_nodesandPCMachineState::node_mem, since they are just copied fromMachineState::numa_state.Signed-off-by Jingqi Liu <[email protected]>--- hw/i386/acpi-build.c | 12 +++++++----- hw/i386/pc.c | 9 --------- include/hw/i386/pc.h | 4 ---- 3 files changed, 7 insertions(+), 18 deletions(-)Reviewed-by Philippe Mathieu-Daudé <[email protected]>