From nobody Mon Feb 9 16:18:40 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548833828138185.59459471810237; Tue, 29 Jan 2019 23:37:08 -0800 (PST) Received: from localhost ([127.0.0.1]:33523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gokQa-0006B2-4N for importer@patchew.org; Wed, 30 Jan 2019 02:36:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gokOS-0004v5-Op for qemu-devel@nongnu.org; Wed, 30 Jan 2019 02:34:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gokOR-00077e-9W for qemu-devel@nongnu.org; Wed, 30 Jan 2019 02:34:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37882) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gokOL-00074p-F4 for qemu-devel@nongnu.org; Wed, 30 Jan 2019 02:34:40 -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 mx1.redhat.com (Postfix) with ESMTPS id 92E10C05CDFC; Wed, 30 Jan 2019 07:34:35 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-190.ams2.redhat.com [10.36.117.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 338A061370; Wed, 30 Jan 2019 07:34:31 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 968C87703; Wed, 30 Jan 2019 08:34:26 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 30 Jan 2019 08:34:24 +0100 Message-Id: <20190130073426.11525-7-kraxel@redhat.com> In-Reply-To: <20190130073426.11525-1-kraxel@redhat.com> References: <20190130073426.11525-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 30 Jan 2019 07:34:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 6/8] usb-mtp: Reallocate buffer in multiples of MTP_WRITE_BUF_SZ 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: Bandan Das , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Bandan Das This is a "pre-patch" to breaking up the write buffer for MTP writes. Instead of allocating a mtp buffer equal to size sent by the initiator, we start with a small size and reallocate multiples (of that small size) as needed. Signed-off-by: Bandan Das Message-id: 20190129131908.27924-2-bsd@redhat.com Signed-off-by: Gerd Hoffmann --- hw/usb/dev-mtp.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 837c9d9449..2e342c7745 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -25,6 +25,7 @@ #include "trace.h" #include "hw/usb.h" #include "desc.h" +#include "qemu/units.h" =20 /* -----------------------------------------------------------------------= */ =20 @@ -152,7 +153,6 @@ struct MTPData { bool first; /* Used for >4G file sizes */ bool pending; - uint64_t cached_length; int fd; }; =20 @@ -244,6 +244,7 @@ typedef struct { =20 #define MTP_MANUFACTURER "QEMU" #define MTP_PRODUCT "QEMU filesharing" +#define MTP_WRITE_BUF_SZ (512 * KiB) =20 enum { STR_MANUFACTURER =3D 1, @@ -1659,7 +1660,7 @@ static void usb_mtp_write_data(MTPState *s) d->fd =3D mkdir(path, mask); goto free; } - if ((s->dataset.size !=3D 0xFFFFFFFF) && (s->dataset.size < d->len= gth)) { + if ((s->dataset.size !=3D 0xFFFFFFFF) && (s->dataset.size !=3D d->= offset)) { usb_mtp_queue_result(s, RES_STORE_FULL, d->trans, 0, 0, 0, 0); goto done; @@ -1777,17 +1778,21 @@ static void usb_mtp_get_data(MTPState *s, mtp_conta= iner *container, total_len =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, total_len); - d->length +=3D total_len; + if (total_len < MTP_WRITE_BUF_SZ) { + usb_mtp_realloc(d, total_len); + d->length +=3D total_len; + } else { + usb_mtp_realloc(d, MTP_WRITE_BUF_SZ - sizeof(mtp_container= )); + d->length +=3D MTP_WRITE_BUF_SZ - sizeof(mtp_container); + } d->offset =3D 0; - d->cached_length =3D total_len; d->first =3D false; d->pending =3D false; } =20 if (d->pending) { - usb_mtp_realloc(d, d->cached_length); - d->length +=3D d->cached_length; + usb_mtp_realloc(d, MTP_WRITE_BUF_SZ); + d->length +=3D MTP_WRITE_BUF_SZ; d->pending =3D false; } =20 @@ -1795,12 +1800,6 @@ static void usb_mtp_get_data(MTPState *s, mtp_contai= ner *container, dlen =3D data_len; } else { dlen =3D d->length - d->offset; - /* Check for cached data for large files */ - if ((s->dataset.size =3D=3D 0xFFFFFFFF) && (dlen < p->iov.size)) { - usb_mtp_realloc(d, p->iov.size - dlen); - d->length +=3D p->iov.size - dlen; - dlen =3D p->iov.size; - } } =20 switch (d->code) { @@ -1822,7 +1821,7 @@ static void usb_mtp_get_data(MTPState *s, mtp_contain= er *container, d->offset +=3D dlen; if ((p->iov.size % 64) || !p->iov.size) { assert((s->dataset.size =3D=3D 0xFFFFFFFF) || - (s->dataset.size =3D=3D d->length)); + (s->dataset.size =3D=3D d->offset)); =20 usb_mtp_write_data(s); usb_mtp_data_free(s->data_out); --=20 2.9.3