From patchwork Wed Oct 17 16:00:28 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: 192097 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 EAB682C0092 for ; Thu, 18 Oct 2012 03:35:51 +1100 (EST) Received: from localhost ([::1]:57470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOWb0-0008Ev-4l for incoming@patchwork.ozlabs.org; Wed, 17 Oct 2012 12:35:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW4e-00056I-Dv for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:02:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOW4Z-0003Pd-Jg for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:02:24 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:48833 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW4Z-0003P3-1A for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:02:19 -0400 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 51D8F8742EF; Wed, 17 Oct 2012 18:07:49 +0200 (CEST) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 705358742FF; Wed, 17 Oct 2012 18:05:57 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2012 18:00:28 +0200 Message-Id: <1350489629-1838-20-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 19/20] qcow2: init and cleanup deduplication. 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 --- block/qcow2-dedup.c | 34 +++++++++++++++++++++++++++++----- block/qcow2.c | 16 +++++++++++++--- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index 60e93fe..d19bf8c 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -736,15 +736,39 @@ int qcow2_dedup_grow_table(BlockDriverState *bs, int qcow2_dedup_init(BlockDriverState *bs) { BDRVQcowState *s = bs->opaque; - return qcow2_do_table_init(bs, - &s->dedup_table, - s->dedup_table_offset, - s->dedup_table_size, - false); + Coroutine *co; + int ret; + + s->has_dedup = true; + s->dedup_rb_tree = RB_ROOT; + QTAILQ_INIT(&s->undedupable_hashes); + s->dedup_cluster_cache = qcow2_cache_create(bs, DEDUP_CACHE_SIZE); + + ret = qcow2_do_table_init(bs, + &s->dedup_table, + s->dedup_table_offset, + s->dedup_table_size, + false); + + if (ret < 0) { + goto fail; + } + + /* load asynchronously the hashes */ + co = qemu_coroutine_create(qcow2_co_load_dedup_hashes); + qemu_coroutine_enter(co, bs); + return 0; + +fail: + qcow2_cache_destroy(bs, s->dedup_cluster_cache); + return ret; } void qcow2_dedup_close(BlockDriverState *bs) { BDRVQcowState *s = bs->opaque; + qcow2_cache_flush(bs, s->dedup_cluster_cache); + qcow2_cache_destroy(bs, s->dedup_cluster_cache); g_free(s->dedup_table); + qcow2_dedup_destroy_rb_tree(bs); } diff --git a/block/qcow2.c b/block/qcow2.c index e0c1a68..4102cf8 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -534,6 +534,13 @@ static int qcow2_open(BlockDriverState *bs, int flags) } } + if (s->incompatible_features & QCOW2_INCOMPAT_DEDUP) { + ret = qcow2_dedup_init(bs); + if (ret < 0) { + goto fail; + } + } + #ifdef DEBUG_ALLOC { BdrvCheckResult result = {0}; @@ -991,11 +998,11 @@ fail: 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_dedup_close(bs); } qcow2_cache_flush(bs, s->l2_table_cache); @@ -1444,7 +1451,10 @@ static int qcow2_create2(const char *filename, int64_t total_size, } /* minimal init */ - s->dedup_cluster_cache = qcow2_cache_create(bs, DEDUP_CACHE_SIZE); + ret = qcow2_dedup_init(bs); + if (ret < 0) { + goto out; + } } /* Want a backing file? There you go.*/