haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hw/i386/acpi-build: Get NUMA information from struct NumaState

Browse source 
Since commits aa57020774 ("numa: move numa global variable
nb_numa_nodes into MachineState") and 7e721e7b10 ("numa: move
numa global variable numa_info into MachineState"), 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.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Jingqi Liu <jingqi.liu@intel.com>
Message-Id: <20210823011254.28506-1-jingqi.liu@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jingqi Liu 2021-08-23 09:12:54 +08:00 committed by Michael S. Tsirkin
parent ae4003738f
commit e77af21a7a
3 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
hw/i386/acpi-build.c
View file

@ -1914,6 +1914,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
X86MachineState *x86ms = X86_MACHINE(machine); X86MachineState *x86ms = X86_MACHINE(machine);
const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine); const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine);
PCMachineState *pcms = PC_MACHINE(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 = ram_addr_t hotplugabble_address_space_size =
object_property_get_int(OBJECT(pcms), PC_MACHINE_DEVMEM_REGION_SIZE, object_property_get_int(OBJECT(pcms), PC_MACHINE_DEVMEM_REGION_SIZE,
NULL); NULL);
@ -1957,9 +1959,9 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
next_base = 0; next_base = 0;
numa_start = table_data->len; 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_base = next_base;
mem_len = pcms->node_mem[i - 1]; mem_len = numa_info[i - 1].node_mem;
next_base = mem_base + mem_len; next_base = mem_base + mem_len;
/* Cut out the 640K hole */ /* Cut out the 640K hole */
@ -2007,7 +2009,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
} }
slots = (table_data->len - numa_start) / sizeof *numamem; 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); numamem = acpi_data_push(table_data, sizeof *numamem);
build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS); build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
} }
@ -2023,7 +2025,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
if (hotplugabble_address_space_size) { if (hotplugabble_address_space_size) {
numamem = acpi_data_push(table_data, sizeof *numamem); numamem = acpi_data_push(table_data, sizeof *numamem);
build_srat_memory(numamem, machine->device_memory->base, 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); MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
} }
@ -2525,7 +2527,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
} }
} }
#endif #endif
if (pcms->numa_nodes) { if (machine->numa_state->num_nodes) {
acpi_add_table(table_offsets, tables_blob); acpi_add_table(table_offsets, tables_blob);
build_srat(tables_blob, tables->linker, machine); build_srat(tables_blob, tables->linker, machine);
if (machine->numa_state->have_numa_distance) { if (machine->numa_state->have_numa_distance) {

9
hw/i386/pc.c
View file

@ -802,18 +802,9 @@ void pc_machine_done(Notifier *notifier, void *data)
void pc_guest_info_init(PCMachineState *pcms) void pc_guest_info_init(PCMachineState *pcms)
{ {
int i;
MachineState *ms = MACHINE(pcms);
X86MachineState *x86ms = X86_MACHINE(pcms); X86MachineState *x86ms = X86_MACHINE(pcms);
x86ms->apic_xrupt_override = true; 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; pcms->machine_done.notify = pc_machine_done;
qemu_add_machine_init_done_notifier(&pcms->machine_done); qemu_add_machine_init_done_notifier(&pcms->machine_done);
} }

4
include/hw/i386/pc.h
View file

@ -47,10 +47,6 @@ typedef struct PCMachineState {
bool default_bus_bypass_iommu; bool default_bus_bypass_iommu;
uint64_t max_fw_size; uint64_t max_fw_size;
/* NUMA information: */
uint64_t numa_nodes;
uint64_t *node_mem;
/* ACPI Memory hotplug IO base address */ /* ACPI Memory hotplug IO base address */
hwaddr memhp_io_base; hwaddr memhp_io_base;
} PCMachineState; } PCMachineState;