From patchwork Thu Jul 20 14:20:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 791608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xCx7N2CGlz9rxl for ; Fri, 21 Jul 2017 00:27:27 +1000 (AEST) Received: from localhost ([::1]:38303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYCQF-0004xn-CH for incoming@patchwork.ozlabs.org; Thu, 20 Jul 2017 10:27:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYCKB-0008My-Ot for qemu-devel@nongnu.org; Thu, 20 Jul 2017 10:21:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYCK6-0007yR-PA for qemu-devel@nongnu.org; Thu, 20 Jul 2017 10:21:07 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:42650 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 1dYCK6-0007xa-GC for qemu-devel@nongnu.org; Thu, 20 Jul 2017 10:21:02 -0400 Received: (qmail 15331 invoked by uid 89); 20 Jul 2017 14:21:00 -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/23580. avast: 1.2.2/17010300. spamassassin: 3.4.1. Clear:RC:1(195.62.97.28):. Processed in 0.283847 secs); 20 Jul 2017 14:21:00 -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); 20 Jul 2017 14:20:57 -0000 X-GL_Whitelist: yes Received: (qmail 5157 invoked from network); 20 Jul 2017 14:20:43 -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; 20 Jul 2017 14:20:43 -0000 Received: by lieven-pc (Postfix, from userid 1000) id 30D1C26C5E; Thu, 20 Jul 2017 16:20:43 +0200 (CEST) From: Peter Lieven To: qemu-block@nongnu.org Date: Thu, 20 Jul 2017 16:20:40 +0200 Message-Id: <1500560441-5670-10-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500560441-5670-1-git-send-email-pl@kamp.de> References: <1500560441-5670-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 V4 09/10] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Peter Lieven --- block/qcow2-cluster.c | 15 +++++++++++++++ block/qcow2.c | 42 +++++++++++++++++++++++++++++++++++------- configure | 2 +- qapi/block-core.json | 14 ++++++++++++-- qemu-img.texi | 1 + 5 files changed, 64 insertions(+), 10 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 6c14d59..7d47dde 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" @@ -1504,6 +1507,18 @@ static int decompress_buffer(uint8_t *out_buf, int out_buf_size, inflateEnd(&z_strm); break; } +#ifdef CONFIG_LZO + case QCOW2_COMPRESS_FORMAT_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 57249cc..0ba5977 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" @@ -165,10 +168,18 @@ static ssize_t qcow2_crypto_hdr_write_func(QCryptoBlock *block, size_t offset, } -static void qcow2_compress_level_supported(int format, uint8_t level, +static void qcow2_compress_settings_supported(int format, uint8_t level, Error **errp) { - if (format == QCOW2_COMPRESS_FORMAT_ZLIB && level > 9) { +#ifndef CONFIG_LZO + if (format == QCOW2_COMPRESS_FORMAT_LZO) { + error_setg(errp, "ERROR: compress format '%s' is not supported", + Qcow2CompressFormat_lookup[format]); + return; + } +#endif + if ((format == QCOW2_COMPRESS_FORMAT_ZLIB && level > 9) || + (format == QCOW2_COMPRESS_FORMAT_LZO && level > 0)) { error_setg(errp, "ERROR: compress level %" PRIu8 " is not" " supported for format '%s'", level, Qcow2CompressFormat_lookup[format]); @@ -280,14 +291,22 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, return 4; } - qcow2_compress_level_supported(s->compress_format, - compress_ext.level, &local_err); + qcow2_compress_settings_supported(s->compress_format, + compress_ext.level, &local_err); if (local_err) { error_propagate(errp, local_err); return 5; } s->compress_level = compress_ext.level; +#ifdef CONFIG_LZO + if (s->compress_format == QCOW2_COMPRESS_FORMAT_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 %" PRIu8 "\n", Qcow2CompressFormat_lookup[s->compress_format], @@ -3078,8 +3097,8 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp) visit_free(v); QDECREF(compressopts); QDECREF(options); - qcow2_compress_level_supported(compress.format, compress.level, - &local_err); + qcow2_compress_settings_supported(compress.format, compress.level, + &local_err); if (local_err) { error_propagate(errp, local_err); goto finish; @@ -3394,7 +3413,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) { @@ -3446,6 +3465,14 @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset, ret = ret != Z_STREAM_END; break; +#ifdef CONFIG_LZO + case QCOW2_COMPRESS_FORMAT_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 */ } @@ -3491,6 +3518,7 @@ success: fail: qemu_vfree(local_buf); g_free(out_buf); + g_free(work_buf); return ret; } diff --git a/configure b/configure index befebe2..c28a45d 100755 --- a/configure +++ b/configure @@ -1982,7 +1982,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 95e5393..9eb76df 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2456,11 +2456,12 @@ ## # @Qcow2CompressFormat: # @zlib: standard zlib deflate compression +# @lzo: lzo1x compression # # Since: 2.10 ## { 'enum': 'Qcow2CompressFormat', - 'data': [ 'zlib' ] } + 'data': [ 'zlib', 'lzo' ] } ## # @Qcow2CompressZLib: @@ -2471,6 +2472,14 @@ 'data': { } } ## +# @Qcow2CompressLZO: +# +# Since: 2.10 +## +{ 'struct': 'Qcow2CompressLZO', + 'data': { } } + +## # @Qcow2Compress: # # Specifies the compression format and compression level that should @@ -2488,7 +2497,8 @@ 'base': { 'format': 'Qcow2CompressFormat', '*level': 'uint8' }, 'discriminator': 'format', - 'data': { 'zlib': 'Qcow2CompressZLib' } } + 'data': { 'zlib': 'Qcow2CompressZLib', + 'lzo': 'Qcow2CompressLZO' } } ## diff --git a/qemu-img.texi b/qemu-img.texi index fcc4c1d..17a17e5 100644 --- a/qemu-img.texi +++ b/qemu-img.texi @@ -682,6 +682,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.