From patchwork Fri Aug 2 15:35:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 11073785 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF9E01399 for ; Fri, 2 Aug 2019 15:59:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E8C028876 for ; Fri, 2 Aug 2019 15:59:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 928B72887A; Fri, 2 Aug 2019 15:59:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1FF4728877 for ; Fri, 2 Aug 2019 15:59:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1htZwH-0005mq-4A; Fri, 02 Aug 2019 15:57:53 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1htZwF-0005ma-Nj for xen-devel@lists.xenproject.org; Fri, 02 Aug 2019 15:57:51 +0000 X-Inumbo-ID: 46febe8e-b53e-11e9-8980-bc764e045a96 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 46febe8e-b53e-11e9-8980-bc764e045a96; Fri, 02 Aug 2019 15:57:49 +0000 (UTC) Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: VXq2FcEM5kKhzfKqIX5nsX4YRQ0PoIsi4lEbUMFPwjRCxdIwJek4Eeodp6uJKChEZqanWybtRG SAZknu9r6Ue4o+D3NGWTG8Oca78PaYfrhM807ByuIJuk1KOODVZKtMAEhS9CYjQ0ggWF+b+VFD GxcYDTuQlcKvb33dmxtWBPYpmvCSIkO2pKRS+y7BQ2zYXgei8yRvXzt3Vo8yLOaTkVkzfOwDyg dBAkC/Ne/pCkMaMU1qpkTaZ4NmIxe0Iu1sPrC/NmbWz3hdOxcrjWQTzPp2aWqYRSwQyFkwPGSF tvo= X-SBRS: 2.7 X-MesageID: 3931648 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,338,1559534400"; d="scan'208";a="3931648" From: Anthony PERARD To: Date: Fri, 2 Aug 2019 16:35:51 +0100 Message-ID: <20190802153606.32061-21-anthony.perard@citrix.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802153606.32061-1-anthony.perard@citrix.com> References: <20190802153606.32061-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 20/35] libxl_usb: Make libxl__initiate_device_usbctrl_remove uses ev_qmp X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Anthony PERARD , Ian Jackson , Wei Liu Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- tools/libxl/libxl_usb.c | 97 +++++++++++++++++++++++++++++++++-------- 1 file changed, 79 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c index 5975c1d192..92eeeb27f0 100644 --- a/tools/libxl/libxl_usb.c +++ b/tools/libxl/libxl_usb.c @@ -384,15 +384,16 @@ static int libxl__device_usbctrl_add_hvm(libxl__gc *gc, libxl__ev_qmp *qmp, } /* Send qmp commands to delete a usb controller in qemu. */ -static int libxl__device_usbctrl_del_hvm(libxl__gc *gc, uint32_t domid, +static int libxl__device_usbctrl_del_hvm(libxl__gc *gc, + libxl__ev_qmp *qmp, int devid) { - flexarray_t *qmp_args; + libxl__json_object *qmp_args = NULL; - qmp_args = flexarray_make(gc, 2, 1); - flexarray_append_pair(qmp_args, "id", GCSPRINTF("xenusb-%d", devid)); + libxl__qmp_param_add_string(gc, &qmp_args, + "id", GCSPRINTF("xenusb-%d", devid)); - return libxl__qmp_run_command_flexarray(gc, domid, "device_del", qmp_args); + return libxl__ev_qmp_send(gc, qmp, "device_del", qmp_args); } /* Send qmp commands to create a usb device in qemu. */ @@ -559,6 +560,13 @@ static int libxl__device_usbdev_list_for_usbctrl(libxl__gc *gc, uint32_t domid, static int libxl__device_usbdev_remove(libxl__gc *gc, uint32_t domid, libxl_device_usbdev *usbdev); +static void device_usbctrl_remove_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs, int rc); +static void device_usbctrl_remove_qmp_cb(libxl__egc *egc, + libxl__ev_qmp *qmp, const libxl__json_object *resp, int rc); +static void device_usbctrl_remove_done(libxl__egc *egc, + libxl__ao_device *, int rc); + /* AO function to remove a usb controller. * * Generally, it does: @@ -578,13 +586,18 @@ void libxl__initiate_device_usbctrl_remove(libxl__egc *egc, int i, rc; uint32_t domid = aodev->dev->domid; int usbctrl_devid = aodev->dev->devid; - libxl_device_usbctrl usbctrl; + libxl_device_usbctrl *usbctrl; - libxl_device_usbctrl_init(&usbctrl); + GCNEW(usbctrl); + libxl_device_usbctrl_init(usbctrl); rc = libxl_devid_to_device_usbctrl(CTX, domid, usbctrl_devid, - &usbctrl); + usbctrl); if (rc) goto out; + /* Store *usbctrl to be used by callbacks */ + aodev->device_config = usbctrl; + aodev->device_type = &libxl__usbctrl_devtype; + /* Remove usb devices first */ rc = libxl__device_usbdev_list_for_usbctrl(gc, domid, usbctrl_devid, &usbdevs, &num_usbdev); @@ -599,24 +612,72 @@ void libxl__initiate_device_usbctrl_remove(libxl__egc *egc, } } - if (usbctrl.type == LIBXL_USBCTRL_TYPE_DEVICEMODEL) { - rc = libxl__device_usbctrl_del_hvm(gc, domid, usbctrl_devid); - if (!rc) - libxl__device_usbctrl_del_xenstore(gc, domid, &usbctrl); - goto out; + if (usbctrl->type == LIBXL_USBCTRL_TYPE_DEVICEMODEL) { + libxl__ev_qmp *const qmp = &aodev->qmp; + + rc = libxl__ev_time_register_rel(ao, &aodev->timeout, + device_usbctrl_remove_timeout, + LIBXL_QMP_CMD_TIMEOUT * 1000); + if (rc) goto out; + + qmp->ao = ao; + qmp->domid = domid; + qmp->callback = device_usbctrl_remove_qmp_cb; + qmp->payload_fd = -1; + rc = libxl__device_usbctrl_del_hvm(gc, qmp, usbctrl_devid); + if (rc) goto out; + return; } - libxl_device_usbctrl_dispose(&usbctrl); + libxl_device_usbctrl_dispose(usbctrl); /* Remove usbctrl */ - libxl__initiate_device_generic_remove(egc, aodev); + libxl__initiate_device_generic_remove(egc, aodev); /* must be last */ return; - out: - libxl_device_usbctrl_dispose(&usbctrl); + device_usbctrl_remove_done(egc, aodev, rc); /* must be last */ +} + +static void device_usbctrl_remove_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs, int rc) +{ + EGC_GC; + libxl__ao_device *aodev = CONTAINER_OF(ev, *aodev, timeout); + + if (rc == ERROR_TIMEDOUT) + LOGD(ERROR, aodev->dev->domid, + "Removing usbctrl from QEMU timed out"); + device_usbctrl_remove_qmp_cb(egc, &aodev->qmp, NULL, rc); +} + +static void device_usbctrl_remove_qmp_cb(libxl__egc *egc, + libxl__ev_qmp *qmp, + const libxl__json_object *resp, + int rc) +{ + EGC_GC; + libxl__ao_device *aodev = CONTAINER_OF(qmp, *aodev, qmp); + libxl_device_usbctrl *const usbctrl = aodev->device_config; + + if (!rc) + libxl__device_usbctrl_del_xenstore(gc, aodev->dev->domid, usbctrl); + + device_usbctrl_remove_done(egc, aodev, rc); +} + +static void device_usbctrl_remove_done(libxl__egc *egc, + libxl__ao_device *aodev, + int rc) +{ + EGC_GC; + libxl_device_usbctrl *const usbctrl = aodev->device_config; + + libxl_device_usbctrl_dispose(usbctrl); + libxl__ev_qmp_dispose(gc, &aodev->qmp); + libxl__ev_time_deregister(gc, &aodev->timeout); + aodev->rc = rc; aodev->callback(egc, aodev); - return; } static int libxl__usbctrl_from_xenstore(libxl__gc *gc,