From patchwork Fri Mar 15 14:49:26 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: 228079 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 848A92C008D for ; Sat, 16 Mar 2013 02:53:58 +1100 (EST) Received: from localhost ([::1]:52015 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGW1B-0004zn-Dj for incoming@patchwork.ozlabs.org; Fri, 15 Mar 2013 10:54:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVxw-0008WD-DS for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:50:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGVxt-0004p1-F0 for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:50:40 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:59596 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVxt-0004oi-4p for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:50:37 -0400 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 3B470874352; Fri, 15 Mar 2013 15:50:36 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 912C7874358; Fri, 15 Mar 2013 15:48:47 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Fri, 15 Mar 2013 15:49:26 +0100 Message-Id: <1363358986-8360-13-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363358986-8360-1-git-send-email-benoit@irqsave.net> References: <1363358986-8360-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 V7 12/32] qcow2: Makes qcow2_alloc_cluster_link_l2 mark to deduplicate clusters. 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-cluster.c | 4 +++- block/qcow2-dedup.c | 6 ++++++ block/qcow2.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index fae4110..0d11ef0 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1013,7 +1013,9 @@ again: .nb_sectors = avail_sectors - nb_sectors, }, - .l2_entry_flags = QCOW_OFLAG_COPIED, + .l2_entry_flags = QCOW_OFLAG_COPIED | + qcow2_must_deduplicate(bs) ? + QCOW_OFLAG_PENDING_DEDUP : 0, .overwrite = false, }; qemu_co_queue_init(&(*m)->dependent_requests); diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index 819c37e..c106bd5 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -39,6 +39,12 @@ static int qcow2_dedup_read_write_hash(BlockDriverState *bs, uint64_t physical_sect, bool write); +bool qcow2_must_deduplicate(BlockDriverState *bs) +{ + BDRVQcowState *s = bs->opaque; + return s->has_dedup && s->dedup_status != DEDUP_STATUS_STARTED; +} + /* * Grow the deduplication table * diff --git a/block/qcow2.h b/block/qcow2.h index 7979fc2..9f24b4c 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -314,6 +314,8 @@ typedef struct QCowL2Meta /* set to true if we are overwriting an L2 table entry */ bool overwrite; + /* set to true if the cluster must be tagged with QCOW_OFLAG_PENDING_DEDUP */ + bool to_deduplicate; /** * The COW Region between the start of the first allocated cluster and the @@ -464,6 +466,7 @@ int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset, int qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table); /* qcow2-dedup.c functions */ +bool qcow2_must_deduplicate(BlockDriverState *bs); int qcow2_dedup_read_missing_and_concatenate(BlockDriverState *bs, QEMUIOVector *qiov, uint64_t sector,