From nobody Sat Feb 7 21:15:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1562152066; cv=none; d=zoho.com; s=zohoarc; b=YnKRSQY3Wj81TUqJAk44SXniRZwSEfg8uWzdjL7Z9JdljIHE3fbq99FAIpiGPgow2baMvw3qBt8tOuR7qYvP4P5oUbv0xDjokxmBbpGVGLt97RTl1x7zPQt+ocA87X2BJbbVDZvT7ArclfPM/LBxEhUQNYe4TT98SdaXTlRRvEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562152066; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=JGBV/V4wIhr0SJsjU09LPdi5e7AszN7O6BnjldrRTD0=; b=JebJJJ/6XNXOPGD6VfzJsnlE4dxnYSHPxcDruwhrfKeGjslclSjOsHTPLuJ6kWIXQgtWd4PlOue2FMSE9V7dyhQbUc1yrx+z24P+9sO3sXifuInnM0wtIshkdHzxaN7qhlAT5EgN7i6YSlc8ZVwOY7eb30HQv8wLLiDhA97zNvQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562152066109381.67996412011667; Wed, 3 Jul 2019 04:07:46 -0700 (PDT) Received: from localhost ([::1]:34906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hid71-0007Ao-2j for importer@patchew.org; Wed, 03 Jul 2019 07:07:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59819) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hid15-0000Wt-0R for qemu-devel@nongnu.org; Wed, 03 Jul 2019 07:01:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hid0q-0004Wb-Kk for qemu-devel@nongnu.org; Wed, 03 Jul 2019 07:01:26 -0400 Received: from relay.sw.ru ([185.231.240.75]:59422) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hid0V-0003pD-58; Wed, 03 Jul 2019 07:00:59 -0400 Received: from [10.94.4.71] (helo=dptest2.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hid0P-0004EW-JD; Wed, 03 Jul 2019 14:00:53 +0300 From: Denis Plotnikov To: kwolf@redhat.com, mreitz@redhat.com, eblake@redhat.com, armbru@redhat.com Date: Wed, 3 Jul 2019 14:00:43 +0300 Message-Id: <20190703110044.25610-3-dplotnikov@virtuozzo.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190703110044.25610-1-dplotnikov@virtuozzo.com> References: <20190703110044.25610-1-dplotnikov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v1 2/3] qcow2: rework the cluster compression routine 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: vsementsov@virtuozzo.com, den@virtuozzo.com, qemu-block@nongnu.org, qemu-devel@nongnu.org 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" The patch allow to process image compression type defined in the image header and choose an appropriate method for image clusters (de)compression. Signed-off-by: Denis Plotnikov --- block/qcow2.c | 93 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 20 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 921eb67b80..37a563a671 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4005,8 +4005,11 @@ fail: } =20 /* - * qcow2_compress() + * qcow2_zlib_compress() * + * Compress @src_size bytes of data using zlib compression method + * + * @dest_size bytes. * @dest - destination buffer, @dest_size bytes * @src - source buffer, @src_size bytes * @@ -4014,8 +4017,8 @@ fail: * -1 destination buffer is not enough to store compressed data * -2 on any other error */ -static ssize_t qcow2_compress(void *dest, size_t dest_size, - const void *src, size_t src_size) +static ssize_t qcow2_zlib_compress(void *dest, size_t dest_size, + const void *src, size_t src_size) { ssize_t ret; z_stream strm; @@ -4025,7 +4028,7 @@ static ssize_t qcow2_compress(void *dest, size_t dest= _size, ret =3D deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, -12, 9, Z_DEFAULT_STRATEGY); if (ret !=3D Z_OK) { - return -2; + return -EIO; } =20 /* strm.next_in is not const in old zlib versions, such as those used = on @@ -4039,7 +4042,7 @@ static ssize_t qcow2_compress(void *dest, size_t dest= _size, if (ret =3D=3D Z_STREAM_END) { ret =3D dest_size - strm.avail_out; } else { - ret =3D (ret =3D=3D Z_OK ? -1 : -2); + ret =3D (ret =3D=3D Z_OK ? -ENOMEM : -EIO); } =20 deflateEnd(&strm); @@ -4048,10 +4051,10 @@ static ssize_t qcow2_compress(void *dest, size_t de= st_size, } =20 /* - * qcow2_decompress() + * qcow2_zlib_decompress() * * Decompress some data (not more than @src_size bytes) to produce exactly - * @dest_size bytes. + * @dest_size bytes using zlib compression method * * @dest - destination buffer, @dest_size bytes * @src - source buffer, @src_size bytes @@ -4059,8 +4062,8 @@ static ssize_t qcow2_compress(void *dest, size_t dest= _size, * Returns: 0 on success * -1 on fail */ -static ssize_t qcow2_decompress(void *dest, size_t dest_size, - const void *src, size_t src_size) +static ssize_t qcow2_zlib_decompress(void *dest, size_t dest_size, + const void *src, size_t src_size) { int ret =3D 0; z_stream strm; @@ -4073,7 +4076,7 @@ static ssize_t qcow2_decompress(void *dest, size_t de= st_size, =20 ret =3D inflateInit2(&strm, -12); if (ret !=3D Z_OK) { - return -1; + return -EIO; } =20 ret =3D inflate(&strm, Z_FINISH); @@ -4081,7 +4084,7 @@ static ssize_t qcow2_decompress(void *dest, size_t de= st_size, /* We approve Z_BUF_ERROR because we need @dest buffer to be fille= d, but * @src buffer may be processed partly (because in qcow2 we know s= ize of * compressed data with precision of one sector) */ - ret =3D -1; + ret =3D -EIO; } =20 inflateEnd(&strm); @@ -4153,20 +4156,67 @@ qcow2_co_do_compress(BlockDriverState *bs, void *de= st, size_t dest_size, return arg.ret; } =20 +/* + * qcow2_co_compress() + * + * Compress @src_size bytes of data using the compression + * method defined by the image compression type + * + * @dest - destination buffer, @dest_size bytes + * @src - source buffer, @src_size bytes + * + * Returns: 0 on success + * a negative error code on fail + */ 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); + BDRVQcow2State *s =3D bs->opaque; + Qcow2CompressFunc fn; + + switch (s->compression_type) { + case QCOW2_COMPRESSION_TYPE_ZLIB: + fn =3D qcow2_zlib_compress; + break; + + default: + return -ENOTSUP; + } + + return qcow2_co_do_compress(bs, dest, dest_size, src, src_size, fn); } =20 +/* + * qcow2_co_decompress() + * + * Decompress some data (not more than @src_size bytes) to produce exactly + * @dest_size bytes using the compression method defined by the image + * compression type + * + * @dest - destination buffer, @dest_size bytes + * @src - source buffer, @src_size bytes + * + * Returns: 0 on success + * a negative error code on fail + */ 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); + BDRVQcow2State *s =3D bs->opaque; + Qcow2CompressFunc fn; + + switch (s->compression_type) { + case QCOW2_COMPRESSION_TYPE_ZLIB: + fn =3D qcow2_zlib_decompress; + break; + + default: + return -ENOTSUP; + } + + return qcow2_co_do_compress(bs, dest, dest_size, src, src_size, fn); } =20 /* XXX: put compressed sectors first, then all the cluster aligned @@ -4178,7 +4228,7 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uin= t64_t offset, BDRVQcow2State *s =3D bs->opaque; QEMUIOVector hd_qiov; int ret; - size_t out_len; + ssize_t out_len; uint8_t *buf, *out_buf; uint64_t cluster_offset; =20 @@ -4217,16 +4267,19 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, u= int64_t offset, =20 out_len =3D qcow2_co_compress(bs, out_buf, s->cluster_size - 1, buf, s->cluster_size); - if (out_len =3D=3D -2) { - ret =3D -EINVAL; - goto fail; - } else if (out_len =3D=3D -1) { + if (out_len =3D=3D -ENOMEM) { /* could not compress: write normal cluster */ ret =3D qcow2_co_pwritev(bs, offset, bytes, qiov, 0); if (ret < 0) { goto fail; } goto success; + } else if (out_len < 0) { + /* + * encounter other compression issues propagate error to the upper= level + */ + ret =3D out_len; + goto fail; } =20 qemu_co_mutex_lock(&s->lock); --=20 2.17.0