mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-15 08:02:31 +00:00
2d0ec00aff
Initially enable vcpu hotplug in qemu for arm base on Salli's work[1]. Fixes:#3280 Signed-off-by: Huang Shijie <shijie8@gmail.com> [1] https://github.com/salil-mehta/qemu/tree/virt-cpuhp-armv8/rfc-v1
98 lines
3.7 KiB
Diff
98 lines
3.7 KiB
Diff
From 6a8a86ca3b4b66ab3489911bd0ad4da594531882 Mon Sep 17 00:00:00 2001
|
|
From: Salil Mehta <salil.mehta@huawei.com>
|
|
Date: Thu, 25 Nov 2021 18:15:46 +0800
|
|
Subject: [PATCH 15/28] arm/cpuhp: Update ACPI GED framework to support vcpu
|
|
hotplug
|
|
|
|
ACPI GED shall be used to convey to the guest kernel about any cpu hot-(un)plug
|
|
events. Therefore, existing ACPI GED framework inside QEMU needs to be enhanced
|
|
to support CPU hotplug state and events.
|
|
|
|
Co-developed-by: Keqian Zhu <zhukeqian1@huawei.com>
|
|
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
|
|
Signed-off-by: Huang Shijie <shijie8@gmail.com>
|
|
---
|
|
hw/acpi/generic_event_device.c | 42 +++++++++++++++++++++++++++++++++-
|
|
1 file changed, 41 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
|
|
index 7278b89c6a..815f4a91ce 100644
|
|
--- a/hw/acpi/generic_event_device.c
|
|
+++ b/hw/acpi/generic_event_device.c
|
|
@@ -238,13 +238,48 @@ static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,
|
|
nvdimm_acpi_plug_cb(hotplug_dev, dev);
|
|
} else {
|
|
acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp);
|
|
- }
|
|
+ }
|
|
+ } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
|
+ acpi_cpu_plug_cb(hotplug_dev, &s->cpuhp_state, dev, errp);
|
|
} else {
|
|
error_setg(errp, "virt: device plug request for unsupported device"
|
|
" type: %s", object_get_typename(OBJECT(dev)));
|
|
}
|
|
}
|
|
|
|
+static void acpi_ged_device_unplug_request_cb(HotplugHandler *hotplug_dev,
|
|
+ DeviceState *dev, Error **errp)
|
|
+{
|
|
+ AcpiGedState *s = ACPI_GED(hotplug_dev);
|
|
+
|
|
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
|
+ acpi_cpu_unplug_request_cb(hotplug_dev, &s->cpuhp_state, dev, errp);
|
|
+ } else {
|
|
+ error_setg(errp, "virt: device unplug request for the unsupported device"
|
|
+ " type: %s", object_get_typename(OBJECT(dev)));
|
|
+ }
|
|
+}
|
|
+
|
|
+static void acpi_ged_device_unplug_cb(HotplugHandler *hotplug_dev,
|
|
+ DeviceState *dev, Error **errp)
|
|
+{
|
|
+ AcpiGedState *s = ACPI_GED(hotplug_dev);
|
|
+
|
|
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
|
+ acpi_cpu_unplug_cb(&s->cpuhp_state, dev, errp);
|
|
+ } else {
|
|
+ error_setg(errp, "virt: device plug request for unsupported device"
|
|
+ " type: %s", object_get_typename(OBJECT(dev)));
|
|
+ }
|
|
+}
|
|
+
|
|
+static void acpi_ged_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
|
|
+{
|
|
+ AcpiGedState *s = ACPI_GED(adev);
|
|
+
|
|
+ acpi_cpu_ospm_status(&s->cpuhp_state, list);
|
|
+}
|
|
+
|
|
static void acpi_ged_unplug_request_cb(HotplugHandler *hotplug_dev,
|
|
DeviceState *dev, Error **errp)
|
|
{
|
|
@@ -284,6 +319,8 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
|
|
sel = ACPI_GED_PWR_DOWN_EVT;
|
|
} else if (ev & ACPI_NVDIMM_HOTPLUG_STATUS) {
|
|
sel = ACPI_GED_NVDIMM_HOTPLUG_EVT;
|
|
+ } else if (ev & ACPI_CPU_HOTPLUG_STATUS) {
|
|
+ sel = ACPI_GED_CPU_HOTPLUG_EVT;
|
|
} else {
|
|
/* Unknown event. Return without generating interrupt. */
|
|
warn_report("GED: Unsupported event %d. No irq injected", ev);
|
|
@@ -418,10 +455,13 @@ static void acpi_ged_class_init(ObjectClass *class, void *data)
|
|
dc->vmsd = &vmstate_acpi_ged;
|
|
|
|
hc->plug = acpi_ged_device_plug_cb;
|
|
+ hc->unplug_request = acpi_ged_device_unplug_request_cb;
|
|
+ hc->unplug = acpi_ged_device_unplug_cb;
|
|
hc->unplug_request = acpi_ged_unplug_request_cb;
|
|
hc->unplug = acpi_ged_unplug_cb;
|
|
|
|
adevc->send_event = acpi_ged_send_event;
|
|
+ adevc->ospm_status = acpi_ged_ospm_status;
|
|
}
|
|
|
|
static const TypeInfo acpi_ged_info = {
|
|
--
|
|
2.30.2
|
|
|