From patchwork Wed Jan 2 16:16:30 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: 209085 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 4B6D12C0086 for ; Thu, 3 Jan 2013 03:32:58 +1100 (EST) Received: from localhost ([::1]:47810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqRFQ-0004cD-Df for incoming@patchwork.ozlabs.org; Wed, 02 Jan 2013 11:32:56 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR1r-0004KN-16 for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:19:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TqR1n-0006QG-UZ for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:18:54 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:56279 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR1n-0006QA-Fy for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:18:51 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 102A887430F; Wed, 2 Jan 2013 17:45:20 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 6EAC6874329; Wed, 2 Jan 2013 17:42:40 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 2 Jan 2013 17:16:30 +0100 Message-Id: <1357143393-29832-28-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1357143393-29832-1-git-send-email-benoit@irqsave.net> References: <1357143393-29832-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 V4 27/30] qcow2: Use large L2 table for deduplication. 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-cluster.c | 2 +- block/qcow2-refcount.c | 22 +++++++++++++++------- block/qcow2.c | 8 ++++++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 07037a0..d69af17 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -236,7 +236,7 @@ static int l2_allocate(BlockDriverState *bs, int l1_index, uint64_t **table) goto fail; } - memcpy(l2_table, old_table, s->cluster_size); + memcpy(l2_table, old_table, s->l2_size << 3); ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &old_table); if (ret < 0) { diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 0c6e75a..092546d 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -535,12 +535,15 @@ fail: */ static int update_cluster_refcount(BlockDriverState *bs, int64_t cluster_index, - int addend) + int addend, + bool is_l2) { BDRVQcowState *s = bs->opaque; int ret; - ret = update_refcount(bs, cluster_index << s->cluster_bits, 1, addend); + int size = is_l2 ? s->l2_size << 3 : 1; + + ret = update_refcount(bs, cluster_index << s->cluster_bits, size, addend); if (ret < 0) { return ret; } @@ -664,7 +667,7 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size) if (free_in_cluster == 0) s->free_byte_offset = 0; if ((offset & (s->cluster_size - 1)) != 0) - update_cluster_refcount(bs, offset >> s->cluster_bits, 1); + update_cluster_refcount(bs, offset >> s->cluster_bits, 1, false); } else { offset = qcow2_alloc_clusters(bs, s->cluster_size); if (offset < 0) { @@ -674,7 +677,7 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size) if ((cluster_offset + s->cluster_size) == offset) { /* we are lucky: contiguous data */ offset = s->free_byte_offset; - update_cluster_refcount(bs, offset >> s->cluster_bits, 1); + update_cluster_refcount(bs, offset >> s->cluster_bits, 1, false); s->free_byte_offset += size; } else { s->free_byte_offset = offset; @@ -815,7 +818,10 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, } else { uint64_t cluster_index = (offset & L2E_OFFSET_MASK) >> s->cluster_bits; if (addend != 0) { - refcount = update_cluster_refcount(bs, cluster_index, addend); + refcount = update_cluster_refcount(bs, + cluster_index, + addend, + false); } else { refcount = get_refcount(bs, cluster_index); } @@ -847,7 +853,9 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, if (addend != 0) { - refcount = update_cluster_refcount(bs, l2_offset >> s->cluster_bits, addend); + refcount = update_cluster_refcount(bs, + l2_offset >> s->cluster_bits, + addend, true); } else { refcount = get_refcount(bs, l2_offset >> s->cluster_bits); } @@ -1143,7 +1151,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, 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 f66e67d..16038db 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -430,7 +430,11 @@ static int qcow2_open(BlockDriverState *bs, int flags) s->cluster_bits = header.cluster_bits; s->cluster_size = 1 << s->cluster_bits; s->cluster_sectors = 1 << (s->cluster_bits - 9); - s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */ + if (s->incompatible_features & QCOW2_INCOMPAT_DEDUP) { + s->l2_bits = 16 - 3; /* 64 KB L2 */ + } else { + s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */ + } s->l2_size = 1 << s->l2_bits; bs->total_sectors = header.size / 512; s->csize_shift = (62 - (s->cluster_bits - 8)); @@ -467,7 +471,7 @@ static int qcow2_open(BlockDriverState *bs, int flags) } /* alloc L2 table/refcount block cache */ - s->l2_table_cache = qcow2_cache_create(bs, L2_CACHE_SIZE, s->cluster_size); + s->l2_table_cache = qcow2_cache_create(bs, L2_CACHE_SIZE, s->l2_size << 3); s->refcount_block_cache = qcow2_cache_create(bs, REFCOUNT_CACHE_SIZE, s->cluster_size);