From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag42g-0007SC-HM for qemu-devel@nongnu.org; Wed, 16 Mar 2016 01:30:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag42e-000320-RB for qemu-devel@nongnu.org; Wed, 16 Mar 2016 01:30:46 -0400 Date: Wed, 16 Mar 2016 16:27:04 +1100 From: David Gibson Message-ID: <20160316052704.GF9032@voom> References: <1457672078-17307-1-git-send-email-bharata@linux.vnet.ibm.com> <1457672078-17307-10-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="QXAv++6zoyBcX2gv" Content-Disposition: inline In-Reply-To: <1457672078-17307-10-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [RFC PATCH v2 9/9] spapr: CPU hot unplug support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: mjrosato@linux.vnet.ibm.com, agraf@suse.de, thuth@redhat.com, pkrempa@redhat.com, ehabkost@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, armbru@redhat.com, borntraeger@de.ibm.com, qemu-ppc@nongnu.org, pbonzini@redhat.com, imammedo@redhat.com, afaerber@suse.de, mdroth@linux.vnet.ibm.com --QXAv++6zoyBcX2gv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 11, 2016 at 10:24:38AM +0530, Bharata B Rao wrote: > Remove the CPU core device by removing the underlying CPU thread devices. > Hot removal of CPU for sPAPR guests is achieved by sending the hot unplug > notification to the guest. Release the vCPU object after CPU hot unplug so > that vCPU fd can be parked and reused. >=20 > Signed-off-by: Bharata B Rao > --- > hw/ppc/spapr.c | 21 ++++++++++ > hw/ppc/spapr_cpu_core.c | 86 +++++++++++++++++++++++++++++++++++= ++++++ > include/hw/ppc/spapr.h | 1 + > include/hw/ppc/spapr_cpu_core.h | 12 ++++++ > 4 files changed, 120 insertions(+) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 822c87d..b1e9ba2 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2345,7 +2345,12 @@ static void spapr_machine_device_plug(HotplugHandl= er *hotplug_dev, > =20 > spapr_memory_plug(hotplug_dev, dev, node, errp); > } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) { > + /* > + * TODO: Move this check to pre_plug handler at which point > + * spapr_core_release() won't be necessary. > + */ > if (!smc->dr_cpu_enabled && dev->hotplugged) { > + spapr_core_release(dev); > error_setg(errp, "CPU hotplug not supported for this machine= "); > return; > } This hunk doesn't look like its related to unplug. Did it belong in another patch? > @@ -2353,11 +2358,27 @@ static void spapr_machine_device_plug(HotplugHand= ler *hotplug_dev, > } > } > =20 > +void spapr_cpu_destroy(PowerPCCPU *cpu) > +{ > + sPAPRMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); > + > + xics_cpu_destroy(spapr->icp, cpu); > + qemu_unregister_reset(spapr_cpu_reset, cpu); > +} > + > static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > + sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(qdev_get_machine(= )); > + > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > error_setg(errp, "Memory hot unplug not supported by sPAPR"); > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) { > + if (!smc->dr_cpu_enabled) { > + error_setg(errp, "CPU hot unplug not supported on this machi= ne"); > + return; > + } > + spapr_core_unplug(hotplug_dev, dev, errp); > } > } > =20 > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c > index db8de32..dd391bd 100644 > --- a/hw/ppc/spapr_cpu_core.c > +++ b/hw/ppc/spapr_cpu_core.c > @@ -84,6 +84,92 @@ void spapr_core_plug(HotplugHandler *hotplug_dev, Devi= ceState *dev, > } > } > =20 > +static void spapr_cpu_core_cleanup(struct sPAPRCPUUnplugList *unplug_lis= t) > +{ > + sPAPRCPUUnplug *unplug, *next; > + Object *cpu; > + > + QLIST_FOREACH_SAFE(unplug, unplug_list, node, next) { > + cpu =3D unplug->cpu; > + object_unparent(cpu); > + QLIST_REMOVE(unplug, node); > + g_free(unplug); > + } > +} > + > +static void spapr_add_cpu_to_unplug_list(Object *cpu, > + struct sPAPRCPUUnplugList *unpl= ug_list) > +{ > + sPAPRCPUUnplug *unplug =3D g_malloc(sizeof(*unplug)); > + > + unplug->cpu =3D cpu; > + QLIST_INSERT_HEAD(unplug_list, unplug, node); > +} > + > +static int spapr_cpu_release(Object *obj, void *opaque) > +{ > + DeviceState *dev =3D DEVICE(obj); > + CPUState *cs =3D CPU(dev); > + PowerPCCPU *cpu =3D POWERPC_CPU(cs); > + struct sPAPRCPUUnplugList *unplug_list =3D opaque; > + > + spapr_cpu_destroy(cpu); > + cpu_remove_sync(cs); > + > + /* > + * We are still walking the core object's children list, and > + * hence can't cleanup this CPU thread object just yet. Put > + * it on a list for later removal. > + */ > + spapr_add_cpu_to_unplug_list(obj, unplug_list); > + return 0; > +} > + > +void spapr_core_release(DeviceState *dev) > +{ > + struct sPAPRCPUUnplugList unplug_list; > + sPAPRMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); > + sPAPRCPUCore *core =3D SPAPR_CPU_CORE(OBJECT(dev)); > + int core_dt_id =3D object_property_get_int(OBJECT(dev), "core", NULL= ); > + int smt =3D kvmppc_smt_threads(); > + > + QLIST_INIT(&unplug_list); > + object_child_foreach(OBJECT(dev), spapr_cpu_release, &unplug_list); > + spapr_cpu_core_cleanup(&unplug_list); > + spapr->cores[core_dt_id / smt] =3D NULL; > + > + g_free(core->threads); > +} > + > +static void spapr_core_release_unparent(DeviceState *dev, void *opaque) > +{ > + spapr_core_release(dev); > + object_unparent(OBJECT(dev)); > +} > + > +void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, > + Error **errp) > +{ > + sPAPRCPUCore *core =3D SPAPR_CPU_CORE(OBJECT(dev)); > + PowerPCCPU *cpu =3D &core->threads[0]; > + int id =3D ppc_get_vcpu_dt_id(cpu); > + sPAPRDRConnector *drc =3D > + spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, id); > + sPAPRDRConnectorClass *drck; > + Error *local_err =3D NULL; > + > + g_assert(drc); > + > + drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); > + drck->detach(drc, dev, spapr_core_release_unparent, NULL, &local_err= ); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > + > + spapr_hotplug_req_remove_by_index(drc); > +} > + > static void spapr_cpu_core_create_threads(sPAPRCPUCore *core, int thread= s, > Error **errp) > { > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 8957072..41d0928 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -591,6 +591,7 @@ void spapr_cpu_init(sPAPRMachineState *spapr, PowerPC= CPU *cpu, Error **errp); > void spapr_cpu_reset(void *opaque); > void *spapr_populate_hotplug_cpu_dt(DeviceState *dev, CPUState *cs, > int *fdt_offset, sPAPRMachineState *= spapr); > +void spapr_cpu_destroy(PowerPCCPU *cpu); > =20 > /* rtas-configure-connector state */ > struct sPAPRConfigureConnectorState { > diff --git a/include/hw/ppc/spapr_cpu_core.h b/include/hw/ppc/spapr_cpu_c= ore.h > index 980d8ae..75c6c58 100644 > --- a/include/hw/ppc/spapr_cpu_core.h > +++ b/include/hw/ppc/spapr_cpu_core.h > @@ -27,4 +27,16 @@ typedef struct sPAPRCPUCore { > =20 > void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > Error **errp); > +void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, > + Error **errp); > +void spapr_core_release(DeviceState *dev); > + > +/* List to store unplugged CPU objects for cleanup during unplug */ > +typedef struct sPAPRCPUUnplug { > + Object *cpu; > + QLIST_ENTRY(sPAPRCPUUnplug) node; > +} sPAPRCPUUnplug; > + > +QLIST_HEAD(sPAPRCPUUnplugList, sPAPRCPUUnplug); > + > #endif --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --QXAv++6zoyBcX2gv Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJW6O6oAAoJEGw4ysog2bOSZyYQAKLN2DDvGxZStpAeLc6WwSmZ G3JtHLHGWiGvozpqT2OH/ATsR+ICcc4i1u+LRRC/2gjM78S3z4GvHcmZU8E1/j7F QlF6PFxfaPpiEpg7qeaIt0/ZATvf87IJafl3PP2p4w1HpbjnY/7/ObfdBtAcIggN cT9ffuy7nxyIuKsHZycuZ3abUpxBPgQ4/Wg/Uf0ag0xBFpyfYKI4R7+W3fjvFgtQ JPLz+cfATXoBfPaCNBWVrKmyzB8dImuP+euzgljJGZwpwIKa0dgO1p5IKWbtwoiO HY2nsAWGuBLsxzerpV+zpQ89W0lUtKqDRwB9wdkn0FjltD8aBRBtajIo1045imKD zJsry0WPj69SkyWjcTAzh1qSAgMGP23nurFb4LjZzBrZsZHh9QMyvaC8AnLdY1O0 DtDwPU1lRHoIJHoB8c3pwPbOQjn0iA2q5nqKiU8w46CpHldxvxkPEtp4iKLF8JYV hkeo+uACE/JOpFNNET0dCkafPEEn/jpnzlBk0BilKCP9z+Zx/i9fAWgBv0DjHwRI YdISLPyh5oiei9PfktTIN1Mxnq76nm5968VHOnVYQULh7K/GgP86tDWXH6zZcZ6z kcXZAPkfuc5NiyY6Pg2+dLA/uJ6+9B3JXyV+m9LGBsHhKDagcGUN4mwICPCVrNxm YmRCy0n5wZcVJsve8aQ0 =qkRv -----END PGP SIGNATURE----- --QXAv++6zoyBcX2gv--