From patchwork Wed Feb 12 20:57:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 11379151 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 BD26A109A for ; Wed, 12 Feb 2020 20:58:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 94782206D7 for ; Wed, 12 Feb 2020 20:58:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Y0FMLhfV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94782206D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:43334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1z5r-0008WE-Rw for patchwork-qemu-devel@patchwork.kernel.org; Wed, 12 Feb 2020 15:58:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45666) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1z5C-0007ic-Dp for qemu-devel@nongnu.org; Wed, 12 Feb 2020 15:58:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1z5B-0000Yp-6V for qemu-devel@nongnu.org; Wed, 12 Feb 2020 15:58:06 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:59428 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j1z5A-0000YH-QN for qemu-devel@nongnu.org; Wed, 12 Feb 2020 15:58:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581541084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BSBYqdzAS3mPVqRsW/SsgFlj+lQ57qOtWcPcksDWBjg=; b=Y0FMLhfVha9GU1z8Kzl9kkanBNo4Qfk1O+K9jEkFsoiix09xHNMfvp1yjd/3T8b+cTcXiz V2ZDO89eNS+AhHAs5fj/6lnfViPmQQLDyTWlbioN/f78YlBEZLDKkijbcVwANa104m5arW qr+P6icoPrrJuwNB0GT33Zl+eXKGs1o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-356-99RzHr5-OYG91Sak6T35tA-1; Wed, 12 Feb 2020 15:58:01 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EEB7D8010EB for ; Wed, 12 Feb 2020 20:58:00 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 458885C113; Wed, 12 Feb 2020 20:57:58 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3A1EE31E2A; Wed, 12 Feb 2020 21:57:57 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/2] usb-host: wait for cancel complete Date: Wed, 12 Feb 2020 21:57:56 +0100 Message-Id: <20200212205757.5608-2-kraxel@redhat.com> In-Reply-To: <20200212205757.5608-1-kraxel@redhat.com> References: <20200212205757.5608-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: 99RzHr5-OYG91Sak6T35tA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" After canceling transfers call into libvirt so it can process the request, and wait for it to complete. Also cancel all pending transfers before exiting qemu. Buglink: https://bugzilla.redhat.com//show_bug.cgi?id=1749745 Signed-off-by: Gerd Hoffmann Message-id: 20200203114108.23952-1-kraxel@redhat.com --- hw/usb/host-libusb.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 259470090102..2ac7a936fb91 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -354,9 +354,7 @@ static USBHostRequest *usb_host_req_alloc(USBHostDevice *s, USBPacket *p, static void usb_host_req_free(USBHostRequest *r) { - if (r->host) { - QTAILQ_REMOVE(&r->host->requests, r, next); - } + QTAILQ_REMOVE(&r->host->requests, r, next); libusb_free_transfer(r->xfer); g_free(r->buffer); g_free(r); @@ -468,12 +466,7 @@ static void usb_host_req_abort(USBHostRequest *r) usb_packet_complete(USB_DEVICE(s), r->p); } r->p = NULL; - } - QTAILQ_REMOVE(&r->host->requests, r, next); - r->host = NULL; - - if (inflight) { libusb_cancel_transfer(r->xfer); } } @@ -962,6 +955,13 @@ static void usb_host_abort_xfers(USBHostDevice *s) QTAILQ_FOREACH_SAFE(r, &s->requests, next, rtmp) { usb_host_req_abort(r); } + + while (QTAILQ_FIRST(&s->requests) != NULL) { + struct timeval tv; + memset(&tv, 0, sizeof(tv)); + tv.tv_usec = 2500; + libusb_handle_events_timeout(ctx, &tv); + } } static int usb_host_close(USBHostDevice *s) @@ -1011,6 +1011,7 @@ static void usb_host_exit_notifier(struct Notifier *n, void *data) USBHostDevice *s = container_of(n, USBHostDevice, exit); if (s->dh) { + usb_host_abort_xfers(s); usb_host_release_interfaces(s); libusb_reset_device(s->dh); usb_host_attach_kernel(s); From patchwork Wed Feb 12 20:57:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 11379153 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 1225A109A for ; Wed, 12 Feb 2020 20:58:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 DE6212467B for ; Wed, 12 Feb 2020 20:58:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LSrjBfnH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE6212467B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:43338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1z5y-0000Bs-P4 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 12 Feb 2020 15:58:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45691) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1z5F-0007ji-Jx for qemu-devel@nongnu.org; Wed, 12 Feb 2020 15:58:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1z5E-0000aX-JB for qemu-devel@nongnu.org; Wed, 12 Feb 2020 15:58:09 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:35130 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j1z5E-0000aI-Ff for qemu-devel@nongnu.org; Wed, 12 Feb 2020 15:58:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581541088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mnoiTOxvlWrl49cZaP7PlfgsIJrwXYmikRqXnqw6mZM=; b=LSrjBfnHcD3f60GoGKr8F6reKCjt/CwCpvTX9Hs4uO1vc9UqjFzpLYaWnToEz2MGB6FsXH 5/PSjlhOVHoqfLdLVZCQyloi76U5qALnnvLTQaciZBIB4rlybG2HkY2nKFF/kUL+OQTz7m AoGqB8PfXuvZA+3j0e0Vk7JPBVqjKQk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-347-hrpHrTPwPy6ezjFRya2fQg-1; Wed, 12 Feb 2020 15:58:02 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 27BAC10766DE for ; Wed, 12 Feb 2020 20:58:01 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33B91863CC; Wed, 12 Feb 2020 20:57:58 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 426F431E30; Wed, 12 Feb 2020 21:57:57 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/2] uas: fix super speed bMaxPacketSize0 Date: Wed, 12 Feb 2020 21:57:57 +0100 Message-Id: <20200212205757.5608-3-kraxel@redhat.com> In-Reply-To: <20200212205757.5608-1-kraxel@redhat.com> References: <20200212205757.5608-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: hrpHrTPwPy6ezjFRya2fQg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" For usb2 bMaxPacketSize0 is "n", for usb3 it is "1 << n", so it must be 9 not 64 ... rom "Universal Serial Bus 3.1 Specification": If the device is operating at Gen X speed, the bMaxPacketSize0 field shall be set to 09H indicating a 512-byte maximum packet. An Enhanced SuperSpeed device shall not support any other maximum packet sizes for the default control pipe (endpoint 0) control endpoint. We now announce a 512-byte maximum packet. Fixes: 89a453d4a5c ("uas-uas: usb3 streams") Reported-by: Benjamin David Lunt Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daudé Message-id: 20200117073716.31335-1-kraxel@redhat.com --- hw/usb/dev-uas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 9825ec37d09c..11a8684cc2ab 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -303,7 +303,7 @@ static const USBDescDevice desc_device_high = { static const USBDescDevice desc_device_super = { .bcdUSB = 0x0300, - .bMaxPacketSize0 = 64, + .bMaxPacketSize0 = 9, .bNumConfigurations = 1, .confs = (USBDescConfig[]) { {