From nobody Fri Oct 24 12:05:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519167718916833.3123048378013; Tue, 20 Feb 2018 15:01:58 -0800 (PST) Received: from localhost ([::1]:58142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoGv2-00044w-6c for importer@patchew.org; Tue, 20 Feb 2018 18:01:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eoGsp-0002lA-8A for qemu-devel@nongnu.org; Tue, 20 Feb 2018 17:59:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eoGsk-0005ii-2d for qemu-devel@nongnu.org; Tue, 20 Feb 2018 17:59:35 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39916 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eoGsj-0005iJ-Sl for qemu-devel@nongnu.org; Tue, 20 Feb 2018 17:59:30 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D3807C6A0; Tue, 20 Feb 2018 22:59:24 +0000 (UTC) Received: from gigantic.usersys.redhat.com (dhcp-17-169.bos.redhat.com [10.18.17.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 576AAAF00C; Tue, 20 Feb 2018 22:59:24 +0000 (UTC) From: Bandan Das To: qemu-devel@nongnu.org Date: Tue, 20 Feb 2018 17:59:03 -0500 Message-Id: <20180220225904.16129-5-bsd@redhat.com> In-Reply-To: <20180220225904.16129-1-bsd@redhat.com> References: <20180220225904.16129-1-bsd@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 20 Feb 2018 22:59:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 20 Feb 2018 22:59:24 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'bsd@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v4 4/5] usb-mtp: Introduce write support for MTP objects X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Allow write operations on behalf of the initiator. The precursor to write is the sending of the write metadata that consists of the ObjectInfo dataset. This patch introduces a flag that is set when the responder is ready to receive write data based on a previous SendObjectInfo operation by the initiator (The SendObjectInfo implementation is in a later patch) Signed-off-by: Bandan Das --- hw/usb/dev-mtp.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 150 insertions(+), 2 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 5ef77f3e9f..9b51708614 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -47,6 +47,7 @@ enum mtp_code { CMD_GET_OBJECT_INFO =3D 0x1008, CMD_GET_OBJECT =3D 0x1009, CMD_DELETE_OBJECT =3D 0x100b, + CMD_SEND_OBJECT =3D 0x100d, CMD_GET_PARTIAL_OBJECT =3D 0x101b, CMD_GET_OBJECT_PROPS_SUPPORTED =3D 0x9801, CMD_GET_OBJECT_PROP_DESC =3D 0x9802, @@ -63,9 +64,11 @@ enum mtp_code { RES_INVALID_STORAGE_ID =3D 0x2008, RES_INVALID_OBJECT_HANDLE =3D 0x2009, RES_INVALID_OBJECT_FORMAT_CODE =3D 0x200b, + RES_STORE_FULL =3D 0x200c, RES_STORE_READ_ONLY =3D 0x200e, RES_PARTIAL_DELETE =3D 0x2012, RES_SPEC_BY_FORMAT_UNSUPPORTED =3D 0x2014, + RES_INVALID_OBJECTINFO =3D 0x2015, RES_INVALID_PARENT_OBJECT =3D 0x201a, RES_INVALID_PARAMETER =3D 0x201d, RES_SESSION_ALREADY_OPEN =3D 0x201e, @@ -183,6 +186,14 @@ struct MTPState { int inotifyfd; QTAILQ_HEAD(events, MTPMonEntry) events; #endif + /* Responder is expecting a write operation */ + bool write_pending; + struct { + uint32_t parent_handle; + uint16_t format; + uint32_t size; + char *filename; + } dataset; }; =20 #define TYPE_USB_MTP "usb-mtp" @@ -804,6 +815,7 @@ static MTPData *usb_mtp_get_device_info(MTPState *s, MT= PControl *c) CMD_GET_OBJECT_HANDLES, CMD_GET_OBJECT_INFO, CMD_DELETE_OBJECT, + CMD_SEND_OBJECT, CMD_GET_OBJECT, CMD_GET_PARTIAL_OBJECT, CMD_GET_OBJECT_PROPS_SUPPORTED, @@ -1378,6 +1390,14 @@ static void usb_mtp_command(MTPState *s, MTPControl = *c) nres =3D 1; res0 =3D data_in->length; break; + case CMD_SEND_OBJECT: + if (!s->write_pending) { + usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, + c->trans, 0, 0, 0, 0); + return; + } + s->data_out =3D usb_mtp_data_alloc(c); + return; case CMD_GET_OBJECT_PROPS_SUPPORTED: if (c->argv[0] !=3D FMT_UNDEFINED_OBJECT && c->argv[0] !=3D FMT_ASSOCIATION) { @@ -1472,12 +1492,126 @@ static void usb_mtp_cancel_packet(USBDevice *dev, = USBPacket *p) fprintf(stderr, "%s\n", __func__); } =20 +static void usb_mtp_write_data(MTPState *s) +{ + MTPData *d =3D s->data_out; + MTPObject *parent =3D + usb_mtp_object_lookup(s, s->dataset.parent_handle); + char *path =3D NULL; + int rc =3D -1; + mode_t mask =3D 0644; + + assert(d !=3D NULL); + + if (parent =3D=3D NULL || !s->write_pending) { + usb_mtp_queue_result(s, RES_INVALID_OBJECTINFO, d->trans, + 0, 0, 0, 0); + return; + } + + if (s->dataset.filename) { + path =3D g_strdup_printf("%s/%s", parent->path, s->dataset.filenam= e); + if (s->dataset.format =3D=3D FMT_ASSOCIATION) { + d->fd =3D mkdir(path, mask); + goto free; + } + if (s->dataset.size < d->length) { + usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, + 0, 0, 0, 0); + goto done; + } + d->fd =3D open(path, O_CREAT | O_WRONLY, mask); + if (d->fd =3D=3D -1) { + usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, + 0, 0, 0, 0); + goto done; + } + + /* + * Return success if initiator sent 0 sized data + */ + if (!s->dataset.size) { + goto success; + } + + rc =3D write(d->fd, d->data, s->dataset.size); + if (rc =3D=3D -1) { + usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, + 0, 0, 0, 0); + goto done; + } + if (rc !=3D s->dataset.size) { + usb_mtp_queue_result(s, RES_INCOMPLETE_TRANSFER, d->trans, + 0, 0, 0, 0); + goto done; + } + } + +success: + usb_mtp_queue_result(s, RES_OK, d->trans, + 0, 0, 0, 0); + +done: + /* + * The write dataset is kept around and freed only + * on success or if another write request comes in + */ + if (d->fd !=3D -1) { + close(d->fd); + } +free: + g_free(s->dataset.filename); + g_free(path); + s->write_pending =3D false; +} + +static void usb_mtp_get_data(MTPState *s, mtp_container *container, + USBPacket *p) +{ + MTPData *d =3D s->data_out; + uint64_t dlen; + uint32_t data_len =3D p->iov.size; + + if (d->first) { + /* Total length of incoming data */ + d->length =3D cpu_to_le32(container->length) - sizeof(mtp_containe= r); + /* Length of data in this packet */ + data_len -=3D sizeof(mtp_container); + usb_mtp_realloc(d, d->length); + d->offset =3D 0; + d->first =3D false; + } + + if (d->length - d->offset > data_len) { + dlen =3D data_len; + } else { + dlen =3D d->length - d->offset; + } + + switch (d->code) { + case CMD_SEND_OBJECT: + usb_packet_copy(p, d->data + d->offset, dlen); + d->offset +=3D dlen; + if (d->offset =3D=3D d->length) { + usb_mtp_write_data(s); + usb_mtp_data_free(s->data_out); + s->data_out =3D NULL; + return; + } + break; + default: + p->status =3D USB_RET_STALL; + return; + } +} + static void usb_mtp_handle_data(USBDevice *dev, USBPacket *p) { MTPState *s =3D USB_MTP(dev); MTPControl cmd; mtp_container container; uint32_t params[5]; + uint16_t container_type; int i, rc; =20 switch (p->ep->nr) { @@ -1567,8 +1701,13 @@ static void usb_mtp_handle_data(USBDevice *dev, USBP= acket *p) p->status =3D USB_RET_STALL; return; } - usb_packet_copy(p, &container, sizeof(container)); - switch (le16_to_cpu(container.type)) { + if (s->data_out && !s->data_out->first) { + container_type =3D TYPE_DATA; + } else { + usb_packet_copy(p, &container, sizeof(container)); + container_type =3D le16_to_cpu(container.type); + } + switch (container_type) { case TYPE_COMMAND: if (s->data_in || s->data_out || s->result) { trace_usb_mtp_stall(s->dev.addr, "transaction inflight"); @@ -1599,6 +1738,15 @@ static void usb_mtp_handle_data(USBDevice *dev, USBP= acket *p) (cmd.argc > 4) ? cmd.argv[4] : 0); usb_mtp_command(s, &cmd); break; + case TYPE_DATA: + /* One of the previous transfers has already errored but the + * responder is still sending data associated with it + */ + if (s->result !=3D NULL) { + return; + } + usb_mtp_get_data(s, &container, p); + break; default: /* not needed as long as the mtp device is read-only */ p->status =3D USB_RET_STALL; --=20 2.14.3