From patchwork Wed Jan 2 16:16:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 209091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E97422C007E for ; Thu, 3 Jan 2013 03:44:18 +1100 (EST) Received: from localhost ([::1]:60258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR1V-0003Xg-Aa for incoming@patchwork.ozlabs.org; Wed, 02 Jan 2013 11:18:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR1J-0003N9-0r for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:18:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TqR1D-0006HH-Fw for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:18:20 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:56260 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR1D-0006H9-2q for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:18:15 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 9B431874312; Wed, 2 Jan 2013 17:44:43 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id B01B787431F; Wed, 2 Jan 2013 17:42:39 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 2 Jan 2013 17:16:20 +0100 Message-Id: <1357143393-29832-18-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1357143393-29832-1-git-send-email-benoit@irqsave.net> References: <1357143393-29832-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V4 17/30] block: Add qemu-img dedup create option. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Benoit Canet --- block/qcow2.c | 113 +++++++++++++++++++++++++++++++++++++++------ block/qcow2.h | 2 + include/block/block_int.h | 1 + 3 files changed, 103 insertions(+), 13 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index ad399c8..9130638 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -274,6 +274,11 @@ int qcow2_mark_dirty(BlockDriverState *bs) return qcow2_add_feature(bs, QCOW2_INCOMPAT_DIRTY); } +static int qcow2_activate_dedup(BlockDriverState *bs) +{ + return qcow2_add_feature(bs, QCOW2_INCOMPAT_DEDUP); +} + /* * Clears an incompatible feature bit and flushes before if necessary. * Only call this function when there are no pending requests, it does not @@ -905,6 +910,11 @@ static void qcow2_close(BlockDriverState *bs) BDRVQcowState *s = bs->opaque; g_free(s->l1_table); + if (s->has_dedup) { + qcow2_cache_flush(bs, s->dedup_cluster_cache); + qcow2_cache_destroy(bs, s->dedup_cluster_cache); + } + qcow2_cache_flush(bs, s->l2_table_cache); qcow2_cache_flush(bs, s->refcount_block_cache); @@ -1261,7 +1271,8 @@ static int preallocate(BlockDriverState *bs) static int qcow2_create2(const char *filename, int64_t total_size, const char *backing_file, const char *backing_format, int flags, size_t cluster_size, int prealloc, - QEMUOptionParameter *options, int version) + QEMUOptionParameter *options, int version, + bool dedup, uint8_t hash_algo) { /* Calculate cluster_bits */ int cluster_bits; @@ -1288,8 +1299,10 @@ static int qcow2_create2(const char *filename, int64_t total_size, * size for any qcow2 image. */ BlockDriverState* bs; + BDRVQcowState *s; QCowHeader header; - uint8_t* refcount_table; + uint8_t *tables; + int size; int ret; ret = bdrv_create_file(filename, options); @@ -1331,10 +1344,11 @@ static int qcow2_create2(const char *filename, int64_t total_size, goto out; } - /* Write an empty refcount table */ - refcount_table = g_malloc0(cluster_size); - ret = bdrv_pwrite(bs, cluster_size, refcount_table, cluster_size); - g_free(refcount_table); + /* Write an empty refcount table + extra space for dedup table if needed */ + size = dedup ? 2 : 1; + tables = g_malloc0(size * cluster_size); + ret = bdrv_pwrite(bs, cluster_size, tables, size * cluster_size); + g_free(tables); if (ret < 0) { goto out; @@ -1345,7 +1359,7 @@ static int qcow2_create2(const char *filename, int64_t total_size, /* * And now open the image and make it consistent first (i.e. increase the * refcount of the cluster that is occupied by the header and the refcount - * table) + * table and the eventual dedup table) */ BlockDriver* drv = bdrv_find_format("qcow2"); assert(drv != NULL); @@ -1355,7 +1369,8 @@ static int qcow2_create2(const char *filename, int64_t total_size, goto out; } - ret = qcow2_alloc_clusters(bs, 2 * cluster_size); + size++; /* Add a cluster for the header */ + ret = qcow2_alloc_clusters(bs, size * cluster_size); if (ret < 0) { goto out; @@ -1365,11 +1380,33 @@ static int qcow2_create2(const char *filename, int64_t total_size, } /* Okay, now that we have a valid image, let's give it the right size */ + s = bs->opaque; ret = bdrv_truncate(bs, total_size * BDRV_SECTOR_SIZE); if (ret < 0) { goto out; } + if (dedup) { + s->has_dedup = true; + s->dedup_table_offset = cluster_size * 2; + s->dedup_table_size = cluster_size / sizeof(uint64_t); + s->dedup_hash_algo = hash_algo; + + ret = qcow2_activate_dedup(bs); + if (ret < 0) { + goto out; + } + + ret = qcow2_update_header(bs); + if (ret < 0) { + goto out; + } + + /* minimal init */ + s->dedup_cluster_cache = qcow2_cache_create(bs, DEDUP_CACHE_SIZE, + s->hash_block_size); + } + /* Want a backing file? There you go.*/ if (backing_file) { ret = bdrv_change_backing_file(bs, backing_file, backing_format); @@ -1395,15 +1432,41 @@ out: return ret; } +static int qcow2_warn_if_version_3_is_needed(int version, + bool has_feature, + const char *feature) +{ + if (version < 3 && has_feature) { + fprintf(stderr, "%s only supported with compatibility " + "level 1.1 and above (use compat=1.1 or greater)\n", + feature); + return -EINVAL; + } + return 0; +} + +static int8_t qcow2_get_dedup_hash_algo(char *value) +{ + if (!strcmp(value, "sha256")) { + return QCOW_HASH_SHA256; + } + + error_printf("Unsupported deduplication hash algorithm.\n"); + return -EINVAL; +} + static int qcow2_create(const char *filename, QEMUOptionParameter *options) { const char *backing_file = NULL; const char *backing_fmt = NULL; uint64_t sectors = 0; int flags = 0; + int ret; size_t cluster_size = DEFAULT_CLUSTER_SIZE; int prealloc = 0; int version = 2; + bool dedup = false; + int8_t hash_algo = 0; /* Read out options */ while (options && options->name) { @@ -1441,24 +1504,43 @@ static int qcow2_create(const char *filename, QEMUOptionParameter *options) } } else if (!strcmp(options->name, BLOCK_OPT_LAZY_REFCOUNTS)) { flags |= options->value.n ? BLOCK_FLAG_LAZY_REFCOUNTS : 0; + } else if (!strcmp(options->name, BLOCK_OPT_DEDUP) && + options->value.s) { + hash_algo = qcow2_get_dedup_hash_algo(options->value.s); + if (hash_algo < 0) { + return hash_algo; + } + dedup = true; } options++; } + if (dedup) { + cluster_size = 4096; + } + if (backing_file && prealloc) { fprintf(stderr, "Backing file and preallocation cannot be used at " "the same time\n"); return -EINVAL; } - if (version < 3 && (flags & BLOCK_FLAG_LAZY_REFCOUNTS)) { - fprintf(stderr, "Lazy refcounts only supported with compatibility " - "level 1.1 and above (use compat=1.1 or greater)\n"); - return -EINVAL; + ret = qcow2_warn_if_version_3_is_needed(version, + flags & BLOCK_FLAG_LAZY_REFCOUNTS, + "Lazy refcounts"); + if (ret < 0) { + return ret; + } + ret = qcow2_warn_if_version_3_is_needed(version, + dedup, + "Deduplication"); + if (ret < 0) { + return ret; } return qcow2_create2(filename, sectors, backing_file, backing_fmt, flags, - cluster_size, prealloc, options, version); + cluster_size, prealloc, options, version, + dedup, hash_algo); } static int qcow2_make_empty(BlockDriverState *bs) @@ -1761,6 +1843,11 @@ static QEMUOptionParameter qcow2_create_options[] = { .type = OPT_FLAG, .help = "Postpone refcount updates", }, + { + .name = BLOCK_OPT_DEDUP, + .type = OPT_STRING, + .help = "Deduplication", + }, { NULL } }; diff --git a/block/qcow2.h b/block/qcow2.h index 7813c4c..63353d9 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -56,6 +56,8 @@ /* Must be at least 4 to cover all cases of refcount table growth */ #define REFCOUNT_CACHE_SIZE 4 +#define DEDUP_CACHE_SIZE 4 + #define DEFAULT_CLUSTER_SIZE 65536 #define HASH_LENGTH 32 diff --git a/include/block/block_int.h b/include/block/block_int.h index f83ffb8..b7ed3e6 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -55,6 +55,7 @@ #define BLOCK_OPT_SUBFMT "subformat" #define BLOCK_OPT_COMPAT_LEVEL "compat" #define BLOCK_OPT_LAZY_REFCOUNTS "lazy_refcounts" +#define BLOCK_OPT_DEDUP "dedup" typedef struct BdrvTrackedRequest BdrvTrackedRequest;