From patchwork Sun Mar 29 00:17:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Zimmerman X-Patchwork-Id: 1263340 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=TLBC5Usi; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48qbn926w6z9sSR for ; Sun, 29 Mar 2020 11:19:25 +1100 (AEDT) Received: from localhost ([::1]:32844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jILff-0002fx-4o for incoming@patchwork.ozlabs.org; Sat, 28 Mar 2020 20:19:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48053) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jILev-0002dV-Nr for qemu-devel@nongnu.org; Sat, 28 Mar 2020 20:18:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jILeu-0007W0-Lc for qemu-devel@nongnu.org; Sat, 28 Mar 2020 20:18:37 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:34782) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jILeu-0007Vm-Fu for qemu-devel@nongnu.org; Sat, 28 Mar 2020 20:18:36 -0400 Received: by mail-pf1-x441.google.com with SMTP id 23so6649154pfj.1 for ; Sat, 28 Mar 2020 17:18:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PXKXjtVVrrXV5MvzLqoNhi8atJWdX4WMW2e8oHa6A4c=; b=TLBC5Usic+nomSwCBKgZtQ4LawEwufKB1S8nlDotSITnd8EIO41ZlwWcYbdA1hX+lQ s6COhLH2pCK9WhABm3eiG/uyH065vFlDhJHOQOOwjk5eDcdvXbpzvWy6ANSZ8KFBZgBo bU2TwxWgjk7Nsyjjx+kNjYmilUzX0cS+K4UtAPtFajO3s70Wn2QlMoraWiHm6/2qkpKe c55mEJN2smEcVowLPpLg4ww+WsodYo0vTp5zTE5mEjPvSQD/wG0e+0YC8PxAYDxNna0D DbJgpPu/joZG/ypS8LdXpp2zPa65ytXXcT3HHLgLWx/4yLPiqwV49KUHM4I4kJyadLTe jA2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PXKXjtVVrrXV5MvzLqoNhi8atJWdX4WMW2e8oHa6A4c=; b=oKmRldifth4M7lltgEk8VwOsWBV+Dh5WKt1gCmgQiNMzGxpn/4bjDvC9PUBrL1fwoE QTSUXpR5cc1JMDsNRLRonpIqRn5RC6VaHqInGBDrQQd3SVnC2avMoeVxSianMljmewa0 nXwxxVap6/TQ+nEqnL9MrfJQKCFhzWLpZu7O7TzBWVoYpauXzCJ6AT24xaHj3jyhXvym 9m0bNMpxUNjhntssuI1l5x4kIhOit+hZxGnIYmPTF2gLrrjIndB8rSUOEAD9bSGWIBFa AqkUDVvR/VvBfnEURANKOZ8Y1yOfJ4e5Zvr8AA4vsfvh+CBZmmsPH1J5QAuBMIoMt1df LWRA== X-Gm-Message-State: ANhLgQ3Qo6nSnWJ0b0UJ9awagk8UcHzW3rJwwcRVYaGSFiX/h45MCpPu w99wwrc++dGcDWQKFdRTirk= X-Google-Smtp-Source: ADFU+vsOmYYyuyw2qXw3t1p6BoV+UzvliB9Uu5RJJlxoKohwiYnJLPL6lGZL3vsbRoE0Ije3HTMf2w== X-Received: by 2002:a63:5f10:: with SMTP id t16mr6354306pgb.20.1585441115575; Sat, 28 Mar 2020 17:18:35 -0700 (PDT) Received: from paulz-G33T-M.Home ([75.167.220.149]) by smtp.gmail.com with ESMTPSA id u14sm6626890pgg.67.2020.03.28.17.18.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Mar 2020 17:18:35 -0700 (PDT) From: Paul Zimmerman To: Gerd Hoffmann Subject: [PATCH v2 5/6] Add short-packet handling to usb-storage driver Date: Sat, 28 Mar 2020 17:17:04 -0700 Message-Id: <20200329001705.15966-6-pauldzim@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200329001705.15966-1-pauldzim@gmail.com> References: <20200329001705.15966-1-pauldzim@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::441 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 , Stefan Hajnoczi , qemu-devel@nongnu.org, Paul Zimmerman , John Snow , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 5c4b57b06b..ae3c550042 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 -= len; s->scsi_off += len; + if (len > s->data_len) { + len = s->data_len; + } s->data_len -= len; if (s->scsi_len == 0 || s->data_len == 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 = (p->iov.size - p->actual_length); usb_packet_skip(p, len); + if (len > s->data_len) { + len = s->data_len; + } s->data_len -= len; } if (s->data_len == 0) { @@ -469,6 +475,9 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket *p) int len = p->iov.size - p->actual_length; if (len) { usb_packet_skip(p, len); + if (len > s->data_len) { + len = s->data_len; + } s->data_len -= len; if (s->data_len == 0) { s->mode = USB_MSDM_CSW; @@ -528,13 +537,17 @@ static void usb_msd_handle_data(USBDevice *dev, USBPacket *p) int len = p->iov.size - p->actual_length; if (len) { usb_packet_skip(p, len); + if (len > s->data_len) { + len = s->data_len; + } s->data_len -= len; if (s->data_len == 0) { s->mode = USB_MSDM_CSW; } } } - if (p->actual_length < p->iov.size) { + if (p->actual_length < p->iov.size && (p->short_not_ok || + s->scsi_len >= p->ep->max_packet_size)) { DPRINTF("Deferring packet %p [wait data-in]\n", p); s->packet = p; p->status = USB_RET_ASYNC;