From patchwork Thu Sep 19 17:16:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 11153031 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D762515E6 for ; Thu, 19 Sep 2019 17:43:31 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B23B1214AF for ; Thu, 19 Sep 2019 17:43:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="QtDJuh9p" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B23B1214AF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iB0RG-0005Oo-MF; Thu, 19 Sep 2019 17:41:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iB0RF-0005MC-7Z for xen-devel@lists.xenproject.org; Thu, 19 Sep 2019 17:41:53 +0000 X-Inumbo-ID: b30a5d2e-db04-11e9-b299-bc764e2007e4 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b30a5d2e-db04-11e9-b299-bc764e2007e4; Thu, 19 Sep 2019 17:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1568914884; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mnkGtlEWhipsE0tKDwXmE4lkKgt4Y2QgOJBeQ8/1xB4=; b=QtDJuh9p+dyfKvvHFmbVFcSlXb9Z8k6vLOKWV2CuNJnjASfI7B59fWxT QFkcVREcmD4/rhoEbyJii/46t5k+02Vsi7w/xWLwFmAhSLX/Jd8Ec1ovP kf/sg8f36YRFvR/1cV++tvyypiI2+TpprrecRHymjb6J0tUDNBMcueHp9 4=; 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: nsIwUuJY4RYEi+DBPf3xCZ1C0bSciFsVH5Ch9AR3c8Y3pk1r0NTq42ZrMg9UvSeu1nqye+TarO H3o5L44E5E1QkFC0oZ4LSjp435S+aQI0oAskF5ufMydb+PJ0rMxqo+hd41kAhbudO5YMs7N/Uz p/ox+kAiapVghg7ivKsf/6J9kJmMWGyDDnRVobs0ekbV+EWaWfodNf5fbmjT1vHLV38CdEqD0w OI8QMxpGJTgNwDOIN1Mr+lbv6/V293m2FaiIi4TSxi2fgmk6roJiFib4iZw9gnmA2bxoSQ2CK9 btI= X-SBRS: 2.7 X-MesageID: 6064361 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,524,1559534400"; d="scan'208";a="6064361" From: Anthony PERARD To: Date: Thu, 19 Sep 2019 18:16:41 +0100 Message-ID: <20190919171656.899649-22-anthony.perard@citrix.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919171656.899649-1-anthony.perard@citrix.com> References: <20190919171656.899649-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 21/35] libxl_usb: Make libxl__device_usbdev_add 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" Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- tools/libxl/libxl_usb.c | 99 +++++++++++++++++++++++++++++++++-------- 1 file changed, 81 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c index 373b37d7159a..b9a31f96ebe3 100644 --- a/tools/libxl/libxl_usb.c +++ b/tools/libxl/libxl_usb.c @@ -395,26 +395,25 @@ static int libxl__device_usbctrl_del_hvm(libxl__gc *gc, } /* Send qmp commands to create a usb device in qemu. */ -static int libxl__device_usbdev_add_hvm(libxl__gc *gc, uint32_t domid, +static int libxl__device_usbdev_add_hvm(libxl__gc *gc, libxl__ev_qmp *qmp, libxl_device_usbdev *usbdev) { - flexarray_t *qmp_args; + libxl__json_object *qmp_args = NULL; - qmp_args = flexarray_make(gc, 12, 1); - flexarray_append_pair(qmp_args, "id", - GCSPRINTF("xenusb-%d-%d", - usbdev->u.hostdev.hostbus, - usbdev->u.hostdev.hostaddr)); - flexarray_append_pair(qmp_args, "driver", "usb-host"); - flexarray_append_pair(qmp_args, "bus", - GCSPRINTF("xenusb-%d.0", usbdev->ctrl)); - flexarray_append_pair(qmp_args, "port", GCSPRINTF("%d", usbdev->port)); - flexarray_append_pair(qmp_args, "hostbus", - GCSPRINTF("%d", usbdev->u.hostdev.hostbus)); - flexarray_append_pair(qmp_args, "hostaddr", - GCSPRINTF("%d", usbdev->u.hostdev.hostaddr)); - - return libxl__qmp_run_command_flexarray(gc, domid, "device_add", qmp_args); + libxl__qmp_param_add_string(gc, &qmp_args, "id", + GCSPRINTF("xenusb-%d-%d", usbdev->u.hostdev.hostbus, + usbdev->u.hostdev.hostaddr)); + libxl__qmp_param_add_string(gc, &qmp_args, "driver", "usb-host"); + libxl__qmp_param_add_string(gc, &qmp_args, "bus", + GCSPRINTF("xenusb-%d.0", usbdev->ctrl)); + libxl__qmp_param_add_string(gc, &qmp_args, "port", + GCSPRINTF("%d", usbdev->port)); + libxl__qmp_param_add_string(gc, &qmp_args, "hostbus", + GCSPRINTF("%d", usbdev->u.hostdev.hostbus)); + libxl__qmp_param_add_string(gc, &qmp_args, "hostaddr", + GCSPRINTF("%d", usbdev->u.hostdev.hostaddr)); + + return libxl__ev_qmp_send(gc, qmp, "device_add", qmp_args); } /* Send qmp commands to delete a usb device in qemu. */ @@ -1639,6 +1638,13 @@ static int usbback_dev_assign(libxl__gc *gc, const char *busid) return rc; } +static void device_usbdev_add_qmp_cb(libxl__egc *egc, + libxl__ev_qmp *qmp, const libxl__json_object *r, int rc); +static void device_usbdev_add_timeout(libxl__egc *egc, + libxl__ev_time *ev, const struct timeval *requested_abs, int rc); +static void device_usbdev_add_done(libxl__egc *egc, + libxl__ao_device *aodev, int rc); + /* AO operation to add a usb device. * * Generally, it does: @@ -1665,9 +1671,14 @@ static void libxl__device_usbdev_add(libxl__egc *egc, uint32_t domid, int num_assigned; libxl_device_usbctrl usbctrl; char *busid; + bool has_callback = false; libxl_device_usbctrl_init(&usbctrl); + /* Store *usbdev to be used by callbacks */ + aodev->device_config = usbdev; + aodev->device_type = &libxl__usbdev_devtype; + /* Currently only support adding USB device from Dom0 backend. * So, if USB controller is specified, check its backend domain, * if it's not Dom0, report error. @@ -1751,12 +1762,22 @@ static void libxl__device_usbdev_add(libxl__egc *egc, uint32_t domid, aodev->update_json); if (rc) goto out; - rc = libxl__device_usbdev_add_hvm(gc, domid, usbdev); + rc = libxl__ev_time_register_rel(ao, &aodev->timeout, + device_usbdev_add_timeout, + LIBXL_QMP_CMD_TIMEOUT * 1000); + if (rc) goto out; + + aodev->qmp.ao = ao; + aodev->qmp.domid = domid; + aodev->qmp.callback = device_usbdev_add_qmp_cb; + aodev->qmp.payload_fd = -1; + rc = libxl__device_usbdev_add_hvm(gc, &aodev->qmp, usbdev); if (rc) { libxl__device_usbdev_remove_xenstore(gc, domid, usbdev, LIBXL_USBCTRL_TYPE_DEVICEMODEL); goto out; } + has_callback = true; break; default: LOGD(ERROR, domid, "Unsupported usb controller type"); @@ -1768,6 +1789,48 @@ static void libxl__device_usbdev_add(libxl__egc *egc, uint32_t domid, out: libxl_device_usbctrl_dispose(&usbctrl); + /* Only call _done if no callback have been setup */ + if (!has_callback) + device_usbdev_add_done(egc, aodev, rc); /* must be last */ +} + +static void device_usbdev_add_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->qmp.domid, + "Adding usbdev to QEMU timed out"); + device_usbdev_add_qmp_cb(egc, &aodev->qmp, NULL, rc); +} + +static void device_usbdev_add_qmp_cb(libxl__egc *egc, + libxl__ev_qmp *qmp, + const libxl__json_object *r, + int rc) +{ + EGC_GC; + libxl__ao_device *aodev = CONTAINER_OF(qmp, *aodev, qmp); + libxl_device_usbdev *const usbdev = aodev->device_config; + + if (rc) + libxl__device_usbdev_remove_xenstore(gc, qmp->domid, + usbdev, LIBXL_USBCTRL_TYPE_DEVICEMODEL); + device_usbdev_add_done(egc, aodev, rc); /* must be last */ +} + +static void device_usbdev_add_done(libxl__egc *egc, + libxl__ao_device *aodev, + int rc) +{ + EGC_GC; + + libxl__ev_time_deregister(gc, &aodev->timeout); + libxl__ev_qmp_dispose(gc, &aodev->qmp); aodev->rc = rc; aodev->callback(egc, aodev); }