From patchwork Wed Jan 16 16:24:42 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: 213042 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 DBE472C0087 for ; Thu, 17 Jan 2013 06:43:30 +1100 (EST) Received: from localhost ([::1]:35867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVpf-0003KK-4z for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 11:27:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVpK-0002yB-4y for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvVpD-0007DY-Sg for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:26:58 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43249 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVpD-0007D8-JH for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:26:51 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 243C1874325; Wed, 16 Jan 2013 17:58:28 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id CB60B87432E; Wed, 16 Jan 2013 17:56:04 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 17:24:42 +0100 Message-Id: <1358353497-5292-22-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358353497-5292-1-git-send-email-benoit@irqsave.net> References: <1358353497-5292-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, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V5 21/36] 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 --- 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 9eba773..8b51dda 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 ac396c4..6a6719f 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 ba10ed0..842c321 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -501,6 +501,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);