From nobody Wed Apr 16 11:40:12 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544621702179879.9281331322716; Wed, 12 Dec 2018 05:35:02 -0800 (PST) Received: from localhost ([::1]:44924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX4fF-0007nj-0t for importer@patchew.org; Wed, 12 Dec 2018 08:35:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX4Yi-0002hk-Eu for qemu-devel@nongnu.org; Wed, 12 Dec 2018 08:28:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX4Yh-0001Fh-HL for qemu-devel@nongnu.org; Wed, 12 Dec 2018 08:28:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50270) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gX4Yc-00015m-1K; Wed, 12 Dec 2018 08:28:10 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5A81A308624F; Wed, 12 Dec 2018 13:28:09 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-245.ams2.redhat.com [10.36.117.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AE9A60C44; Wed, 12 Dec 2018 13:28:08 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Wed, 12 Dec 2018 14:27:07 +0100 Message-Id: <20181212132735.16080-14-kwolf@redhat.com> In-Reply-To: <20181212132735.16080-1-kwolf@redhat.com> References: <20181212132735.16080-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 12 Dec 2018 13:28:09 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 13/41] qcow2: do decompression in threads 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Do decompression in threads, like it is already done for compression. This improves asynchronous compressed reads performance. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia Signed-off-by: Kevin Wolf --- block/qcow2.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index c1886c46e3..0b5ad13006 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3807,20 +3807,24 @@ static ssize_t qcow2_decompress(void *dest, size_t = dest_size, =20 #define MAX_COMPRESS_THREADS 4 =20 +typedef ssize_t (*Qcow2CompressFunc)(void *dest, size_t dest_size, + const void *src, size_t src_size); typedef struct Qcow2CompressData { void *dest; size_t dest_size; const void *src; size_t src_size; ssize_t ret; + + Qcow2CompressFunc func; } Qcow2CompressData; =20 static int qcow2_compress_pool_func(void *opaque) { Qcow2CompressData *data =3D opaque; =20 - data->ret =3D qcow2_compress(data->dest, data->dest_size, - data->src, data->src_size); + data->ret =3D data->func(data->dest, data->dest_size, + data->src, data->src_size); =20 return 0; } @@ -3830,10 +3834,9 @@ static void qcow2_compress_complete(void *opaque, in= t ret) qemu_coroutine_enter(opaque); } =20 -/* See qcow2_compress definition for parameters description */ -static ssize_t qcow2_co_compress(BlockDriverState *bs, - void *dest, size_t dest_size, - const void *src, size_t src_size) +static ssize_t coroutine_fn +qcow2_co_do_compress(BlockDriverState *bs, void *dest, size_t dest_size, + const void *src, size_t src_size, Qcow2CompressFunc f= unc) { BDRVQcow2State *s =3D bs->opaque; BlockAIOCB *acb; @@ -3843,6 +3846,7 @@ static ssize_t qcow2_co_compress(BlockDriverState *bs, .dest_size =3D dest_size, .src =3D src, .src_size =3D src_size, + .func =3D func, }; =20 while (s->nb_compress_threads >=3D MAX_COMPRESS_THREADS) { @@ -3865,6 +3869,22 @@ static ssize_t qcow2_co_compress(BlockDriverState *b= s, return arg.ret; } =20 +static ssize_t coroutine_fn +qcow2_co_compress(BlockDriverState *bs, void *dest, size_t dest_size, + const void *src, size_t src_size) +{ + return qcow2_co_do_compress(bs, dest, dest_size, src, src_size, + qcow2_compress); +} + +static ssize_t coroutine_fn +qcow2_co_decompress(BlockDriverState *bs, void *dest, size_t dest_size, + const void *src, size_t src_size) +{ + return qcow2_co_do_compress(bs, dest, dest_size, src, src_size, + qcow2_decompress); +} + /* XXX: put compressed sectors first, then all the cluster aligned tables to avoid losing bytes in alignment */ static coroutine_fn int @@ -3993,7 +4013,7 @@ qcow2_co_preadv_compressed(BlockDriverState *bs, goto fail; } =20 - if (qcow2_decompress(out_buf, s->cluster_size, buf, csize) < 0) { + if (qcow2_co_decompress(bs, out_buf, s->cluster_size, buf, csize) < 0)= { ret =3D -EIO; goto fail; } --=20 2.19.2