From patchwork Wed Oct 17 16:00:18 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: 192090 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 CEB282C0098 for ; Thu, 18 Oct 2012 03:24:53 +1100 (EST) Received: from localhost ([::1]:52252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW4M-0004rO-F3 for incoming@patchwork.ozlabs.org; Wed, 17 Oct 2012 12:02:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW43-00046D-81 for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:01:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOW3o-0003Ci-3o for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:01:41 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:48806 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW3n-0003CW-Rs for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:01:32 -0400 Received: by paradis.irqsave.net (Postfix, from userid 1002) id DB01B8742ED; Wed, 17 Oct 2012 18:07:02 +0200 (CEST) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id A0C458742F5; Wed, 17 Oct 2012 18:05:56 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2012 18:00:18 +0200 Message-Id: <1350489629-1838-10-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350489629-1838-1-git-send-email-benoit@irqsave.net> References: <1350489629-1838-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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 V2 09/20] qcow2: Add qcow2_co_load_dedup_hashes. 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 This coroutine load all the hashes in the red black tree at startup. --- block/qcow2-dedup.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.h | 1 + 2 files changed, 45 insertions(+) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index c626720..a2f6657 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -634,3 +634,47 @@ int qcow2_dedup_write_new_hashes(BlockDriverState *bs, fail: return ret; } + +/* + * This coroutine load the deduplication hashes in the red black 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; + int nb_hash_in_dedup_cluster = s->cluster_size / HASH_LENGTH; + + /* 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, + i * s->cluster_sectors, + false); + qemu_co_mutex_unlock(&s->lock); + if (ret < 0) { + error_report("Failed to load deduplication hash."); + } + + /* if the hash is not null load it into red black tree */ + if (memcmp(hash, null_hash, HASH_LENGTH)) { + qemu_co_mutex_lock(&s->lock); + qcow2_dedup_insert_hash_in_rb_tree(bs, hash, + i * s->cluster_sectors); + qemu_co_mutex_unlock(&s->lock); + } else { + free(hash); + } + } +} diff --git a/block/qcow2.h b/block/qcow2.h index 58aee77..5bab6e2 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -375,5 +375,6 @@ int qcow2_dedup(BlockDriverState *bs, int qcow2_dedup_write_new_hashes(BlockDriverState *bs, uint64_t cluster_offset, int count); +void coroutine_fn qcow2_co_load_dedup_hashes(void *opaque); #endif