From patchwork Wed Feb 6 12:32:04 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: 218622 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 9B5E02C02BD for ; Thu, 7 Feb 2013 00:54:25 +1100 (EST) Received: from localhost ([::1]:38165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34Cv-00006R-VV for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2013 07:34:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34Cm-0008Gl-I8 for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:34:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U34Ce-0005Rb-F6 for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:34:24 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43718 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34Ce-0005RE-5k for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:34:16 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 8DA42874328; Wed, 6 Feb 2013 13:34:15 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 52E9987433E; Wed, 6 Feb 2013 13:31:21 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2013 13:32:04 +0100 Message-Id: <1360153926-9492-32-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 31/33] qcow: Set large dedup hash block size. 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-refcount.c | 4 ++-- block/qcow2.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 337fb65..d173c18 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1051,7 +1051,7 @@ static int check_dedup_l2(BlockDriverState *bs, BdrvCheckResult *res, int i, l2_size; /* Read L2 table from disk */ - l2_size = s->cluster_size; + l2_size = s->hash_block_size; l2_table = g_malloc(l2_size); if (bdrv_pread(bs->file, l2_offset, l2_table, l2_size) != l2_size) { @@ -1141,7 +1141,7 @@ static int check_refcounts_l1(BlockDriverState *bs, /* Mark L2 table as used */ l2_offset &= L1E_OFFSET_MASK; inc_refcounts(bs, res, refcount_table, refcount_table_size, - l2_offset, s->cluster_size); + l2_offset, dedup ? s->hash_block_size : s->l2_size << 3); /* L2 tables are cluster aligned */ if (l2_offset & (s->cluster_size - 1)) { diff --git a/block/qcow2.c b/block/qcow2.c index 7263e74..9097e64 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -435,6 +435,9 @@ static int qcow2_open(BlockDriverState *bs, int flags) s->cluster_sectors = 1 << (s->cluster_bits - 9); s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */ s->l2_size = 1 << s->l2_bits; + if (s->incompatible_features & QCOW2_INCOMPAT_DEDUP) { + s->hash_block_size = DEFAULT_CLUSTER_SIZE * 5; + } bs->total_sectors = header.size / 512; s->csize_shift = (62 - (s->cluster_bits - 8)); s->csize_mask = (1 << (s->cluster_bits - 8)) - 1;