From patchwork Thu Jun 29 10:57:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 9816399 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 43C1E6035F for ; Thu, 29 Jun 2017 10:58:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36BF42811E for ; Thu, 29 Jun 2017 10:58:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B45C286D1; Thu, 29 Jun 2017 10:58:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B63CB2811E for ; Thu, 29 Jun 2017 10:58:55 +0000 (UTC) Received: from localhost ([::1]:38307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQX9y-00075K-5t for patchwork-qemu-devel@patchwork.kernel.org; Thu, 29 Jun 2017 06:58:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQX8d-00071o-A8 for qemu-devel@nongnu.org; Thu, 29 Jun 2017 06:57:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQX8b-00080f-2c for qemu-devel@nongnu.org; Thu, 29 Jun 2017 06:57:30 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:42015 helo=mx01.kamp.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dQX8a-0007wn-Pz for qemu-devel@nongnu.org; Thu, 29 Jun 2017 06:57:29 -0400 Received: (qmail 8998 invoked by uid 89); 29 Jun 2017 10:57:24 -0000 Received: from [195.62.97.28] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.99.2/23517. avast: 1.2.2/17010300. spamassassin: 3.4.1. Clear:RC:1(195.62.97.28):. Processed in 0.329586 secs); 29 Jun 2017 10:57:24 -0000 Received: from smtp.kamp.de (HELO submission.kamp.de) ([195.62.97.28]) by mx01.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted); 29 Jun 2017 10:57:21 -0000 X-GL_Whitelist: yes Received: (qmail 12788 invoked from network); 29 Jun 2017 10:57:15 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 29 Jun 2017 10:57:15 -0000 Received: by lieven-pc (Postfix, from userid 1000) id B223626C62; Thu, 29 Jun 2017 12:57:15 +0200 (CEST) From: Peter Lieven To: qemu-block@nongnu.org Date: Thu, 29 Jun 2017 12:57:11 +0200 Message-Id: <1498733831-15254-9-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1498733831-15254-1-git-send-email-pl@kamp.de> References: <1498733831-15254-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a02:248:0:51::16 Subject: [Qemu-devel] [PATCH V2 8/8] block/qcow2: add lzo compress format 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 Lieven , qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org, lersek@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Peter Lieven --- block/qcow2-cluster.c | 15 +++++++++++++++ block/qcow2.c | 26 +++++++++++++++++++++++++- block/qcow2.h | 1 + configure | 2 +- qapi/block-core.json | 14 ++++++++++++-- qemu-img.texi | 1 + 6 files changed, 55 insertions(+), 4 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 353ac87..666d090 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -24,6 +24,9 @@ #include "qemu/osdep.h" #include +#ifdef CONFIG_LZO +#include +#endif #include "qapi/error.h" #include "qemu-common.h" @@ -1546,6 +1549,18 @@ static int decompress_buffer(uint8_t *out_buf, int out_buf_size, inflateEnd(&z_strm); break; } +#ifdef CONFIG_LZO + case QCOW2_COMPRESS_LZO: + out_len = out_buf_size; + ret = lzo1x_decompress_safe(buf, buf_size, out_buf, + (lzo_uint *) &out_len, NULL); + if (ret == LZO_E_INPUT_NOT_CONSUMED) { + /* We always read up to the next sector boundary. Thus + * buf_size may be larger than the original compressed size. */ + ret = 0; + } + break; +#endif default: abort(); /* should never reach this point */ } diff --git a/block/qcow2.c b/block/qcow2.c index b41e58d..ef94193 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -26,6 +26,9 @@ #include "sysemu/block-backend.h" #include "qemu/module.h" #include +#ifdef CONFIG_LZO +#include +#endif #include "block/qcow2.h" #include "qemu/error-report.h" #include "qapi/qmp/qerror.h" @@ -83,6 +86,10 @@ static int qcow2_compress_format_from_name(char *fmt) return QCOW2_COMPRESS_ZLIB_COMPAT; } else if (g_str_equal(fmt, "zlib")) { return QCOW2_COMPRESS_ZLIB; +#ifdef CONFIG_LZO + } else if (g_str_equal(fmt, "lzo")) { + return QCOW2_COMPRESS_LZO; +#endif } else { return -EINVAL; } @@ -92,6 +99,7 @@ static int qcow2_compress_level_supported(int id, uint64_t level) { if ((id == QCOW2_COMPRESS_ZLIB_COMPAT && level > 0) || (id == QCOW2_COMPRESS_ZLIB && level > 9) || + (id == QCOW2_COMPRESS_LZO && level > 0) || level > 0xff) { return -EINVAL; } @@ -197,6 +205,13 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, s->compress_format.level, s->compress_format.name); return 5; } +#ifdef CONFIG_LZO + if (s->compress_format_id == QCOW2_COMPRESS_LZO && + lzo_init() != LZO_E_OK) { + error_setg(errp, "ERROR: internal error - lzo_init() failed"); + return 6; + } +#endif #ifdef DEBUG_EXT printf("Qcow2: Got compress format %s with compress level %" @@ -2751,7 +2766,7 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset, z_stream z_strm = {}; int z_windowBits = -15, z_level = Z_DEFAULT_COMPRESSION; int ret, out_len = 0; - uint8_t *buf, *out_buf = NULL, *local_buf = NULL; + uint8_t *buf, *out_buf = NULL, *local_buf = NULL, *work_buf = NULL; uint64_t cluster_offset; if (bytes == 0) { @@ -2803,6 +2818,14 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset, ret = ret != Z_STREAM_END; break; +#ifdef CONFIG_LZO + case QCOW2_COMPRESS_LZO: + out_buf = g_malloc(s->cluster_size + s->cluster_size / 16 + 64 + 3); + work_buf = g_malloc(LZO1X_1_MEM_COMPRESS); + ret = lzo1x_1_compress(buf, s->cluster_size, out_buf, + (lzo_uint *) &out_len, work_buf); + break; +#endif default: abort(); /* should never reach this point */ } @@ -2848,6 +2871,7 @@ success: fail: qemu_vfree(local_buf); g_free(out_buf); + g_free(work_buf); return ret; } diff --git a/block/qcow2.h b/block/qcow2.h index 4ceaba1..038688d 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -177,6 +177,7 @@ enum { * is specified at create time */ QCOW2_COMPRESS_ZLIB_COMPAT = 0, QCOW2_COMPRESS_ZLIB = 1, + QCOW2_COMPRESS_LZO = 2, }; enum { diff --git a/configure b/configure index c571ad1..81d3286 100755 --- a/configure +++ b/configure @@ -1890,7 +1890,7 @@ if test "$lzo" != "no" ; then int main(void) { lzo_version(); return 0; } EOF if compile_prog "" "-llzo2" ; then - libs_softmmu="$libs_softmmu -llzo2" + LIBS="$LIBS -llzo2" lzo="yes" else if test "$lzo" = "yes"; then diff --git a/qapi/block-core.json b/qapi/block-core.json index 1574ffb..736073a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2284,11 +2284,12 @@ ## # @Qcow2CompressFormat: # @zlib: standard zlib deflate compression +# @lzo: lzo1x compression # # Since: 2.10 ## { 'enum': 'Qcow2CompressFormat', - 'data': [ 'zlib' ] } + 'data': [ 'zlib', 'lzo' ] } ## # @Qcow2CompressZLib: @@ -2299,6 +2300,14 @@ 'data': { } } ## +# @Qcow2CompressLZO: +# +# Since: 2.10 +## +{ 'struct': 'Qcow2CompressLZO', + 'data': { } } + +## # @Qcow2Compress: # # Specifies the compression format and compression level that should @@ -2316,7 +2325,8 @@ 'base': { 'format': 'Qcow2CompressFormat', 'level': 'uint8' }, 'discriminator': 'format', - 'data': { 'zlib': 'Qcow2CompressZLib' } } + 'data': { 'zlib': 'Qcow2CompressZLib', + 'lzo': 'Qcow2CompressLZO' } } ## # @BlockdevOptionsQcow2: diff --git a/qemu-img.texi b/qemu-img.texi index 430f0b9..fda0e50 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -627,6 +627,7 @@ The following options are available if support for the respective libraries has been enabled at compile time: zlib Uses standard zlib compression + lzo Uses LZO1X compression The compression algorithm can only be defined at image create time and cannot be changed later.