From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1kU0-0004MN-Be for qemu-devel@nongnu.org; Mon, 09 Oct 2017 22:41:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1kTx-0004U4-8i for qemu-devel@nongnu.org; Mon, 09 Oct 2017 22:41:24 -0400 Received: from ozlabs.org ([103.22.144.67]:46857) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1kTw-0004Pw-H6 for qemu-devel@nongnu.org; Mon, 09 Oct 2017 22:41:21 -0400 Date: Tue, 10 Oct 2017 12:41:31 +1100 From: David Gibson Message-ID: <20171010014131.GB2668@umbus.fritz.box> References: <20171009170607.4155-1-mdroth@linux.vnet.ibm.com> <20171009170607.4155-2-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="RASg3xLB4tUQ4RcS" Content-Disposition: inline In-Reply-To: <20171009170607.4155-2-mdroth@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH v2 1/3] qdev: store DeviceState's canonical path to use when unparenting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: qemu-devel@nongnu.org, groug@kaod.org, peter.maydell@linaro.org, armbru@redhat.com, alex.williamson@redhat.com, pbonzini@redhat.com, imammedo@redhat.com, ehabkost@redhat.com, "Michael S . Tsirkin" --RASg3xLB4tUQ4RcS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 09, 2017 at 12:06:05PM -0500, Michael Roth wrote: > device_unparent(dev, ...) is called when a device is unparented, > either directly, or as a result of a parent device being > finalized, and handles some final cleanup for the device. Part > of this includes emiting a DEVICE_DELETED QMP event to notify > management, which includes the device's path in the composition > tree as provided by object_get_canonical_path(). >=20 > object_get_canonical_path() assumes the device is still connected > to the machine/root container, and will assert otherwise, but > in some situations this isn't the case: >=20 > If the parent is finalized as a result of object_unparent(), it > will still be attached to the composition tree at the time any > children are unparented as a result of that same call to > object_unparent(). However, in some cases, object_unparent() > will complete without finalizing the parent device, due to > lingering references that won't be released till some time later. > One such example is if the parent has MemoryRegion children (which > take a ref on their parent), who in turn have AddressSpace's (which > take a ref on their regions), since those AddressSpaces get cleaned > up asynchronously by the RCU thread. >=20 > In this case qdev:device_unparent() may be called for a child Device > that no longer has a path to the root/machine container, causing > object_get_canonical_path() to assert. >=20 > Fix this by storing the canonical path during realize() so the > information will still be available for device_unparent() in such > cases. >=20 > Cc: Michael S. Tsirkin > Cc: Paolo Bonzini > Signed-off-by: Michael Roth > Signed-off-by: Greg Kurz > Signed-off-by: Michael Roth > Tested-by: Eric Auger Reviewed-by: David Gibson With the exception of the trivial comment error that's already been mentioned. > --- > hw/core/qdev.c | 16 +++++++++++++--- > include/hw/qdev-core.h | 1 + > 2 files changed, 14 insertions(+), 3 deletions(-) >=20 > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 606ab53c42..0542e1879f 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -928,6 +928,13 @@ static void device_set_realized(Object *obj, bool va= lue, Error **errp) > goto post_realize_fail; > } > =20 > + /* > + * always free/re-initialize here since the value cannot be clea= ned up > + * in device_unrealize due to it's usage later on in the unplug = path > + */ > + g_free(dev->canonical_path); > + dev->canonical_path =3D object_get_canonical_path(OBJECT(dev)); > + > if (qdev_get_vmsd(dev)) { > if (vmstate_register_with_alias_id(dev, -1, qdev_get_vmsd(de= v), dev, > dev->instance_id_alias, > @@ -984,6 +991,7 @@ child_realize_fail: > } > =20 > post_realize_fail: > + g_free(dev->canonical_path); > if (dc->unrealize) { > dc->unrealize(dev, NULL); > } > @@ -1102,10 +1110,12 @@ static void device_unparent(Object *obj) > =20 > /* Only send event if the device had been completely realized */ > if (dev->pending_deleted_event) { > - gchar *path =3D object_get_canonical_path(OBJECT(dev)); > + g_assert(dev->canonical_path); > =20 > - qapi_event_send_device_deleted(!!dev->id, dev->id, path, &error_= abort); > - g_free(path); > + qapi_event_send_device_deleted(!!dev->id, dev->id, dev->canonica= l_path, > + &error_abort); > + g_free(dev->canonical_path); > + dev->canonical_path =3D NULL; > } > =20 > qemu_opts_del(dev->opts); > diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h > index 089146197f..0a71bf83f0 100644 > --- a/include/hw/qdev-core.h > +++ b/include/hw/qdev-core.h > @@ -153,6 +153,7 @@ struct DeviceState { > /*< public >*/ > =20 > const char *id; > + char *canonical_path; > bool realized; > bool pending_deleted_event; > QemuOpts *opts; --=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 --RASg3xLB4tUQ4RcS Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlncJUsACgkQbDjKyiDZ s5LQGhAAkF1EDbfVcSXPRHMrhAmaxeD6ku5S4ZRzQOlWFa2kICFwkZT9dsFhTtZX SrSzzA5pQNfWle0fLnQgQVy75nuOkQEnH0meB4mV4II7Tpb3cxJ9CI45GykKi3sa UYpPp4QEvdqvd+xZSkZMY34qmEQmbsfWfLMvSjks1YphOdxMcGwgx1zxzuTf0w3X F5dp25AI1a33j2NXni48DWNe2Uh1K0UvKdSUC48eM3OfdySF2HO4ClykmiWy98H1 FJaZNA+ce7RQKBB9iairGRV8PmOUDm5mu97PPedgDCJe0U5zeJxtage3CXpOuX/8 UePjfJPegCHE5AbDX4jNRXahabAPyA60ZemJah8O+iHPbYRyGrzi2v2BSaZe747d dBX2PVfuerTRCKHYr///WD7UkdIfe70NkZBI8npyZE2HIcrznPRsN1DZk4zDNfgT NIg0/RlDNbhbFwYTt6Y95sp/9PICoSctnkfJ3SOLOkbUqMXVViV5WfOehAlR2Q8l IGb41QgWH1u/ktMApiYukKLbtwFABTbQuBraVzR/JAIQJfhhLtOxcDccSiXURksR 5LsE7RHxVa4ztAwWa1S9pNojBNOmOn8r3anrMCLTkLhxmtto1GdUZiqqBOioUmJT FpDsWneDdASXuwm8A3/F4xTnFzKT3MZpvYcInz8TFUVWMLwxzfc= =NGIu -----END PGP SIGNATURE----- --RASg3xLB4tUQ4RcS--