spapr_cpu_core: instantiate CPUs separately
The current code assumes that only the CPU core object holds a reference on each individual CPU object, and happily frees their allocated memory when the core is unrealized. This is dangerous as some other code can legitimely keep a pointer to a CPU if it calls object_ref(), but it would end up with a dangling pointer. Let's allocate all CPUs with object_new() and let QOM free them when their reference count reaches zero. This greatly simplify the code as we don't have to fiddle with the instance size anymore. Signed-off-by: Greg Kurz <groug@kaod.org> Acked-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
2b6154120c
commit
94ad93bd97
@ -3180,12 +3180,10 @@ void spapr_core_release(DeviceState *dev)
|
|||||||
|
|
||||||
if (smc->pre_2_10_has_unused_icps) {
|
if (smc->pre_2_10_has_unused_icps) {
|
||||||
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
|
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
|
||||||
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(cc));
|
|
||||||
size_t size = object_type_get_instance_size(scc->cpu_type);
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < cc->nr_threads; i++) {
|
for (i = 0; i < cc->nr_threads; i++) {
|
||||||
CPUState *cs = CPU(sc->threads + i * size);
|
CPUState *cs = CPU(sc->threads[i]);
|
||||||
|
|
||||||
pre_2_10_vmstate_register_dummy_icp(cs->cpu_index);
|
pre_2_10_vmstate_register_dummy_icp(cs->cpu_index);
|
||||||
}
|
}
|
||||||
@ -3231,7 +3229,7 @@ static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|||||||
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
|
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
|
||||||
sPAPRCPUCore *core = SPAPR_CPU_CORE(OBJECT(dev));
|
sPAPRCPUCore *core = SPAPR_CPU_CORE(OBJECT(dev));
|
||||||
CPUCore *cc = CPU_CORE(dev);
|
CPUCore *cc = CPU_CORE(dev);
|
||||||
CPUState *cs = CPU(core->threads);
|
CPUState *cs = CPU(core->threads[0]);
|
||||||
sPAPRDRConnector *drc;
|
sPAPRDRConnector *drc;
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
int smt = kvmppc_smt_threads();
|
int smt = kvmppc_smt_threads();
|
||||||
@ -3276,15 +3274,12 @@ static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|||||||
core_slot->cpu = OBJECT(dev);
|
core_slot->cpu = OBJECT(dev);
|
||||||
|
|
||||||
if (smc->pre_2_10_has_unused_icps) {
|
if (smc->pre_2_10_has_unused_icps) {
|
||||||
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(cc));
|
|
||||||
size_t size = object_type_get_instance_size(scc->cpu_type);
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < cc->nr_threads; i++) {
|
for (i = 0; i < cc->nr_threads; i++) {
|
||||||
sPAPRCPUCore *sc = SPAPR_CPU_CORE(dev);
|
sPAPRCPUCore *sc = SPAPR_CPU_CORE(dev);
|
||||||
void *obj = sc->threads + i * size;
|
|
||||||
|
|
||||||
cs = CPU(obj);
|
cs = CPU(sc->threads[i]);
|
||||||
pre_2_10_vmstate_unregister_dummy_icp(cs->cpu_index);
|
pre_2_10_vmstate_unregister_dummy_icp(cs->cpu_index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -79,13 +79,11 @@ const char *spapr_get_cpu_core_type(const char *cpu_type)
|
|||||||
static void spapr_cpu_core_unrealizefn(DeviceState *dev, Error **errp)
|
static void spapr_cpu_core_unrealizefn(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
|
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
|
||||||
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));
|
|
||||||
size_t size = object_type_get_instance_size(scc->cpu_type);
|
|
||||||
CPUCore *cc = CPU_CORE(dev);
|
CPUCore *cc = CPU_CORE(dev);
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < cc->nr_threads; i++) {
|
for (i = 0; i < cc->nr_threads; i++) {
|
||||||
void *obj = sc->threads + i * size;
|
Object *obj = OBJECT(sc->threads[i]);
|
||||||
DeviceState *dev = DEVICE(obj);
|
DeviceState *dev = DEVICE(obj);
|
||||||
CPUState *cs = CPU(dev);
|
CPUState *cs = CPU(dev);
|
||||||
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
||||||
@ -146,9 +144,8 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
|
|||||||
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
|
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
|
||||||
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));
|
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));
|
||||||
CPUCore *cc = CPU_CORE(OBJECT(dev));
|
CPUCore *cc = CPU_CORE(OBJECT(dev));
|
||||||
size_t size;
|
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
void *obj;
|
Object *obj;
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
if (!spapr) {
|
if (!spapr) {
|
||||||
@ -156,18 +153,16 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
size = object_type_get_instance_size(scc->cpu_type);
|
sc->threads = g_new(PowerPCCPU *, cc->nr_threads);
|
||||||
sc->threads = g_malloc0(size * cc->nr_threads);
|
|
||||||
for (i = 0; i < cc->nr_threads; i++) {
|
for (i = 0; i < cc->nr_threads; i++) {
|
||||||
char id[32];
|
char id[32];
|
||||||
CPUState *cs;
|
CPUState *cs;
|
||||||
PowerPCCPU *cpu;
|
PowerPCCPU *cpu;
|
||||||
|
|
||||||
obj = sc->threads + i * size;
|
obj = object_new(scc->cpu_type);
|
||||||
|
|
||||||
object_initialize(obj, size, scc->cpu_type);
|
|
||||||
cs = CPU(obj);
|
cs = CPU(obj);
|
||||||
cpu = POWERPC_CPU(cs);
|
cpu = sc->threads[i] = POWERPC_CPU(obj);
|
||||||
cs->cpu_index = cc->core_id + i;
|
cs->cpu_index = cc->core_id + i;
|
||||||
cpu->vcpu_id = (cc->core_id * spapr->vsmt / smp_threads) + i;
|
cpu->vcpu_id = (cc->core_id * spapr->vsmt / smp_threads) + i;
|
||||||
if (kvm_enabled() && !kvm_vcpu_id_is_valid(cpu->vcpu_id)) {
|
if (kvm_enabled() && !kvm_vcpu_id_is_valid(cpu->vcpu_id)) {
|
||||||
@ -192,7 +187,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (j = 0; j < cc->nr_threads; j++) {
|
for (j = 0; j < cc->nr_threads; j++) {
|
||||||
obj = sc->threads + j * size;
|
obj = OBJECT(sc->threads[j]);
|
||||||
|
|
||||||
spapr_cpu_core_realize_child(obj, spapr, &local_err);
|
spapr_cpu_core_realize_child(obj, spapr, &local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
@ -203,7 +198,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
|
|||||||
|
|
||||||
err:
|
err:
|
||||||
while (--i >= 0) {
|
while (--i >= 0) {
|
||||||
obj = sc->threads + i * size;
|
obj = OBJECT(sc->threads[i]);
|
||||||
object_unparent(obj);
|
object_unparent(obj);
|
||||||
}
|
}
|
||||||
g_free(sc->threads);
|
g_free(sc->threads);
|
||||||
|
@ -28,7 +28,7 @@ typedef struct sPAPRCPUCore {
|
|||||||
CPUCore parent_obj;
|
CPUCore parent_obj;
|
||||||
|
|
||||||
/*< public >*/
|
/*< public >*/
|
||||||
void *threads;
|
PowerPCCPU **threads;
|
||||||
int node_id;
|
int node_id;
|
||||||
} sPAPRCPUCore;
|
} sPAPRCPUCore;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user