From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW3Q-0003Xx-Q2 for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:01:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOW3D-0002tk-UZ for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:01:03 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:48759 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW3D-0002nO-KS for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:00:55 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 17 Oct 2012 18:00:12 +0200 Message-Id: <1350489629-1838-4-git-send-email-benoit@irqsave.net> In-Reply-To: <1350489629-1838-1-git-send-email-benoit@irqsave.net> References: <1350489629-1838-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V2 03/20] qcow2: Add deduplication structures and fields. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com --- block/qcow2.h | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/block/qcow2.h b/block/qcow2.h index b4eb654..e38667c 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -26,6 +26,7 @@ #define BLOCK_QCOW2_H #include "aes.h" +#include "rbtree.h" #include "qemu-coroutine.h" //#define DEBUG_ALLOC @@ -58,6 +59,19 @@ #define DEFAULT_CLUSTER_SIZE 65536 +/* Red Black Tree deduplication node */ +typedef struct { + struct rb_node node; + uint8_t *hash; /* SHA256 hash of a given cluster */ + uint64_t offset; /* offset where the cluster is stored (sectors) */ +} QCowHashNode; + +/* Undedupable hashes that must be written later to disk */ +typedef struct QCowHashElement { + uint8_t *hash; + QTAILQ_ENTRY(QCowHashElement) next; +} QCowHashElement; + typedef struct QCowHeader { uint32_t magic; uint32_t version; @@ -114,8 +128,10 @@ enum { enum { QCOW2_INCOMPAT_DIRTY_BITNR = 0, QCOW2_INCOMPAT_DIRTY = 1 << QCOW2_INCOMPAT_DIRTY_BITNR, + QCOW2_INCOMPAT_DEDUP_BITNR = 1, + QCOW2_INCOMPAT_DEDUP = 1 << QCOW2_INCOMPAT_DEDUP_BITNR, - QCOW2_INCOMPAT_MASK = QCOW2_INCOMPAT_DIRTY, + QCOW2_INCOMPAT_MASK = QCOW2_INCOMPAT_DIRTY | QCOW2_INCOMPAT_DEDUP, }; /* Compatible feature bits */ @@ -148,6 +164,7 @@ typedef struct BDRVQcowState { Qcow2Cache* l2_table_cache; Qcow2Cache* refcount_block_cache; + Qcow2Cache *dedup_cluster_cache; uint8_t *cluster_cache; uint8_t *cluster_data; @@ -160,6 +177,12 @@ typedef struct BDRVQcowState { int64_t free_cluster_index; int64_t free_byte_offset; + bool has_dedup; + uint64_t *dedup_table; + uint64_t dedup_table_offset; + int32_t dedup_table_size; + struct rb_root dedup_rb_tree; + QTAILQ_HEAD(, QCowHashElement) undedupable_hashes; CoMutex lock; uint32_t crypt_method; /* current crypt method, 0 if no key yet */ -- 1.7.10.4