From nobody Mon Feb 9 19:06:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589459501; cv=none; d=zohomail.com; s=zohoarc; b=QGrBIQgSQWoIQ+WyLhXIk1YPuVFO0iYJSH0m+V6L38jqU1Qa/MfPuhlxFWbapeLAUibhpfnh4HOI43aBYiiYh26pwOpCccMOJq0eTCa3SMqkWKPmY97j99QfvuGeHGzCoVE7rTNhrU9OxyrFLtLW1HY4CFEpsZhIr9xbb16fksg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589459501; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=izjIFur53yZHrqhcINIPf0xUP0mig0YAPM3oF3SDqYA=; b=daBNNkNy+2A2+KigKJaNEcNmhIKI+X99dZ4UaGFhsgUPpc1XtPZT2BamNGx/4hgHVRJUPuYeE4YUSwvHiN033G7xsyFBhqxDhauGyhGHFULZAWJqygjNru9aIlgSASG3ykiAMoTozy+LbCB8CHuY1iz09++WnH0R5jILGHIFc6k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589459501932544.891962895859; Thu, 14 May 2020 05:31:41 -0700 (PDT) Received: from localhost ([::1]:49856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZD1Y-0004xW-BX for importer@patchew.org; Thu, 14 May 2020 08:31:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZCty-0001jz-DE for qemu-devel@nongnu.org; Thu, 14 May 2020 08:23:50 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:30345 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jZCtw-0003aV-8M for qemu-devel@nongnu.org; Thu, 14 May 2020 08:23:50 -0400 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-272-E9iZBim5N7a3IJeWCYkTwQ-1; Thu, 14 May 2020 08:23:45 -0400 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 66BD31902EA4; Thu, 14 May 2020 12:23:44 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-145.ams2.redhat.com [10.36.115.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8F1176E64; Thu, 14 May 2020 12:23:40 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DF9539DAE; Thu, 14 May 2020 14:23:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589459027; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=izjIFur53yZHrqhcINIPf0xUP0mig0YAPM3oF3SDqYA=; b=cGe81opLHSGNzX0sKYbfTWxJRn3C/O+Prs1d349iqFIzhiW4IGRQWOay5Qm8iNSjMoPlGQ Cau/RhGWjEJANBEPjmRBM7YxquWb9HuqNN1O/MgDvWSKtw76IWl/u7CMcBjScseFYi+vUo Md8lAW4heNpjmuaaVZ61FBIPCRRQDtU= X-MC-Unique: E9iZBim5N7a3IJeWCYkTwQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 5/7] usb: add short-packet handling to usb-storage driver Date: Thu, 14 May 2020 14:23:32 +0200 Message-Id: <20200514122334.25089-6-kraxel@redhat.com> In-Reply-To: <20200514122334.25089-1-kraxel@redhat.com> References: <20200514122334.25089-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 22:25:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Peter Maydell , Andrew Baumann , Paul Zimmerman , qemu-arm@nongnu.org, Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paul Zimmerman The dwc-hsotg (dwc2) USB host depends on a short packet to indicate the end of an IN transfer. The usb-storage driver currently doesn't provide this, so fix it. I have tested this change rather extensively using a PC emulation with xhci, ehci, and uhci controllers, and have not observed any regressions. Signed-off-by: Paul Zimmerman Message-id: 20200512064900.28554-6-pauldzim@gmail.com Signed-off-by: Gerd Hoffmann --- hw/usb/dev-storage.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 5c4b57b06b6f..ae3c5500424f 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -229,6 +229,9 @@ static void usb_msd_copy_data(MSDState *s, USBPacket *p) usb_packet_copy(p, scsi_req_get_buf(s->req) + s->scsi_off, len); s->scsi_len -=3D len; s->scsi_off +=3D len; + if (len > s->data_len) { + len =3D s->data_len; + } s->data_len -=3D len; if (s->scsi_len =3D=3D 0 || s->data_len =3D=3D 0) { scsi_req_continue(s->req); @@ -303,6 +306,9 @@ static void usb_msd_command_complete(SCSIRequest *req, = uint32_t status, size_t r if (s->data_len) { int len =3D (p->iov.size - p->actual_length); usb_packet_skip(p, len); + if (len > s->data_len) { + len =3D s->data_len; + } s->data_len -=3D len; } if (s->data_len =3D=3D 0) { @@ -469,6 +475,9 @@ static void usb_msd_handle_data(USBDevice *dev, USBPack= et *p) int len =3D p->iov.size - p->actual_length; if (len) { usb_packet_skip(p, len); + if (len > s->data_len) { + len =3D s->data_len; + } s->data_len -=3D len; if (s->data_len =3D=3D 0) { s->mode =3D USB_MSDM_CSW; @@ -528,13 +537,17 @@ static void usb_msd_handle_data(USBDevice *dev, USBPa= cket *p) int len =3D p->iov.size - p->actual_length; if (len) { usb_packet_skip(p, len); + if (len > s->data_len) { + len =3D s->data_len; + } s->data_len -=3D len; if (s->data_len =3D=3D 0) { s->mode =3D USB_MSDM_CSW; } } } - if (p->actual_length < p->iov.size) { + if (p->actual_length < p->iov.size && (p->short_not_ok || + s->scsi_len >=3D p->ep->max_packet_size)) { DPRINTF("Deferring packet %p [wait data-in]\n", p); s->packet =3D p; p->status =3D USB_RET_ASYNC; --=20 2.18.4