From patchwork Mon Nov 26 13:05:09 2012 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: 201692 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 7F0172C0079 for ; Tue, 27 Nov 2012 00:56:23 +1100 (EST) Received: from localhost ([::1]:49877 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TczAb-0004Nx-QK for incoming@patchwork.ozlabs.org; Mon, 26 Nov 2012 08:56:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcyOB-0004Zx-1K for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:06:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcyO6-0005AS-24 for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:06:18 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:44836 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcyO5-0005AH-Ld for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:06:13 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 1DC798742FA; Mon, 26 Nov 2012 14:19:11 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 64B0F874307; Mon, 26 Nov 2012 14:18:14 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Mon, 26 Nov 2012 14:05:09 +0100 Message-Id: <1353935123-24199-11-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353935123-24199-1-git-send-email-benoit@irqsave.net> References: <1353935123-24199-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, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V3 10/24] qcow2: create function to load deduplication hashes at startup. 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-dedup.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.h | 1 + 2 files changed, 67 insertions(+) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index 2ebbbcf..1760e8a 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -690,6 +690,72 @@ fail: return ret; } +static void qcow2_dedup_insert_hash_and_preserve_newer(BlockDriverState *bs, + QCowHashNode *hash_node) +{ + BDRVQcowState *s = bs->opaque; + QCowHashNode *newer_hash_node; + + newer_hash_node = g_tree_lookup(s->dedup_tree_by_offset, + &hash_node->offset); + + if (!newer_hash_node) { + g_tree_insert(s->dedup_tree_by_hash, hash_node->hash, hash_node); + g_tree_insert(s->dedup_tree_by_offset, &hash_node->offset, hash_node); + } else { + g_free(hash_node->hash); + g_free(hash_node); + } +} + +/* + * This coroutine load the deduplication hashes in the tree + * + * @data: the given BlockDriverState + * @ret: NULL + */ +void coroutine_fn qcow2_co_load_dedup_hashes(void *opaque) +{ + BlockDriverState *bs = opaque; + BDRVQcowState *s = bs->opaque; + int ret; + uint8_t *hash = NULL; + uint8_t null_hash[HASH_LENGTH]; + uint64_t max_cluster_offset, i; + uint64_t first_logical_offset; + int nb_hash_in_dedup_cluster = s->cluster_size / (HASH_LENGTH + 8); + QCowHashNode *hash_node; + + /* prepare the null hash */ + memset(null_hash, 0, HASH_LENGTH); + + max_cluster_offset = s->dedup_table_size * nb_hash_in_dedup_cluster; + + for (i = 0; i < max_cluster_offset; i++) { + /* get the hash */ + qemu_co_mutex_lock(&s->lock); + ret = qcow2_dedup_read_write_hash(bs, &hash, + &first_logical_offset, + i * s->cluster_sectors, + false); + if (ret < 0) { + qemu_co_mutex_unlock(&s->lock); + error_report("Failed to load deduplication hash."); + } + + /* if the hash is not null load it into the tree */ + if (memcmp(hash, null_hash, HASH_LENGTH)) { + hash_node = qcow2_dedup_build_qcow_hash_node(hash, + i * s->cluster_sectors, + first_logical_offset); + qcow2_dedup_insert_hash_and_preserve_newer(bs, hash_node); + } else { + free(hash); + } + qemu_co_mutex_unlock(&s->lock); + } +} + /* * Save the dedup table information into the header extensions * diff --git a/block/qcow2.h b/block/qcow2.h index 62822b7..c7edb14 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -396,6 +396,7 @@ int qcow2_dedup_write_new_hashes(BlockDriverState *bs, int hash_count, uint64_t logical_cluster_offset, uint64_t physical_cluster_offset); +void coroutine_fn qcow2_co_load_dedup_hashes(void *opaque); int qcow2_dedup_grow_table(BlockDriverState *bs, int min_size, bool exact_size);