From patchwork Wed Feb 6 12:31:55 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: 218653 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 47DD32C02C5 for ; Thu, 7 Feb 2013 01:37:10 +1100 (EST) Received: from localhost ([::1]:37095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34CP-0007wL-Qc for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2013 07:34:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34C2-0007T2-7A for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:33:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U34Bv-0005Gv-DM for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:33:38 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43661 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34Bv-0005Gm-1Q for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:33:31 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 626F8874326; Wed, 6 Feb 2013 13:33:30 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id A6BC6874335; Wed, 6 Feb 2013 13:31:20 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2013 13:31:55 +0100 Message-Id: <1360153926-9492-23-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360153926-9492-1-git-send-email-benoit@irqsave.net> References: <1360153926-9492-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 V6 22/33] qcow2: Remove hash when cluster is deleted. 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 | 26 ++++++++++++++++++++++++++ block/qcow2-refcount.c | 3 +++ block/qcow2.h | 2 ++ 3 files changed, 31 insertions(+) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index 4819eb3..1ed219d 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -942,6 +942,32 @@ int qcow2_dedup_store_new_hashes(BlockDriverState *bs, return ret; } +/* Clean the last reference to a given cluster when it's refcount is zero + * + * @cluster_index: the index of the physical cluster + */ +void qcow2_dedup_refcount_zero_reached(BlockDriverState *bs, + uint64_t cluster_index) +{ + BDRVQcowState *s = bs->opaque; + QCowHash null_hash; + uint64_t logical_sect = 0; + uint64_t physical_sect = cluster_index * s->cluster_sectors; + + /* prepare null hash */ + memset(&null_hash, 0, sizeof(null_hash)); + + /* clear from disk */ + qcow2_dedup_read_write_hash(bs, + &null_hash, + &logical_sect, + physical_sect, + true); + + /* remove from ram if present so we won't dedup with it anymore */ + qcow2_remove_hash_node_by_sector(bs, physical_sect); +} + /* Force to use a new physical cluster and QCowHashNode when the refcount pass * 2^16/2. * diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index fa2559f..f6a80db 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -492,6 +492,9 @@ int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs, if (s->has_dedup && deduplication && refcount >= 0xFFFF/2) { qcow2_dedup_refcount_half_max_reached(bs, cluster_index); } + if (s->has_dedup && refcount == 0) { + qcow2_dedup_refcount_zero_reached(bs, cluster_index); + } if (refcount == 0 && cluster_index < s->free_cluster_index) { s->free_cluster_index = cluster_index; } diff --git a/block/qcow2.h b/block/qcow2.h index f281832..6d6f5d3 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -498,6 +498,8 @@ int qcow2_dedup_store_new_hashes(BlockDriverState *bs, int count, uint64_t logical_sect, uint64_t physical_sect); +void qcow2_dedup_refcount_zero_reached(BlockDriverState *bs, + uint64_t cluster_index); void qcow2_dedup_refcount_half_max_reached(BlockDriverState *bs, uint64_t cluster_index);