From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:43239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvYLM-0007WR-BH for qemu-devel@nongnu.org; Sun, 17 Feb 2019 21:07:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvYLK-0001xF-2S for qemu-devel@nongnu.org; Sun, 17 Feb 2019 21:07:39 -0500 Date: Mon, 18 Feb 2019 11:58:07 +1100 From: David Gibson Message-ID: <20190218005807.GA2345@umbus.fritz.box> References: <20190215133005.15955-1-david@redhat.com> <20190215133005.15955-4-david@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="sm4nu43k4a2Rpi4c" Content-Disposition: inline In-Reply-To: <20190215133005.15955-4-david@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 3/6] tests/device-plug: Add a simple PCI unplug request test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand Cc: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Peter Crosthwaite , Richard Henderson , Thomas Huth , Laurent Vivier , Cornelia Huck , Collin Walling , Pierre Morel , "Michael S . Tsirkin" , Marcel Apfelbaum , Greg Kurz , Igor Mammedov , Eduardo Habkost --sm4nu43k4a2Rpi4c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Feb 15, 2019 at 02:30:02PM +0100, David Hildenbrand wrote: > The issue with testing asynchronous unplug requests it that they usually > require a running guest to handle the request. However, to test if > unplug of PCI devices works, we can apply a nice little trick on some > architectures: >=20 > On system reset, x86 ACPI, s390x and spapr will perform the unplug, > resulting in the device of interest to get deleted and a DEVICE_DELETED > event getting sent. >=20 > On s390x, we still get a warning > qemu-system-s390x: -device virtio-mouse-pci,id=3Ddev0: > warning: Plugging a PCI/zPCI device without the 'zpci' CPU feature > enabled; the guest will not be able to see/use this device >=20 > This will be fixed soon, when we enable the zpci CPU feature always > (Conny already has a patch for this queued). >=20 > Signed-off-by: David Hildenbrand Reviewed-by: David Gibson > --- > tests/Makefile.include | 4 ++ > tests/device-plug-test.c | 93 ++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 97 insertions(+) > create mode 100644 tests/device-plug-test.c >=20 > diff --git a/tests/Makefile.include b/tests/Makefile.include > index b39e989f72..f242d65ea2 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -192,6 +192,7 @@ check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) +=3D tests/ip= mi-kcs-test$(EXESUF) > # check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D tests/ipmi-bt-test$(EXESUF) > check-qtest-i386-y +=3D tests/i440fx-test$(EXESUF) > check-qtest-i386-y +=3D tests/fw_cfg-test$(EXESUF) > +check-qtest-i386-y +=3D tests/device-plug-test$(EXESUF) > check-qtest-i386-y +=3D tests/drive_del-test$(EXESUF) > check-qtest-i386-$(CONFIG_WDT_IB700) +=3D tests/wdt_ib700-test$(EXESUF) > check-qtest-i386-y +=3D tests/tco-test$(EXESUF) > @@ -256,6 +257,7 @@ check-qtest-ppc-$(CONFIG_M48T59) +=3D tests/m48t59-te= st$(EXESUF) > =20 > check-qtest-ppc64-y +=3D $(check-qtest-ppc-y) > check-qtest-ppc64-$(CONFIG_PSERIES) +=3D tests/spapr-phb-test$(EXESUF) > +check-qtest-ppc64-$(CONFIG_PSERIES) +=3D tests/device-plug-test$(EXESUF) > check-qtest-ppc64-$(CONFIG_POWERNV) +=3D tests/pnv-xscom-test$(EXESUF) > check-qtest-ppc64-y +=3D tests/migration-test$(EXESUF) > check-qtest-ppc64-$(CONFIG_PSERIES) +=3D tests/rtas-test$(EXESUF) > @@ -310,6 +312,7 @@ check-qtest-s390x-$(CONFIG_SLIRP) +=3D tests/test-net= filter$(EXESUF) > check-qtest-s390x-$(CONFIG_POSIX) +=3D tests/test-filter-mirror$(EXESUF) > check-qtest-s390x-$(CONFIG_POSIX) +=3D tests/test-filter-redirector$(EXE= SUF) > check-qtest-s390x-y +=3D tests/drive_del-test$(EXESUF) > +check-qtest-s390x-y +=3D tests/device-plug-test$(EXESUF) > check-qtest-s390x-y +=3D tests/virtio-ccw-test$(EXESUF) > check-qtest-s390x-y +=3D tests/cpu-plug-test$(EXESUF) > check-qtest-s390x-y +=3D tests/migration-test$(EXESUF) > @@ -750,6 +753,7 @@ tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test= =2Eo > tests/qom-test$(EXESUF): tests/qom-test.o > tests/test-hmp$(EXESUF): tests/test-hmp.o > tests/machine-none-test$(EXESUF): tests/machine-none-test.o > +tests/device-plug-test$(EXESUF): tests/device-plug-test.o > tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-virtio-ob= j-y) > tests/nvme-test$(EXESUF): tests/nvme-test.o $(libqos-pc-obj-y) > tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o > diff --git a/tests/device-plug-test.c b/tests/device-plug-test.c > new file mode 100644 > index 0000000000..066433ebf5 > --- /dev/null > +++ b/tests/device-plug-test.c > @@ -0,0 +1,93 @@ > +/* > + * QEMU device plug/unplug handling > + * > + * Copyright (C) 2019 Red Hat Inc. > + * > + * Authors: > + * David Hildenbrand > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. > + * See the COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > +#include "libqtest.h" > +#include "qapi/qmp/qdict.h" > +#include "qapi/qmp/qstring.h" > + > +static void device_del_request(QTestState *qtest, const char *id) > +{ > + QDict *resp; > + > + resp =3D qtest_qmp(qtest, > + "{'execute': 'device_del', 'arguments': { 'id': %s = } }", > + id); > + g_assert(qdict_haskey(resp, "return")); > + qobject_unref(resp); > +} > + > +static void system_reset(QTestState *qtest) > +{ > + QDict *resp; > + > + resp =3D qtest_qmp(qtest, "{'execute': 'system_reset'}"); > + g_assert(qdict_haskey(resp, "return")); > + qobject_unref(resp); > +} > + > +static void wait_device_deleted_event(QTestState *qtest, const char *id) > +{ > + QDict *resp, *data; > + QString *qstr; > + > + /* > + * Other devices might get removed along with the removed device. Sk= ip > + * these. The device of interest will be the last one. > + */ > + for (;;) { > + resp =3D qtest_qmp_eventwait_ref(qtest, "DEVICE_DELETED"); > + data =3D qdict_get_qdict(resp, "data"); > + if (!data || !qdict_get(data, "device")) { > + qobject_unref(resp); > + continue; > + } > + qstr =3D qobject_to(QString, qdict_get(data, "device")); > + g_assert(qstr); > + if (!strcmp(qstring_get_str(qstr), id)) { > + qobject_unref(resp); > + break; > + } > + qobject_unref(resp); > + } > +} > + > +static void test_pci_unplug_request(void) > +{ > + QTestState *qtest =3D qtest_initf("-device virtio-mouse-pci,id=3Ddev= 0"); > + > + /* > + * Request device removal. As the guest is not running, the request = won't > + * be processed. However during system reset, the removal will be > + * handled, removing the device. > + */ > + device_del_request(qtest, "dev0"); > + system_reset(qtest); > + wait_device_deleted_event(qtest, "dev0"); > + > + qtest_quit(qtest); > +} > + > +int main(int argc, char **argv) > +{ > + g_test_init(&argc, &argv, NULL); > + > + /* > + * We need a system that will process unplug requests during system = resets > + * and does not do PCI surprise removal. This holds for x86 ACPI, > + * s390x and spapr. > + */ > + qtest_add_func("/device-plug/pci_unplug_request", > + test_pci_unplug_request); > + > + return g_test_run(); > +} --=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 --sm4nu43k4a2Rpi4c Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlxqAx8ACgkQbDjKyiDZ s5JywxAAgglzJyFDeu4XKMfNAzRARTW0Zzw9rvFl3/XVAQXwFLquHrPSlHr3h5yt dyj1E47sSTm75ZDl84TlUathokqn4ce/Qy5oFfiV2dpWfWhtThXQEqYELZ6n2Gbz 50ZnYy585JGh46DuvVvIchzrCqUb9LHAY2IQ3WCgUxDjnGjFALH3nevvxWxyR4EJ j8UGYqGRWws8clMFQSiuGgmIu2Dt4BPEWMlxwHhp/GZNL9bex65Zaz5qvqv/EN3o OQNesEqeGAT3fUUTixYA038aLNtCb+iQoqvzh7PeHoGpxABtzMfNaSQPQN3DPbsC 7ePZftxZUTmoLNpD/OS3Di6g0ihDxdcT+pni3kuN8SBtL3fm59otpjg4lp4qlx7/ S89OjyjsQ932JxHFFtzYwNNYX05++zOwIkycgnup6aDGC26+3CDZQ4afpbgcJUGz XpFY4AHB0TeuTL04o58DV1Ln49hcWHS8BOO5xe3YKnQHJwA3oQQ6KnrI6DluZgv8 v7u/HfRgJAdrsVmUXcT3KOnFtFXPDBc+9GxyDQyAtKg89xiUY/n8HW++19AWn0bR SeyQu83hO11kGlYTB4whmCHDMU4oYs4/mK6czSLPh2VmilXquJapmVEI92YLmdIX KU08IEQVoB4vwddGmBuRwuCvMl7y76MnMvq8JS5y6Z3J7iBevIg= =wnG4 -----END PGP SIGNATURE----- --sm4nu43k4a2Rpi4c--