ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/acpi: propagate vcpu hotplug after switch to modern interface 

If a vcpu with an apic-id that is not supported by the legacy
interface (>255) is hot-plugged, the legacy code will dynamically switch
to the modern interface. However, the hotplug event is not forwarded to
the new interface resulting in the vcpu not being fully/properly added
to the machine config. This BUG is evidenced by OVMF when it
it attempts to count the vcpus and reports an inconsistent vcpu count
reported by the fw_cfg interface and the modern hotpug interface.

Fix is to propagate the hotplug event after making the switch from
the legacy interface to the modern interface.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Aaron Young <aaron.young@oracle.com>
Message-Id: <0e8a9baebbb29f2a6c87fd08e43dc2ac4019759a.1702398644.git.Aaron.Young@oracle.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Aaron Young 2023-12-12 08:51:43 -08:00 committed by Michael S. Tsirkin
parent 51396556f0
commit 45e48809d3
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/acpi/cpu_hotplug.c
View File

@ -59,7 +59,8 @@ static const MemoryRegionOps AcpiCpuHotplug_ops = {
}, },
}; };
static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu) static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu,
bool *swtchd_to_modern)
{ {
CPUClass *k = CPU_GET_CLASS(cpu); CPUClass *k = CPU_GET_CLASS(cpu);
int64_t cpu_id; int64_t cpu_id;
@ -68,23 +69,34 @@ static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu)
if ((cpu_id / 8) >= ACPI_GPE_PROC_LEN) { if ((cpu_id / 8) >= ACPI_GPE_PROC_LEN) {
object_property_set_bool(g->device, "cpu-hotplug-legacy", false, object_property_set_bool(g->device, "cpu-hotplug-legacy", false,
&error_abort); &error_abort);
*swtchd_to_modern = true;
return; return;
} }
*swtchd_to_modern = false;
g->sts[cpu_id / 8] |= (1 << (cpu_id % 8)); g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));
} }
void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev, void legacy_acpi_cpu_plug_cb(HotplugHandler *hotplug_dev,
AcpiCpuHotplug *g, DeviceState *dev, Error **errp) AcpiCpuHotplug *g, DeviceState *dev, Error **errp)
{ {
acpi_set_cpu_present_bit(g, CPU(dev)); bool swtchd_to_modern;
acpi_send_event(DEVICE(hotplug_dev), ACPI_CPU_HOTPLUG_STATUS); Error *local_err = NULL;
acpi_set_cpu_present_bit(g, CPU(dev), &swtchd_to_modern);
if (swtchd_to_modern) {
/* propagate the hotplug to the modern interface */
hotplug_handler_plug(hotplug_dev, dev, &local_err);
} else {
acpi_send_event(DEVICE(hotplug_dev), ACPI_CPU_HOTPLUG_STATUS);
}
} }
void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
AcpiCpuHotplug *gpe_cpu, uint16_t base) AcpiCpuHotplug *gpe_cpu, uint16_t base)
{ {
CPUState *cpu; CPUState *cpu;
bool swtchd_to_modern;
memory_region_init_io(&gpe_cpu->io, owner, &AcpiCpuHotplug_ops, memory_region_init_io(&gpe_cpu->io, owner, &AcpiCpuHotplug_ops,
gpe_cpu, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN); gpe_cpu, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN);
@ -92,7 +104,7 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
gpe_cpu->device = owner; gpe_cpu->device = owner;
CPU_FOREACH(cpu) { CPU_FOREACH(cpu) {
acpi_set_cpu_present_bit(gpe_cpu, cpu); acpi_set_cpu_present_bit(gpe_cpu, cpu, &swtchd_to_modern);
} }
} }