* [Qemu-devel] [PATCH 01/12] x86: add x86_cpu_unrealizefn() for cpu apic remove
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 02/12] i386/cpu: add instance finalize callback Gu Zheng
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
From: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Implement x86_cpu_unrealizefn() for corresponding x86_cpu_realizefn(),
which is mostly used to clean the apic related allocation and vmstates
at here.
Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
Changelog since RFC:
-replaced apic_no with apic_id, so does the related stuff to make it
work with arbitrary CPU hotadd.
-add the icc_device_unrealize callback to handle apic unrealize.
hw/cpu/icc_bus.c | 11 +++++++++
hw/i386/kvm/apic.c | 8 ++++++
hw/intc/apic.c | 10 ++++++++
hw/intc/apic_common.c | 21 +++++++++++------
include/hw/cpu/icc_bus.h | 1 +
include/hw/i386/apic_internal.h | 1 +
target-i386/cpu.c | 46 +++++++++++++++++++++++++++++++++++++++
7 files changed, 90 insertions(+), 8 deletions(-)
diff --git a/hw/cpu/icc_bus.c b/hw/cpu/icc_bus.c
index f455a20..3e7f62f 100644
--- a/hw/cpu/icc_bus.c
+++ b/hw/cpu/icc_bus.c
@@ -44,11 +44,22 @@ static void icc_device_realize(DeviceState *dev, Error **errp)
}
+static void icc_device_unrealize(DeviceState *dev, Error **errp)
+{
+ ICCDeviceClass *idc = ICC_DEVICE_GET_CLASS(dev);
+
+ /* convert to QOM */
+ if (idc->unrealize) {
+ idc->unrealize(dev, errp);
+ }
+}
+
static void icc_device_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
dc->realize = icc_device_realize;
+ dc->unrealize = icc_device_unrealize;
dc->bus_type = TYPE_ICC_BUS;
}
diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c
index 271e97f..ac23504 100644
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
@@ -186,11 +186,19 @@ static void kvm_apic_realize(DeviceState *dev, Error **errp)
}
}
+static void kvm_apic_unrealize(DeviceState *dev, Error **errp)
+{
+ APICCommonState *s = APIC_COMMON(dev);
+
+ object_unparent(OBJECT(&s->io_memory));
+}
+
static void kvm_apic_class_init(ObjectClass *klass, void *data)
{
APICCommonClass *k = APIC_COMMON_CLASS(klass);
k->realize = kvm_apic_realize;
+ k->unrealize = kvm_apic_unrealize;
k->set_base = kvm_apic_set_base;
k->set_tpr = kvm_apic_set_tpr;
k->get_tpr = kvm_apic_get_tpr;
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index 0f97b47..2f3a7a3 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -889,11 +889,21 @@ static void apic_realize(DeviceState *dev, Error **errp)
msi_supported = true;
}
+static void apic_unrealize(DeviceState *dev, Error **errp)
+{
+ APICCommonState *s = APIC_COMMON(dev);
+
+ object_unparent(OBJECT(&s->io_memory));
+ timer_free(s->timer);
+ local_apics[s->idx] = NULL;
+}
+
static void apic_class_init(ObjectClass *klass, void *data)
{
APICCommonClass *k = APIC_COMMON_CLASS(klass);
k->realize = apic_realize;
+ k->unrealize = apic_unrealize;
k->set_base = apic_set_base;
k->set_tpr = apic_set_tpr;
k->get_tpr = apic_get_tpr;
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 62843dc..f189fe1 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -294,16 +294,8 @@ static void apic_common_realize(DeviceState *dev, Error **errp)
APICCommonState *s = APIC_COMMON(dev);
APICCommonClass *info;
static DeviceState *vapic;
- static int apic_no;
static bool mmio_registered;
- if (apic_no >= MAX_APICS) {
- error_setg(errp, "%s initialization failed.",
- object_get_typename(OBJECT(dev)));
- return;
- }
- s->idx = apic_no++;
-
info = APIC_COMMON_GET_CLASS(s);
info->realize(dev, errp);
if (!mmio_registered) {
@@ -324,6 +316,18 @@ static void apic_common_realize(DeviceState *dev, Error **errp)
}
+static void apic_common_unrealize(DeviceState *dev, Error **errp)
+{
+ APICCommonState *s = APIC_COMMON(dev);
+ APICCommonClass *info = APIC_COMMON_GET_CLASS(s);
+
+ info->unrealize(dev, errp);
+
+ if (apic_report_tpr_access && info->enable_tpr_reporting) {
+ info->enable_tpr_reporting(s, false);
+ }
+}
+
static int apic_pre_load(void *opaque)
{
APICCommonState *s = APIC_COMMON(opaque);
@@ -432,6 +436,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data)
dc->reset = apic_reset_common;
dc->props = apic_properties_common;
idc->realize = apic_common_realize;
+ idc->unrealize = apic_common_unrealize;
/*
* Reason: APIC and CPU need to be wired up by
* x86_cpu_apic_create()
diff --git a/include/hw/cpu/icc_bus.h b/include/hw/cpu/icc_bus.h
index 7e53afb..0b2ddd5 100644
--- a/include/hw/cpu/icc_bus.h
+++ b/include/hw/cpu/icc_bus.h
@@ -69,6 +69,7 @@ typedef struct ICCDeviceClass {
/*< public >*/
DeviceRealize realize;
+ DeviceUnrealize unrealize;
} ICCDeviceClass;
#define TYPE_ICC_DEVICE "icc-device"
diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h
index 61fddf6..7f5fe9d 100644
--- a/include/hw/i386/apic_internal.h
+++ b/include/hw/i386/apic_internal.h
@@ -82,6 +82,7 @@ typedef struct APICCommonClass
ICCDeviceClass parent_class;
DeviceRealize realize;
+ DeviceUnrealize unrealize;
void (*set_base)(APICCommonState *s, uint64_t val);
void (*set_tpr)(APICCommonState *s, uint8_t val);
uint8_t (*get_tpr)(APICCommonState *s);
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 019a36b..9618bc7 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2728,6 +2728,8 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp)
qdev_prop_set_uint8(cpu->apic_state, "id", apic_id);
/* TODO: convert to link<> */
apic = APIC_COMMON(cpu->apic_state);
+ g_assert(apic_id < MAX_APICS);
+ apic->idx = apic_id;
apic->cpu = cpu;
}
@@ -2749,10 +2751,32 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp)
return;
}
}
+
+static void x86_cpu_apic_unrealize(X86CPU *cpu, Error **errp)
+{
+ Error *local_err = NULL;
+
+ if (cpu->apic_state == NULL) {
+ return;
+ }
+
+ object_property_set_bool(OBJECT(cpu->apic_state),
+ false, "realized", &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ vmstate_unregister(NULL, &vmstate_apic_common, cpu->apic_state);
+ object_unparent(OBJECT(cpu->apic_state));
+}
#else
static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp)
{
}
+static void x86_cpu_apic_unrealize(X86CPU *cpu, Error **errp)
+{
+}
#endif
@@ -2835,6 +2859,27 @@ out:
}
}
+static void x86_cpu_unrealizefn(DeviceState *dev, Error **errp)
+{
+ X86CPU *cpu = X86_CPU(dev);
+ CPUClass *cc = CPU_GET_CLASS(dev);
+ Error *local_err = NULL;
+
+ if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {
+ vmstate_unregister(NULL, &vmstate_cpu_common, cpu);
+ }
+
+ if (cc->vmsd != NULL) {
+ vmstate_unregister(NULL, cc->vmsd, cpu);
+ }
+
+ x86_cpu_apic_unrealize(cpu, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
+}
+
/* Enables contiguous-apic-ID mode, for compatibility */
static bool compat_apic_id_mode;
@@ -2994,6 +3039,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
xcc->parent_realize = dc->realize;
dc->realize = x86_cpu_realizefn;
+ dc->unrealize = x86_cpu_unrealizefn;
dc->bus_type = TYPE_ICC_BUS;
dc->props = x86_cpu_properties;
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 02/12] i386/cpu: add instance finalize callback
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 01/12] x86: add x86_cpu_unrealizefn() for cpu apic remove Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 03/12] acpi/cpu: add cpu hot unplug request callback function Gu Zheng
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
include/qom/cpu.h | 1 +
target-i386/cpu.c | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 936afcd..f663199 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -305,6 +305,7 @@ struct CPUState {
QTAILQ_HEAD(CPUTailQ, CPUState);
extern struct CPUTailQ cpus;
#define CPU_NEXT(cpu) QTAILQ_NEXT(cpu, node)
+#define CPU_REMOVE(cpu) QTAILQ_REMOVE(&cpus, cpu, node)
#define CPU_FOREACH(cpu) QTAILQ_FOREACH(cpu, &cpus, node)
#define CPU_FOREACH_SAFE(cpu, next_cpu) \
QTAILQ_FOREACH_SAFE(cpu, &cpus, node, next_cpu)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 9618bc7..718670a 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2970,6 +2970,13 @@ static void x86_cpu_initfn(Object *obj)
}
}
+static void x86_cpu_finalizefn(Object *obj)
+{
+ CPUState *cs = CPU(obj);
+
+ CPU_REMOVE(cs);
+}
+
static int64_t x86_cpu_get_arch_id(CPUState *cs)
{
X86CPU *cpu = X86_CPU(cs);
@@ -3083,6 +3090,7 @@ static const TypeInfo x86_cpu_type_info = {
.parent = TYPE_CPU,
.instance_size = sizeof(X86CPU),
.instance_init = x86_cpu_initfn,
+ .instance_finalize = x86_cpu_finalizefn,
.abstract = true,
.class_size = sizeof(X86CPUClass),
.class_init = x86_cpu_common_class_init,
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 03/12] acpi/cpu: add cpu hot unplug request callback function
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 01/12] x86: add x86_cpu_unrealizefn() for cpu apic remove Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 02/12] i386/cpu: add instance finalize callback Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 04/12] acpi/piix4: add cpu hot unplug request callback support Gu Zheng
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
hw/acpi/cpu_hotplug.c | 38 +++++++++++++++++++++++++++++++++-----
include/hw/acpi/cpu_hotplug.h | 4 ++++
2 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index 4047294..f8a10d2 100644
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -12,6 +12,11 @@
#include "hw/hw.h"
#include "hw/acpi/cpu_hotplug.h"
+typedef enum STS_OPT {
+ SET,
+ CLEAR,
+} STS_OPT;
+
static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned int size)
{
AcpiCpuHotplug *cpus = opaque;
@@ -36,8 +41,8 @@ static const MemoryRegionOps AcpiCpuHotplug_ops = {
},
};
-static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu,
- Error **errp)
+static void acpi_update_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu,
+ STS_OPT opt, Error **errp)
{
CPUClass *k = CPU_GET_CLASS(cpu);
int64_t cpu_id;
@@ -48,13 +53,23 @@ static void acpi_set_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu,
return;
}
- g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));
+ switch (opt) {
+ case SET:
+ g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));
+ break;
+ case CLEAR:
+ g->sts[cpu_id / 8] &= ~(1 << (cpu_id % 8));
+ break;
+ default:
+ g_assert(0);
+ break;
+ }
}
void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
AcpiCpuHotplug *g, DeviceState *dev, Error **errp)
{
- acpi_set_cpu_present_bit(g, CPU(dev), errp);
+ acpi_update_cpu_present_bit(g, CPU(dev), SET, errp);
if (*errp != NULL) {
return;
}
@@ -66,13 +81,26 @@ void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
}
}
+void acpi_cpu_unplug_request_cb(ACPIREGS *ar, qemu_irq irq,
+ AcpiCpuHotplug *g, DeviceState *dev,
+ Error **errp)
+{
+ acpi_update_cpu_present_bit(g, CPU(dev), CLEAR, errp);
+ if (*errp != NULL) {
+ return;
+ }
+
+ ar->gpe.sts[0] |= ACPI_CPU_HOTPLUG_STATUS;
+ acpi_update_sci(ar, irq);
+}
+
void acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
AcpiCpuHotplug *gpe_cpu, uint16_t base)
{
CPUState *cpu;
CPU_FOREACH(cpu) {
- acpi_set_cpu_present_bit(gpe_cpu, cpu, &error_abort);
+ acpi_update_cpu_present_bit(gpe_cpu, cpu, SET, &error_abort);
}
memory_region_init_io(&gpe_cpu->io, owner, &AcpiCpuHotplug_ops,
gpe_cpu, "acpi-cpu-hotplug", ACPI_GPE_PROC_LEN);
diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h
index f6d358d..8b15a3d 100644
--- a/include/hw/acpi/cpu_hotplug.h
+++ b/include/hw/acpi/cpu_hotplug.h
@@ -23,6 +23,10 @@ typedef struct AcpiCpuHotplug {
void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
AcpiCpuHotplug *g, DeviceState *dev, Error **errp);
+void acpi_cpu_unplug_request_cb(ACPIREGS *ar, qemu_irq irq,
+ AcpiCpuHotplug *g, DeviceState *dev,
+ Error **errp);
+
void acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
AcpiCpuHotplug *gpe_cpu, uint16_t base);
#endif
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 04/12] acpi/piix4: add cpu hot unplug request callback support
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
` (2 preceding siblings ...)
2014-12-12 8:43 ` [Qemu-devel] [PATCH 03/12] acpi/cpu: add cpu hot unplug request callback function Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 05/12] acpi/ich9: " Gu Zheng
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
From: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
---
hw/acpi/piix4.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 4407388..9b75780 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -364,6 +364,8 @@ static void piix4_device_unplug_request_cb(HotplugHandler *hotplug_dev,
if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
acpi_pcihp_device_unplug_cb(&s->ar, s->irq, &s->acpi_pci_hotplug, dev,
errp);
+ } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+ acpi_cpu_unplug_request_cb(&s->ar, s->irq, &s->gpe_cpu, dev, errp);
} else {
error_setg(errp, "acpi: device unplug request for not supported device"
" type: %s", object_get_typename(OBJECT(dev)));
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 05/12] acpi/ich9: add cpu hot unplug request callback support
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
` (3 preceding siblings ...)
2014-12-12 8:43 ` [Qemu-devel] [PATCH 04/12] acpi/piix4: add cpu hot unplug request callback support Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 06/12] pc: " Gu Zheng
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
From: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
---
hw/acpi/ich9.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index c48d176..b795f8f 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -304,8 +304,13 @@ void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp)
void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
Error **errp)
{
- error_setg(errp, "acpi: device unplug request for not supported device"
- " type: %s", object_get_typename(OBJECT(dev)));
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+ acpi_cpu_unplug_request_cb(&pm->acpi_regs, pm->irq,
+ &pm->gpe_cpu, dev, errp);
+ } else {
+ error_setg(errp, "acpi: device unplug request for not supported device"
+ " type: %s", object_get_typename(OBJECT(dev)));
+ }
}
void ich9_pm_device_unplug_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 06/12] pc: add cpu hot unplug request callback support
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
` (4 preceding siblings ...)
2014-12-12 8:43 ` [Qemu-devel] [PATCH 05/12] acpi/ich9: " Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 07/12] acpi/cpu: add cpu hot unplug callback function Gu Zheng
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
From: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Add cpu hot unplug request callback support, and a pre-check about the
active cpus is added to avoid removing the last cpu.
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
---
hw/i386/pc.c | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ccf0ef8..ace7dc2 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1693,6 +1693,34 @@ out:
error_propagate(errp, local_err);
}
+static void pc_cpu_unplug_request(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ HotplugHandlerClass *hhc;
+ Error *local_err = NULL;
+ PCMachineState *pcms;
+
+ if (smp_cpus == 1) {
+ error_setg(&local_err,
+ "This is the last cpu, should not be removed!");
+ goto out;
+ }
+
+ pcms = PC_MACHINE(hotplug_dev);
+ if (!pcms->acpi_dev) {
+ if (dev->hotplugged) {
+ error_setg(&local_err,
+ "cpu hot unplug is not enabled: missing acpi device");
+ }
+ goto out;
+ }
+
+ hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
+ hhc->unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
+out:
+ error_propagate(errp, local_err);
+}
+
static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
@@ -1706,8 +1734,12 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
- error_setg(errp, "acpi: device unplug request for not supported device"
- " type: %s", object_get_typename(OBJECT(dev)));
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+ pc_cpu_unplug_request(hotplug_dev, dev, errp);
+ } else {
+ error_setg(errp, "acpi: device unplug request for not supported device"
+ " type: %s", object_get_typename(OBJECT(dev)));
+ }
}
static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 07/12] acpi/cpu: add cpu hot unplug callback function
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
` (5 preceding siblings ...)
2014-12-12 8:43 ` [Qemu-devel] [PATCH 06/12] pc: " Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 08/12] acpi/piix4: add cpu hot unplug callback support Gu Zheng
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
From: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
---
cpus.c | 7 +++++++
hw/acpi/cpu_hotplug.c | 8 ++++++++
include/hw/acpi/cpu_hotplug.h | 3 +++
include/qom/cpu.h | 9 +++++++++
4 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/cpus.c b/cpus.c
index 849d1bf..e3c8b88 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1196,6 +1196,13 @@ void resume_all_vcpus(void)
}
}
+void cpu_remove(CPUState *cpu)
+{
+ cpu->stop = true;
+ cpu->exit = true;
+ qemu_cpu_kick(cpu);
+}
+
/* For temporary buffers for forming a name */
#define VCPU_THREAD_NAME_SIZE 16
diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index f8a10d2..36feb6a 100644
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -94,6 +94,14 @@ void acpi_cpu_unplug_request_cb(ACPIREGS *ar, qemu_irq irq,
acpi_update_sci(ar, irq);
}
+void acpi_cpu_unplug_cb(ACPIREGS *ar, qemu_irq irq, AcpiCpuHotplug *g,
+ DeviceState *dev, Error **errp)
+{
+ CPUState *cpu = CPU(dev);
+
+ cpu_remove(cpu);
+}
+
void acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
AcpiCpuHotplug *gpe_cpu, uint16_t base)
{
diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h
index 8b15a3d..0f84adb 100644
--- a/include/hw/acpi/cpu_hotplug.h
+++ b/include/hw/acpi/cpu_hotplug.h
@@ -27,6 +27,9 @@ void acpi_cpu_unplug_request_cb(ACPIREGS *ar, qemu_irq irq,
AcpiCpuHotplug *g, DeviceState *dev,
Error **errp);
+void acpi_cpu_unplug_cb(ACPIREGS *ar, qemu_irq irq,
+ AcpiCpuHotplug *g, DeviceState *dev, Error **errp);
+
void acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
AcpiCpuHotplug *gpe_cpu, uint16_t base);
#endif
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index f663199..0592b4d 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -249,6 +249,7 @@ struct CPUState {
bool created;
bool stop;
bool stopped;
+ bool exit;
volatile sig_atomic_t exit_request;
uint32_t interrupt_request;
int singlestep_enabled;
@@ -613,6 +614,14 @@ void cpu_exit(CPUState *cpu);
void cpu_resume(CPUState *cpu);
/**
+ * cpu_remove:
+ * @cpu: The vCPU to remove.
+ *
+ * Requests the CPU @cpu to be removed.
+ */
+void cpu_remove(CPUState *cpu);
+
+/**
* qemu_init_vcpu:
* @cpu: The vCPU to initialize.
*
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 08/12] acpi/piix4: add cpu hot unplug callback support
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
` (6 preceding siblings ...)
2014-12-12 8:43 ` [Qemu-devel] [PATCH 07/12] acpi/cpu: add cpu hot unplug callback function Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 09/12] acpi/ich9: add cpu hot unplug support Gu Zheng
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
hw/acpi/piix4.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 9b75780..2a923fc 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -375,8 +375,14 @@ static void piix4_device_unplug_request_cb(HotplugHandler *hotplug_dev,
static void piix4_device_unplug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
- error_setg(errp, "acpi: device unplug for not supported device"
- " type: %s", object_get_typename(OBJECT(dev)));
+ PIIX4PMState *s = PIIX4_PM(hotplug_dev);
+
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+ acpi_cpu_unplug_cb(&s->ar, s->irq, &s->gpe_cpu, dev, errp);
+ } else {
+ error_setg(errp, "acpi: device unplug for not supported device"
+ " type: %s", object_get_typename(OBJECT(dev)));
+ }
}
static void piix4_update_bus_hotplug(PCIBus *pci_bus, void *opaque)
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 09/12] acpi/ich9: add cpu hot unplug support
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
` (7 preceding siblings ...)
2014-12-12 8:43 ` [Qemu-devel] [PATCH 08/12] acpi/piix4: add cpu hot unplug callback support Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 10/12] pc: add cpu hot unplug callback support Gu Zheng
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
hw/acpi/ich9.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index b795f8f..a892e5d 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -316,8 +316,12 @@ void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
void ich9_pm_device_unplug_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
Error **errp)
{
- error_setg(errp, "acpi: device unplug for not supported device"
- " type: %s", object_get_typename(OBJECT(dev)));
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+ acpi_cpu_unplug_cb(&pm->acpi_regs, pm->irq, &pm->gpe_cpu, dev, errp);
+ } else {
+ error_setg(errp, "acpi: device unplug for not supported device"
+ " type: %s", object_get_typename(OBJECT(dev)));
+ }
}
void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 10/12] pc: add cpu hot unplug callback support
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
` (8 preceding siblings ...)
2014-12-12 8:43 ` [Qemu-devel] [PATCH 09/12] acpi/ich9: add cpu hot unplug support Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 11/12] cpu hotplug: implement function cpu_status_write() for vcpu ejection Gu Zheng
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
hw/i386/pc.c | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ace7dc2..a8e34db 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1721,6 +1721,24 @@ out:
error_propagate(errp, local_err);
}
+static void pc_cpu_unplug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ HotplugHandlerClass *hhc;
+ Error *local_err = NULL;
+ PCMachineState *pcms = PC_MACHINE(hotplug_dev);
+
+ hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
+ hhc->unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ /* decrement the number of CPUs */
+ rtc_set_memory(pcms->rtc, 0x5f, rtc_get_memory(pcms->rtc, 0x5f) - 1);
+}
+
static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
@@ -1745,8 +1763,12 @@ static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
- error_setg(errp, "acpi: device unplug for not supported device"
- " type: %s", object_get_typename(OBJECT(dev)));
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+ pc_cpu_unplug(hotplug_dev, dev, errp);
+ } else {
+ error_setg(errp, "acpi: device unplug for not supported device"
+ " type: %s", object_get_typename(OBJECT(dev)));
+ }
}
static HotplugHandler *pc_get_hotpug_handler(MachineState *machine,
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 11/12] cpu hotplug: implement function cpu_status_write() for vcpu ejection
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
` (9 preceding siblings ...)
2014-12-12 8:43 ` [Qemu-devel] [PATCH 10/12] pc: add cpu hot unplug callback support Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-12 8:43 ` [Qemu-devel] [PATCH 12/12] cpus: reclaim allocated vCPU objects Gu Zheng
2014-12-19 5:00 ` [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
From: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
When OS ejected a vcpu (like: echo 1 > /sys/bus/acpi/devices/LNXCPUXX/eject),
it would call acpi EJ0 method, the firmware need to write the new cpumap, QEMU
would know which vcpu need to be ejected.
Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
hw/acpi/cpu_hotplug.c | 42 ++++++++++++++++++++++++++++++++++++-
hw/core/qdev.c | 2 +-
hw/i386/acpi-dsdt-cpu-hotplug.dsl | 6 ++++-
include/hw/acpi/cpu_hotplug.h | 1 +
include/hw/qdev-core.h | 1 +
5 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index 36feb6a..2a56df0 100644
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -17,6 +17,26 @@ typedef enum STS_OPT {
CLEAR,
} STS_OPT;
+static void acpi_eject_vcpu(AcpiCpuHotplug *cpus_status, int64_t cpu_id)
+{
+ CPUState *cpu;
+
+ CPU_FOREACH(cpu) {
+ CPUClass *cc = CPU_GET_CLASS(cpu);
+ int64_t id = cc->get_arch_id(cpu);
+ HotplugHandler *hotplug_ctrl;
+
+ if (cpu_id == id) {
+ cpus_status->old_sts[cpu_id / 8] &= ~(1 << (cpu_id % 8));
+ cpus_status->sts[cpu_id / 8] &= ~(1 << (cpu_id % 8));
+
+ hotplug_ctrl = qdev_get_hotplug_handler(DEVICE(cpu));
+ hotplug_handler_unplug(hotplug_ctrl, DEVICE(cpu), NULL);
+ break;
+ }
+ }
+}
+
static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned int size)
{
AcpiCpuHotplug *cpus = opaque;
@@ -28,7 +48,26 @@ static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned int size)
static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data,
unsigned int size)
{
- /* TODO: implement VCPU removal on guest signal that CPU can be removed */
+ AcpiCpuHotplug *cpus = opaque;
+ uint8_t val;
+ int i;
+ int64_t cpu_id = -1;
+
+ val = cpus->old_sts[addr] ^ data;
+
+ if (val == 0) {
+ return;
+ }
+
+ for (i = 0; i < 8; i++) {
+ if (val & 1 << i) {
+ cpu_id = 8 * addr + i;
+ }
+ }
+
+ if (cpu_id != -1) {
+ acpi_eject_vcpu(cpus, cpu_id);
+ }
}
static const MemoryRegionOps AcpiCpuHotplug_ops = {
@@ -56,6 +95,7 @@ static void acpi_update_cpu_present_bit(AcpiCpuHotplug *g, CPUState *cpu,
switch (opt) {
case SET:
g->sts[cpu_id / 8] |= (1 << (cpu_id % 8));
+ g->old_sts[cpu_id / 8] |= (1 << (cpu_id % 8));
break;
case CLEAR:
g->sts[cpu_id / 8] &= ~(1 << (cpu_id % 8));
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 901f289..9f08fe6 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -223,7 +223,7 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
dev->alias_required_for_version = required_for_version;
}
-static HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev)
+HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev)
{
HotplugHandler *hotplug_ctrl = NULL;
diff --git a/hw/i386/acpi-dsdt-cpu-hotplug.dsl b/hw/i386/acpi-dsdt-cpu-hotplug.dsl
index 34aab5a..9485f12 100644
--- a/hw/i386/acpi-dsdt-cpu-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-cpu-hotplug.dsl
@@ -50,7 +50,11 @@ Scope(\_SB) {
}
Method(CPEJ, 2, NotSerialized) {
// _EJ0 method - eject callback
- Sleep(200)
+ Store(Zero, Index(CPON, ToInteger(Arg0)))
+ Store(One, Local0)
+ ShiftLeft(Local0, Arg0, Local0)
+ Not(Local0, Local0)
+ And(PRS, Local0, PRS)
}
#define CPU_STATUS_LEN ACPI_GPE_PROC_LEN
diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h
index 0f84adb..abbb29e 100644
--- a/include/hw/acpi/cpu_hotplug.h
+++ b/include/hw/acpi/cpu_hotplug.h
@@ -18,6 +18,7 @@
typedef struct AcpiCpuHotplug {
MemoryRegion io;
uint8_t sts[ACPI_GPE_PROC_LEN];
+ uint8_t old_sts[ACPI_GPE_PROC_LEN];
} AcpiCpuHotplug;
void acpi_cpu_plug_cb(ACPIREGS *ar, qemu_irq irq,
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 589bbe7..5b28a4f 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -263,6 +263,7 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
void qdev_unplug(DeviceState *dev, Error **errp);
void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp);
+HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev);
void qdev_machine_creation_done(void);
bool qdev_machine_modified(void);
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Qemu-devel] [PATCH 12/12] cpus: reclaim allocated vCPU objects
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
` (10 preceding siblings ...)
2014-12-12 8:43 ` [Qemu-devel] [PATCH 11/12] cpu hotplug: implement function cpu_status_write() for vcpu ejection Gu Zheng
@ 2014-12-12 8:43 ` Gu Zheng
2014-12-19 5:00 ` [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-12 8:43 UTC (permalink / raw)
To: imammedo
Cc: zhugh.fnst, qemu-devel, tangchen, guz.fnst, isimatu.yasuaki,
chen.fan.fnst, anshul.makkar, afaerber
After ACPI get a signal to eject a vCPU, the vCPU must be
removed from CPU list，before the vCPU really removed, then
release the all related vCPU objects.
In order to deal well with the kvm vcpus (which can not be removed without any
protection), we do not close KVM vcpu fd, just record and mark it as stopped
into a list, so that we can reuse it for the appending cpu hot-add request if
possible. It is also the approach that kvm guys suggested:
https://www.mail-archive.com/kvm@vger.kernel.org/msg102839.html
Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
---
cpus.c | 37 ++++++++++++++++++++++++++++++++
include/sysemu/kvm.h | 1 +
kvm-all.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 94 insertions(+), 1 deletions(-)
diff --git a/cpus.c b/cpus.c
index e3c8b88..be3dfb6 100644
--- a/cpus.c
+++ b/cpus.c
@@ -865,6 +865,24 @@ void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data)
qemu_cpu_kick(cpu);
}
+static void qemu_kvm_destroy_vcpu(CPUState *cpu)
+{
+ CPU_REMOVE(cpu);
+
+ if (kvm_destroy_vcpu(cpu) < 0) {
+ error_report("kvm_destroy_vcpu failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ object_unparent(OBJECT(cpu));
+}
+
+static void qemu_tcg_destroy_vcpu(CPUState *cpu)
+{
+ CPU_REMOVE(cpu);
+ object_unparent(OBJECT(cpu));
+}
+
static void flush_queued_work(CPUState *cpu)
{
struct qemu_work_item *wi;
@@ -956,6 +974,11 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
}
}
qemu_kvm_wait_io_event(cpu);
+ if (cpu->exit && !cpu_can_run(cpu)) {
+ qemu_kvm_destroy_vcpu(cpu);
+ qemu_mutex_unlock(&qemu_global_mutex);
+ return NULL;
+ }
}
return NULL;
@@ -1008,6 +1031,7 @@ static void tcg_exec_all(void);
static void *qemu_tcg_cpu_thread_fn(void *arg)
{
CPUState *cpu = arg;
+ CPUState *remove_cpu = NULL;
qemu_tcg_init_cpu_signals();
qemu_thread_get_self(cpu->thread);
@@ -1040,6 +1064,16 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
}
}
qemu_tcg_wait_io_event();
+ CPU_FOREACH(cpu) {
+ if (cpu->exit && !cpu_can_run(cpu)) {
+ remove_cpu = cpu;
+ break;
+ }
+ }
+ if (remove_cpu) {
+ qemu_tcg_destroy_vcpu(remove_cpu);
+ remove_cpu = NULL;
+ }
}
return NULL;
@@ -1397,6 +1431,9 @@ static void tcg_exec_all(void)
break;
}
} else if (cpu->stop || cpu->stopped) {
+ if (cpu->exit) {
+ next_cpu = CPU_NEXT(cpu);
+ }
break;
}
}
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 22e42ef..a72ae40 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -177,6 +177,7 @@ int kvm_has_intx_set_mask(void);
int kvm_init_vcpu(CPUState *cpu);
int kvm_cpu_exec(CPUState *cpu);
+int kvm_destroy_vcpu(CPUState *cpu);
#ifdef NEED_CPU_H
diff --git a/kvm-all.c b/kvm-all.c
index 937bc9d..c33cc1a 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -71,6 +71,12 @@ typedef struct KVMSlot
typedef struct kvm_dirty_log KVMDirtyLog;
+struct KVMParkedVcpu {
+ unsigned long vcpu_id;
+ int kvm_fd;
+ QLIST_ENTRY(KVMParkedVcpu) node;
+};
+
struct KVMState
{
AccelState parent_obj;
@@ -107,6 +113,7 @@ struct KVMState
QTAILQ_HEAD(msi_hashtab, KVMMSIRoute) msi_hashtab[KVM_MSI_HASHTAB_SIZE];
bool direct_msi;
#endif
+ QLIST_HEAD(, KVMParkedVcpu) kvm_parked_vcpus;
};
#define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm")
@@ -246,6 +253,53 @@ static int kvm_set_user_memory_region(KVMState *s, KVMSlot *slot)
return kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION, &mem);
}
+int kvm_destroy_vcpu(CPUState *cpu)
+{
+ KVMState *s = kvm_state;
+ long mmap_size;
+ struct KVMParkedVcpu *vcpu = NULL;
+ int ret = 0;
+
+ DPRINTF("kvm_destroy_vcpu\n");
+
+ mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0);
+ if (mmap_size < 0) {
+ ret = mmap_size;
+ DPRINTF("KVM_GET_VCPU_MMAP_SIZE failed\n");
+ goto err;
+ }
+
+ ret = munmap(cpu->kvm_run, mmap_size);
+ if (ret < 0) {
+ goto err;
+ }
+
+ vcpu = g_malloc0(sizeof(*vcpu));
+ vcpu->vcpu_id = kvm_arch_vcpu_id(cpu);
+ vcpu->kvm_fd = cpu->kvm_fd;
+ QLIST_INSERT_HEAD(&kvm_state->kvm_parked_vcpus, vcpu, node);
+err:
+ return ret;
+}
+
+static int kvm_get_vcpu(KVMState *s, unsigned long vcpu_id)
+{
+ struct KVMParkedVcpu *cpu;
+
+ QLIST_FOREACH(cpu, &s->kvm_parked_vcpus, node) {
+ if (cpu->vcpu_id == vcpu_id) {
+ int kvm_fd;
+
+ QLIST_REMOVE(cpu, node);
+ kvm_fd = cpu->kvm_fd;
+ g_free(cpu);
+ return kvm_fd;
+ }
+ }
+
+ return kvm_vm_ioctl(s, KVM_CREATE_VCPU, (void *)vcpu_id);
+}
+
int kvm_init_vcpu(CPUState *cpu)
{
KVMState *s = kvm_state;
@@ -254,7 +308,7 @@ int kvm_init_vcpu(CPUState *cpu)
DPRINTF("kvm_init_vcpu\n");
- ret = kvm_vm_ioctl(s, KVM_CREATE_VCPU, (void *)kvm_arch_vcpu_id(cpu));
+ ret = kvm_get_vcpu(s, kvm_arch_vcpu_id(cpu));
if (ret < 0) {
DPRINTF("kvm_create_vcpu failed\n");
goto err;
@@ -1440,6 +1494,7 @@ static int kvm_init(MachineState *ms)
#ifdef KVM_CAP_SET_GUEST_DEBUG
QTAILQ_INIT(&s->kvm_sw_breakpoints);
#endif
+ QLIST_INIT(&s->kvm_parked_vcpus);
s->vmfd = -1;
s->fd = qemu_open("/dev/kvm", O_RDWR);
if (s->fd == -1) {
--
1.7.7
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support
2014-12-12 8:43 [Qemu-devel] [PATCH 00/12] cpu: add i386 cpu hot remove support Gu Zheng
` (11 preceding siblings ...)
2014-12-12 8:43 ` [Qemu-devel] [PATCH 12/12] cpus: reclaim allocated vCPU objects Gu Zheng
@ 2014-12-19 5:00 ` Gu Zheng
12 siblings, 0 replies; 14+ messages in thread
From: Gu Zheng @ 2014-12-19 5:00 UTC (permalink / raw)
To: qemu-devel
Cc: zhugh.fnst, tangchen, chen.fan.fnst, isimatu.yasuaki,
anshul.makkar, Gu Zheng, imammedo, afaerber
ping...
On 12/12/2014 04:43 PM, Gu Zheng wrote:
> This series is based on chen fan's previous i386 cpu hot remove patchset:
> https://lists.nongnu.org/archive/html/qemu-devel/2013-12/msg04266.html
>
> Via implementing ACPI standard methods _EJ0 in ACPI table, after Guest
> OS remove one vCPU online, the fireware will store removed bitmap to
> QEMU, then QEMU could know to notify the assigned vCPU of exiting.
> Meanwhile, intruduce the QOM command 'device_del' to remove vCPU from
> QEMU itself.
>
> The whole work is based on the new hot plug/unplug framework, ,the unplug request
> callback does the pre-check and send the request, unplug callback does the
> removal handling.
>
> This series depends on tangchen's common hot plug/unplug enhance patchset.
> [PATCH] Common unplug and unplug request cb for memory and CPU hot-unplug.
> https://lists.nongnu.org/archive/html/qemu-devel/2014-12/msg01462.html
>
> The is the second half of the previous series:
> [RFC V2 00/10] cpu: add device_add foo-x86_64-cpu and i386 cpu hot remove support
> https://lists.nongnu.org/archive/html/qemu-devel/2014-08/msg04779.html
>
> If you want to test the series, you need to apply the 'device_add foo-x86_64-cpu'
> patchset first:
> [PATCH V2 0/6] cpu: add device_add foo-x86_64-cpu support
> https://lists.nongnu.org/archive/html/qemu-devel/2014-12/msg01812.html
>
> ---
> Changelog since RFC:
> -splited the i386 cpu hot remove into single thread.
> -replaced apic_no with apic_id, so does the related stuff to make it
> work with arbitrary CPU hotadd.
> -add the icc_device_unrealize callback to handle apic unrealize.
> -rework on the new hot plug/unplug platform.
> ---
>
> Chen Fan (2):
> x86: add x86_cpu_unrealizefn() for cpu apic remove
> cpu hotplug: implement function cpu_status_write() for vcpu ejection
>
> Gu Zheng (6):
> i386/cpu: add instance finalize callback
> acpi/cpu: add cpu hot unplug request callback function
> acpi/piix4: add cpu hot unplug callback support
> acpi/ich9: add cpu hot unplug support
> pc: add cpu hot unplug callback support
> cpus: reclaim allocated vCPU objects
>
> Zhu Guihua (4):
> acpi/piix4: add cpu hot unplug request callback support
> acpi/ich9: add cpu hot unplug request callback support
> pc: add cpu hot unplug request callback support
> acpi/cpu: add cpu hot unplug callback function
>
> cpus.c | 44 ++++++++++++++++++
> hw/acpi/cpu_hotplug.c | 88 ++++++++++++++++++++++++++++++++++---
> hw/acpi/ich9.c | 17 +++++--
> hw/acpi/piix4.c | 12 ++++-
> hw/core/qdev.c | 2 +-
> hw/cpu/icc_bus.c | 11 +++++
> hw/i386/acpi-dsdt-cpu-hotplug.dsl | 6 ++-
> hw/i386/kvm/apic.c | 8 +++
> hw/i386/pc.c | 62 ++++++++++++++++++++++++--
> hw/intc/apic.c | 10 ++++
> hw/intc/apic_common.c | 21 +++++---
> include/hw/acpi/cpu_hotplug.h | 8 +++
> include/hw/cpu/icc_bus.h | 1 +
> include/hw/i386/apic_internal.h | 1 +
> include/hw/qdev-core.h | 1 +
> include/qom/cpu.h | 10 ++++
> include/sysemu/kvm.h | 1 +
> kvm-all.c | 57 +++++++++++++++++++++++-
> target-i386/cpu.c | 54 ++++++++++++++++++++++
> 19 files changed, 387 insertions(+), 27 deletions(-)
>
^ permalink raw reply [flat|nested] 14+ messages in thread