From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW4M-00054B-Gm for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:02:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOW4B-0003HI-J5 for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:02:05 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:48808 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW4B-0003Dq-5p for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:01:55 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 17 Oct 2012 18:00:19 +0200 Message-Id: <1350489629-1838-11-git-send-email-benoit@irqsave.net> In-Reply-To: <1350489629-1838-1-git-send-email-benoit@irqsave.net> References: <1350489629-1838-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V2 10/20] qcow2: Add qcow2_dedup_grow_table. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com --- block/qcow2-cluster.c | 95 +++++++++++++++++++++++++++++++------------------ block/qcow2-dedup.c | 38 ++++++++++++++++++++ block/qcow2.h | 10 ++++++ 3 files changed, 108 insertions(+), 35 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index e179211..04f7cab 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -29,44 +29,47 @@ #include "block/qcow2.h" #include "trace.h" -int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size) +int qcow2_do_grow_table(BlockDriverState *bs, int min_size, bool exact_size, + uint64_t **table, uint64_t *table_offset, + int *table_size, qcow2_save_table save_table, + const char *table_name) { BDRVQcowState *s = bs->opaque; - int new_l1_size, new_l1_size2, ret, i; - uint64_t *new_l1_table; - int64_t new_l1_table_offset; - uint8_t data[12]; + int new_size, new_size2, ret, i; + uint64_t *new_table; + int64_t new_table_offset; - if (min_size <= s->l1_size) + if (min_size <= *table_size) return 0; if (exact_size) { - new_l1_size = min_size; + new_size = min_size; } else { /* Bump size up to reduce the number of times we have to grow */ - new_l1_size = s->l1_size; - if (new_l1_size == 0) { - new_l1_size = 1; + new_size = *table_size; + if (new_size == 0) { + new_size = 1; } - while (min_size > new_l1_size) { - new_l1_size = (new_l1_size * 3 + 1) / 2; + while (min_size > new_size) { + new_size = (new_size * 3 + 1) / 2; } } #ifdef DEBUG_ALLOC2 - fprintf(stderr, "grow l1_table from %d to %d\n", s->l1_size, new_l1_size); + fprintf(stderr, "grow %s_table from %d to %d\n", + table_name, *table_size, new_size); #endif - new_l1_size2 = sizeof(uint64_t) * new_l1_size; - new_l1_table = g_malloc0(align_offset(new_l1_size2, 512)); - memcpy(new_l1_table, s->l1_table, s->l1_size * sizeof(uint64_t)); + new_size2 = sizeof(uint64_t) * new_size; + new_table = g_malloc0(align_offset(new_size2, 512)); + memcpy(new_table, *table, *table_size * sizeof(uint64_t)); /* write new table (align to cluster) */ BLKDBG_EVENT(bs->file, BLKDBG_L1_GROW_ALLOC_TABLE); - new_l1_table_offset = qcow2_alloc_clusters(bs, new_l1_size2); - if (new_l1_table_offset < 0) { - g_free(new_l1_table); - return new_l1_table_offset; + new_table_offset = qcow2_alloc_clusters(bs, new_size2); + if (new_table_offset < 0) { + g_free(new_table); + return new_table_offset; } ret = qcow2_cache_flush(bs, s->refcount_block_cache); @@ -75,34 +78,56 @@ int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size) } BLKDBG_EVENT(bs->file, BLKDBG_L1_GROW_WRITE_TABLE); - for(i = 0; i < s->l1_size; i++) - new_l1_table[i] = cpu_to_be64(new_l1_table[i]); - ret = bdrv_pwrite_sync(bs->file, new_l1_table_offset, new_l1_table, new_l1_size2); + for(i = 0; i < *table_size; i++) + new_table[i] = cpu_to_be64(new_table[i]); + ret = bdrv_pwrite_sync(bs->file, new_table_offset, new_table, new_size2); if (ret < 0) goto fail; - for(i = 0; i < s->l1_size; i++) - new_l1_table[i] = be64_to_cpu(new_l1_table[i]); + for(i = 0; i < *table_size; i++) + new_table[i] = be64_to_cpu(new_table[i]); /* set new table */ BLKDBG_EVENT(bs->file, BLKDBG_L1_GROW_ACTIVATE_TABLE); - cpu_to_be32w((uint32_t*)data, new_l1_size); - cpu_to_be64wu((uint64_t*)(data + 4), new_l1_table_offset); - ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, l1_size), data,sizeof(data)); + ret = save_table(bs, new_table_offset, new_size); + if (ret < 0) { goto fail; } - g_free(s->l1_table); - qcow2_free_clusters(bs, s->l1_table_offset, s->l1_size * sizeof(uint64_t)); - s->l1_table_offset = new_l1_table_offset; - s->l1_table = new_l1_table; - s->l1_size = new_l1_size; + g_free(*table); + qcow2_free_clusters(bs, *table_offset, *table_size * sizeof(uint64_t)); + *table_offset = new_table_offset; + *table = new_table; + *table_size = new_size; return 0; fail: - g_free(new_l1_table); - qcow2_free_clusters(bs, new_l1_table_offset, new_l1_size2); + g_free(new_table); + qcow2_free_clusters(bs, new_table_offset, new_size2); return ret; } +static int qcow2_l1_save_table(BlockDriverState *bs, + int64_t table_offset, int size) +{ + uint8_t data[12]; + cpu_to_be32w((uint32_t*)data, size); + cpu_to_be64wu((uint64_t*)(data + 4), table_offset); + return bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, l1_size), + data,sizeof(data)); +} + +int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size) +{ + BDRVQcowState *s = bs->opaque; + return qcow2_do_grow_table(bs, + min_size, + exact_size, + &s->l1_table, + &s->l1_table_offset, + &s->l1_size, + qcow2_l1_save_table, + "l1"); +} + /* * l2_load * diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index a2f6657..5f648b5 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -678,3 +678,41 @@ void coroutine_fn qcow2_co_load_dedup_hashes(void *opaque) } } } + +/* + * Save the dedup table information into the header extensions + * + * @table_offset: the dedup table offset in the QCOW2 file + * @size: the size of the dedup table + * @ret: 0 on success, -errno on error + */ +static int qcow2_dedup_save_table_info(BlockDriverState *bs, + int64_t table_offset, int size) +{ + BDRVQcowState *s = bs->opaque; + s->dedup_table_offset = table_offset; + s->dedup_table_size = size; + return qcow2_update_header(bs); +} + +/* + * Grow the deduplication table + * + * @min_size: minimal size + * @exact_size: if true force to grow to the exact size + * @ret: 0 on success, -errno on error + */ +int qcow2_dedup_grow_table(BlockDriverState *bs, + int min_size, + bool exact_size) +{ + BDRVQcowState *s = bs->opaque; + return qcow2_do_grow_table(bs, + min_size, + exact_size, + &s->dedup_table, + &s->dedup_table_offset, + &s->dedup_table_size, + qcow2_dedup_save_table_info, + "dedup"); +} diff --git a/block/qcow2.h b/block/qcow2.h index 5bab6e2..6c6e666 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -311,6 +311,12 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix); /* qcow2-cluster.c functions */ +typedef int (*qcow2_save_table)(BlockDriverState *bs, + int64_t table_offset, int size); +int qcow2_do_grow_table(BlockDriverState *bs, int min_size, bool exact_size, + uint64_t **table, uint64_t *table_offset, + int *table_size, qcow2_save_table save_table, + const char *table_name); int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size); void qcow2_l2_cache_reset(BlockDriverState *bs); int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset); @@ -376,5 +382,9 @@ int qcow2_dedup_write_new_hashes(BlockDriverState *bs, uint64_t cluster_offset, int count); void coroutine_fn qcow2_co_load_dedup_hashes(void *opaque); +void qcow2_dedup_start_loading_hashes(BlockDriverState *bs); +int qcow2_dedup_grow_table(BlockDriverState *bs, + int min_size, + bool exact_size); #endif -- 1.7.10.4