From nobody Wed Apr 16 04:16:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1744361784; cv=none; d=zohomail.com; s=zohoarc; b=J67wU7Jr5p0UFezjLIkYptlxkC0IZqYJdvOL9QvDIpLdt+mpi9RFc7dMcal7Vpe4hfYplI650k6H1Rqgj0CjhXcADBusb/wn6x1yq5+uaN8s70DrcV4fy/tUu8xVWVS43Yl6sPPPjZnA43BmVD+y0fuDalxYgH26wZsVZqVB7vM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744361784; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0WKAS2lW3F9cGbzI+GOHbYGkJMNKj458fWBIwWUCpIs=; b=lwOHy+CyfQMrqQmBoK1DBDFw5NIh78xdULaUrsxhMja2gwCZXkLj+opQw4gRcyFnp94+zLCSYx01m/NV5kHZOSHQbNqVmhGNjlh+EZaY7Jr8BsDrby3R/hGvs3C1RcPsEUUaTI27pZJeMPmeTmJQp3NVNC833bykz3KYk9Ecsp0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1744361784877260.66309749385243; Fri, 11 Apr 2025 01:56:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u39Na-0001pa-Kp; Fri, 11 Apr 2025 04:04:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u39NU-0001p9-Cr for qemu-devel@nongnu.org; Fri, 11 Apr 2025 04:04:44 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u39NS-0004gI-3d for qemu-devel@nongnu.org; Fri, 11 Apr 2025 04:04:43 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-224341bbc1dso16194265ad.3 for ; Fri, 11 Apr 2025 01:04:41 -0700 (PDT) Received: from wheely.local0.net ([220.253.99.94]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7c95c83sm43048065ad.147.2025.04.11.01.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 01:04:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744358681; x=1744963481; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0WKAS2lW3F9cGbzI+GOHbYGkJMNKj458fWBIwWUCpIs=; b=fs8tF9Om8mIb3RS7k1fTSwZPPGJPr6wh6dY79UD9MlS/bdZ/qbr/VHJcEEDVad1Gkj WlHIpdZU2i/wDxcnooXXG5u4iXso3d7ykAu8g6lAzU1W3KdtTH0bKMMsixvkFU1lLDsn IWloro35pyKqahXu2fnYiRkjFFbrx2Ct+Cv5pvKq9eUopBLXpd1C2D/FC3gmaLJQi6yj +yY+jEi/Kt/ftv+2OVXazik8SShXpmyO07lqEm6OtmDdmWRqxDv3gSZPTdumydvAnezS lnjYwLw3DoQpZS+7v6MwYaVFyqJX6eARqDCDTdIJki6CJ7v1JMFZ3lQDhGNjkhzF4IJW JaBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744358681; x=1744963481; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0WKAS2lW3F9cGbzI+GOHbYGkJMNKj458fWBIwWUCpIs=; b=pCYz4HZCeLKct2N15ogPbJ2c8UAlncw4YFF+kfsfd0JyuzLKljZ9gpAJFPlCiP54NX BUYfBO9gyQZGor45/DIZd+mDenxMk8USCEOtGHaVnFO1xWMKpLDxPcNKshOAx6uYuccO zwilGJelWbtiCdZSzj4dcpvkvOcxzCsne1hxY1awEkxY3rY1F/uwHNcmyiz295Ec7V0j syDOEL6zPPOYrKmoOLgjUH1HqKdArblxUuIUDVBKXeRp9k2RnXQ41ZTrXGAallCRRWKY 4QTXLSg6M58dxXmqXFxStBE+sriJqJ6fGTD4rcWhx9W6fcDBIVBu5ooWUDuvrwmIGldh TRlA== X-Forwarded-Encrypted: i=1; AJvYcCUaukBHMtaqyH0Ype5t1HK/qsLrkwPtr0Yr9q3tEhU41rM/70wX3c8+9Gabv1xK5YNbPxmEwWon/ydv@nongnu.org X-Gm-Message-State: AOJu0YzvGrpWV3aTjbHoVil2hjqSSUD05oQytTLkzHG4QQBIfqxsv53R waZGwDJEL0dxrRARUzr+LPLj1E1HaH/clYWlooR2bUQ1UaNgr5xYocauaw== X-Gm-Gg: ASbGncu1EqOHRouTMr40iwVMnCf0yyrzTfI3TJEi7mcDjA0g9CSFKKu8yS5xQxTKYpB YxLcfXeF5cQ8iZVZVmz5pIUFadA7DbYoyZ4DBknl0Io0MuHvPlL2tVPP+PEy9eybi2eUNzFSAKp wIJ2kDaHUJR6GG0ghuJwuPpskkmnrjzduVAGA4k83JDh1TtW+c5pQCnL2N48W6ieN1W4VDbWz+O U8velhFQdFXr+RvkeVFECYGxcpKchzX8C6HVTiIdufaUY4zfNZ4AVw6W3L6hC3hGh5TLEpY5O2k 0qHjf+RFw3iY1SEDB+HwqaeScSzskszB3WLJXO//HSz9 X-Google-Smtp-Source: AGHT+IHWyZqUhg0vdL+1tKkfn9IHvpu8o+3ecO+WfpidO+FfwXLXbRUB6J+3w0kl60RLqjcLunm5gw== X-Received: by 2002:a17:902:ef12:b0:223:fb3a:8647 with SMTP id d9443c01a7336-22bea4f2773mr31303755ad.41.1744358680704; Fri, 11 Apr 2025 01:04:40 -0700 (PDT) From: Nicholas Piggin To: Gerd Hoffmann Cc: Nicholas Piggin , qemu-devel@nongnu.org, Kevin Wolf Subject: [PATCH v2 01/10] usb/msd: Split in and out packet handling Date: Fri, 11 Apr 2025 18:04:22 +1000 Message-ID: <20250411080431.207579-2-npiggin@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250411080431.207579-1-npiggin@gmail.com> References: <20250411080431.207579-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::630; envelope-from=npiggin@gmail.com; helo=mail-pl1-x630.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1744361785480019000 Content-Type: text/plain; charset="utf-8" Split in and out packet handling int otheir own functions, to make them a bit more managable. Signed-off-by: Nicholas Piggin --- hw/usb/dev-storage.c | 266 +++++++++++++++++++++++-------------------- 1 file changed, 145 insertions(+), 121 deletions(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 4f1e8b7f6cb..2d7306b0572 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -395,158 +395,182 @@ static void usb_msd_cancel_io(USBDevice *dev, USBPa= cket *p) } } =20 -static void usb_msd_handle_data(USBDevice *dev, USBPacket *p) +static void usb_msd_handle_data_out(USBDevice *dev, USBPacket *p) { MSDState *s =3D (MSDState *)dev; uint32_t tag; struct usb_msd_cbw cbw; - uint8_t devep =3D p->ep->nr; SCSIDevice *scsi_dev; int len; =20 - if (s->needs_reset) { - p->status =3D USB_RET_STALL; - return; - } + switch (s->mode) { + case USB_MSDM_CBW: + if (p->iov.size !=3D 31) { + error_report("usb-msd: Bad CBW size"); + goto fail; + } + usb_packet_copy(p, &cbw, 31); + if (le32_to_cpu(cbw.sig) !=3D 0x43425355) { + error_report("usb-msd: Bad signature %08x", + le32_to_cpu(cbw.sig)); + goto fail; + } + scsi_dev =3D scsi_device_find(&s->bus, 0, 0, cbw.lun); + if (scsi_dev =3D=3D NULL) { + error_report("usb-msd: Bad LUN %d", cbw.lun); + goto fail; + } + tag =3D le32_to_cpu(cbw.tag); + s->data_len =3D le32_to_cpu(cbw.data_len); + if (s->data_len =3D=3D 0) { + s->mode =3D USB_MSDM_CSW; + } else if (cbw.flags & 0x80) { + s->mode =3D USB_MSDM_DATAIN; + } else { + s->mode =3D USB_MSDM_DATAOUT; + } + trace_usb_msd_cmd_submit(cbw.lun, tag, cbw.flags, + cbw.cmd_len, s->data_len); + assert(le32_to_cpu(s->csw.residue) =3D=3D 0); + s->scsi_len =3D 0; + s->req =3D scsi_req_new(scsi_dev, tag, cbw.lun, + cbw.cmd, cbw.cmd_len, NULL); + if (s->commandlog) { + scsi_req_print(s->req); + } + len =3D scsi_req_enqueue(s->req); + if (len) { + scsi_req_continue(s->req); + } + break; =20 - switch (p->pid) { - case USB_TOKEN_OUT: - if (devep !=3D 2) + case USB_MSDM_DATAOUT: + trace_usb_msd_data_out(p->iov.size, s->data_len); + if (p->iov.size > s->data_len) { goto fail; + } =20 - switch (s->mode) { - case USB_MSDM_CBW: - if (p->iov.size !=3D 31) { - error_report("usb-msd: Bad CBW size"); - goto fail; - } - usb_packet_copy(p, &cbw, 31); - if (le32_to_cpu(cbw.sig) !=3D 0x43425355) { - error_report("usb-msd: Bad signature %08x", - le32_to_cpu(cbw.sig)); - goto fail; - } - scsi_dev =3D scsi_device_find(&s->bus, 0, 0, cbw.lun); - if (scsi_dev =3D=3D NULL) { - error_report("usb-msd: Bad LUN %d", cbw.lun); - goto fail; - } - tag =3D le32_to_cpu(cbw.tag); - s->data_len =3D le32_to_cpu(cbw.data_len); - if (s->data_len =3D=3D 0) { - s->mode =3D USB_MSDM_CSW; - } else if (cbw.flags & 0x80) { - s->mode =3D USB_MSDM_DATAIN; - } else { - s->mode =3D USB_MSDM_DATAOUT; - } - trace_usb_msd_cmd_submit(cbw.lun, tag, cbw.flags, - cbw.cmd_len, s->data_len); - assert(le32_to_cpu(s->csw.residue) =3D=3D 0); - s->scsi_len =3D 0; - s->req =3D scsi_req_new(scsi_dev, tag, cbw.lun, cbw.cmd, cbw.c= md_len, NULL); - if (s->commandlog) { - scsi_req_print(s->req); - } - len =3D scsi_req_enqueue(s->req); + if (s->scsi_len) { + usb_msd_copy_data(s, p); + } + if (le32_to_cpu(s->csw.residue)) { + len =3D p->iov.size - p->actual_length; if (len) { - scsi_req_continue(s->req); + 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; + } } - break; + } + if (p->actual_length < p->iov.size) { + trace_usb_msd_packet_async(); + s->packet =3D p; + p->status =3D USB_RET_ASYNC; + } + break; =20 - case USB_MSDM_DATAOUT: - trace_usb_msd_data_out(p->iov.size, s->data_len); - if (p->iov.size > s->data_len) { - goto fail; - } + default: + goto fail; + } + return; =20 - if (s->scsi_len) { - usb_msd_copy_data(s, p); - } - if (le32_to_cpu(s->csw.residue)) { - 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) { - trace_usb_msd_packet_async(); - s->packet =3D p; - p->status =3D USB_RET_ASYNC; - } - break; +fail: + p->status =3D USB_RET_STALL; +} =20 - default: +static void usb_msd_handle_data_in(USBDevice *dev, USBPacket *p) +{ + MSDState *s =3D (MSDState *)dev; + int len; + + switch (s->mode) { + case USB_MSDM_DATAOUT: + if (s->data_len !=3D 0 || p->iov.size < 13) { goto fail; } + /* Waiting for SCSI write to complete. */ + trace_usb_msd_packet_async(); + s->packet =3D p; + p->status =3D USB_RET_ASYNC; break; =20 - case USB_TOKEN_IN: - if (devep !=3D 1) + case USB_MSDM_CSW: + if (p->iov.size < 13) { goto fail; + } =20 - switch (s->mode) { - case USB_MSDM_DATAOUT: - if (s->data_len !=3D 0 || p->iov.size < 13) { - goto fail; - } - /* Waiting for SCSI write to complete. */ + if (s->req) { + /* still in flight */ trace_usb_msd_packet_async(); s->packet =3D p; p->status =3D USB_RET_ASYNC; - break; + } else { + usb_msd_send_status(s, p); + s->mode =3D USB_MSDM_CBW; + } + break; =20 - case USB_MSDM_CSW: - if (p->iov.size < 13) { - goto fail; + case USB_MSDM_DATAIN: + trace_usb_msd_data_in(p->iov.size, s->data_len, s->scsi_len); + if (s->scsi_len) { + usb_msd_copy_data(s, p); + } + if (le32_to_cpu(s->csw.residue)) { + 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 && s->mode =3D=3D USB_MSDM_DATA= IN) { + trace_usb_msd_packet_async(); + s->packet =3D p; + p->status =3D USB_RET_ASYNC; + } + break; =20 - if (s->req) { - /* still in flight */ - trace_usb_msd_packet_async(); - s->packet =3D p; - p->status =3D USB_RET_ASYNC; - } else { - usb_msd_send_status(s, p); - s->mode =3D USB_MSDM_CBW; - } - break; + default: + goto fail; + } + return; =20 - case USB_MSDM_DATAIN: - trace_usb_msd_data_in(p->iov.size, s->data_len, s->scsi_len); - if (s->scsi_len) { - usb_msd_copy_data(s, p); - } - if (le32_to_cpu(s->csw.residue)) { - 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 && s->mode =3D=3D USB_MSDM_= DATAIN) { - trace_usb_msd_packet_async(); - s->packet =3D p; - p->status =3D USB_RET_ASYNC; - } - break; +fail: + p->status =3D USB_RET_STALL; +} + +static void usb_msd_handle_data(USBDevice *dev, USBPacket *p) +{ + MSDState *s =3D (MSDState *)dev; + uint8_t devep =3D p->ep->nr; =20 - default: + if (s->needs_reset) { + p->status =3D USB_RET_STALL; + return; + } + + switch (p->pid) { + case USB_TOKEN_OUT: + if (devep !=3D 2) { + goto fail; + } + usb_msd_handle_data_out(dev, p); + break; + + case USB_TOKEN_IN: + if (devep !=3D 1) { goto fail; } + usb_msd_handle_data_in(dev, p); break; =20 default: --=20 2.47.1