[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 05/10] pc: acpi: SRAT: create only valid processo
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v4 05/10] pc: acpi: SRAT: create only valid processor lapic entries |
Date: |
Fri, 26 Feb 2016 14:59:23 +0100 |
When APIC IDs are sparse*, in addition to valid LAPIC
entries the SRAT is also filled invalid ones for non
possible APIC IDs.
Fix it by asking machine for all possible APIC IDs
instead of wrongly assuming that all APIC IDs in
range 0..apic_id_limit are possible.
* sparse lapic topology CLI:
-smp x,sockets=2,cores=3,maxcpus=6
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
---
hw/i386/acpi-build.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index c750435..54d2f92 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2376,6 +2376,8 @@ build_srat(GArray *table_data, GArray *linker,
MachineState *machine)
uint64_t curnode;
int srat_start, numa_start, slots;
uint64_t mem_len, mem_base, next_base;
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
+ CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine);
PCMachineState *pcms = PC_MACHINE(machine);
ram_addr_t hotplugabble_address_space_size =
object_property_get_int(OBJECT(pcms), PC_MACHINE_MEMHP_REGION_SIZE,
@@ -2387,12 +2389,14 @@ build_srat(GArray *table_data, GArray *linker,
MachineState *machine)
srat->reserved1 = cpu_to_le32(1);
core = (void *)(srat + 1);
- for (i = 0; i < pcms->apic_id_limit; ++i) {
+ for (i = 0; i < apic_ids->len; i++) {
+ int apic_id = apic_ids->cpus[i].arch_id;
+
core = acpi_data_push(table_data, sizeof *core);
core->type = ACPI_SRAT_PROCESSOR;
core->length = sizeof(*core);
- core->local_apic_id = i;
- curnode = pcms->node_cpu[i];
+ core->local_apic_id = apic_id;
+ curnode = pcms->node_cpu[apic_id];
core->proximity_lo = curnode;
memset(core->proximity_hi, 0, 3);
core->local_sapic_eid = 0;
@@ -2457,6 +2461,7 @@ build_srat(GArray *table_data, GArray *linker,
MachineState *machine)
(void *)(table_data->data + srat_start),
"SRAT",
table_data->len - srat_start, 1, NULL, NULL);
+ g_free(apic_ids);
}
static void
--
1.8.3.1
- [Qemu-devel] [PATCH v4 00/10] pc: do not create invalid MADT.LAPIC/Processor entries, Igor Mammedov, 2016/02/26
- [Qemu-devel] [PATCH v4 01/10] tests: pc: acpi: piix4: add sparse CPU hotplug case, Igor Mammedov, 2016/02/26
- [Qemu-devel] [PATCH v4 03/10] machine: introduce MachineClass.possible_cpu_arch_ids() hook, Igor Mammedov, 2016/02/26
- [Qemu-devel] [PATCH v4 02/10] pc: init pcms->apic_id_limit once and use it throughout pc.c, Igor Mammedov, 2016/02/26
- [Qemu-devel] [PATCH v4 05/10] pc: acpi: SRAT: create only valid processor lapic entries,
Igor Mammedov <=
- [Qemu-devel] [PATCH v4 04/10] pc: acpi: cleanup qdev_get_machine() calls, Igor Mammedov, 2016/02/26
- [Qemu-devel] [PATCH v4 06/10] pc: acpi: create MADT.lapic entries only for valid lapics, Igor Mammedov, 2016/02/26
- [Qemu-devel] [PATCH v4 09/10] pc: acpi: clarify why possible LAPIC entries must be present in MADT, Igor Mammedov, 2016/02/26
- [Qemu-devel] [PATCH v4 10/10] tests: update ACPI tables blobs for cpuhp_sparse case, Igor Mammedov, 2016/02/26
- [Qemu-devel] [PATCH v4 08/10] pc: acpi: drop cpu->found_cpus bitmap, Igor Mammedov, 2016/02/26
- [Qemu-devel] [PATCH v4 07/10] pc: acpi: create Processor and Notify objects only for valid lapics, Igor Mammedov, 2016/02/26