From patchwork Wed Feb 6 12:32:24 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: 218639 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 D27892C034E for ; Thu, 7 Feb 2013 01:24:53 +1100 (EST) Received: from localhost ([::1]:45003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U35vf-00058Q-Pc for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2013 09:24:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34E0-0000by-4K for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:35:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U34Du-000612-8H for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:35:40 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43790 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34Dt-00060y-Ts for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:35:34 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 4C7B587431B; Wed, 6 Feb 2013 13:35:33 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 0F785874355; Wed, 6 Feb 2013 13:31:41 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2013 13:32:24 +0100 Message-Id: <1360153946-9617-6-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360153946-9617-1-git-send-email-benoit@irqsave.net> References: <1360153946-9617-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 V2 5/7] qcow2: Add qcow2_dedup_control. 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 | 31 +++++++++++++++++++++++++++++++ block/qcow2.c | 2 ++ block/qcow2.h | 1 + 3 files changed, 34 insertions(+) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index bbbb1ac..66fb415 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -1278,15 +1278,20 @@ static void qcow2_deduplicate_after_resuming(BlockDriverState *bs) BDRVQcowState *s = bs->opaque; uint64_t i; bool processed; + bool exit; /* for each l2 entry */ for (i = 0; i < s->l2_size * s->l1_size; i++) { qemu_co_mutex_lock(&s->lock); processed = qcow2_process_to_dedup_cluster(bs, i); + exit = s->dedup_status == DEDUP_STATUS_STOPPING; qemu_co_mutex_unlock(&s->lock); if (processed || !(i % s->l2_size)) { co_sleep_ns(rt_clock, s->dedup_co_delay); } + if (exit) { + return; + } } } @@ -1448,3 +1453,29 @@ void qcow2_dedup_update_metrics(BlockDriverState *bs) s->dedup_metrics.ram_usage = nb_hashs * sizeof(GTreeNode_Copy) * 2; s->dedup_metrics.ram_usage += nb_hashs * sizeof(QCowHashNode); } + +void qcow2_dedup_control(BlockDriverState *bs, const bool enable) +{ + BDRVQcowState *s = bs->opaque; + + /* must stop and not STARTED -> pass */ + if (!enable && s->dedup_status != DEDUP_STATUS_STARTED) { + return; + } + + /* must start and not stopped -> pass */ + if (enable && s->dedup_status != DEDUP_STATUS_STOPPED) { + return; + } + + if (enable) { + s->dedup_status = DEDUP_STATUS_STARTING; + s->dedup_resume_co = qemu_coroutine_create(qcow2_co_dedup_resume); + qemu_coroutine_enter(s->dedup_resume_co, bs); + } else { + s->dedup_status = DEDUP_STATUS_STOPPING; + /* must handle half processed write requests */ + qcow2_dedup_reset(bs); + s->dedup_status = DEDUP_STATUS_STOPPED; + } +} diff --git a/block/qcow2.c b/block/qcow2.c index 0ee5f4b..3549e87 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2052,6 +2052,8 @@ static BlockDriver bdrv_qcow2 = { .bdrv_invalidate_cache = qcow2_invalidate_cache, + .bdrv_dedup_control = qcow2_dedup_control, + .create_options = qcow2_create_options, .bdrv_check = qcow2_check, }; diff --git a/block/qcow2.h b/block/qcow2.h index 191b272..316b0d3 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -525,5 +525,6 @@ bool qcow2_dedup_is_running(BlockDriverState *bs); int qcow2_dedup_init(BlockDriverState *bs); void qcow2_dedup_close(BlockDriverState *bs); void qcow2_dedup_update_metrics(BlockDriverState *bs); +void qcow2_dedup_control(BlockDriverState *bs, const bool enable); #endif