qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Benoît Canet" <benoit@irqsave.net>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com,
	"Benoît Canet" <benoit@irqsave.net>,
	stefanha@redhat.com
Subject: [Qemu-devel] [RFC V5 34/36] qcow2: Add qcow2_dedup_init and qcow2_dedup_close.
Date: Wed, 16 Jan 2013 17:24:55 +0100	[thread overview]
Message-ID: <1358353497-5292-35-git-send-email-benoit@irqsave.net> (raw)
In-Reply-To: <1358353497-5292-1-git-send-email-benoit@irqsave.net>

Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
 block/qcow2-dedup.c |   97 +++++++++++++++++++++++++++++++++++++++++++++++++++
 block/qcow2.h       |    2 ++
 2 files changed, 99 insertions(+)

diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c
index 50ffa54..35fcc01 100644
--- a/block/qcow2-dedup.c
+++ b/block/qcow2-dedup.c
@@ -1019,3 +1019,100 @@ bool qcow2_dedup_is_running(BlockDriverState *bs)
     BDRVQcowState *s = bs->opaque;
     return s->has_dedup && s->dedup_status == QCOW_DEDUP_STARTED;
 }
+
+static gint qcow2_dedup_compare_by_hash(gconstpointer a,
+                                        gconstpointer b,
+                                        gpointer data)
+{
+    QCowHash *hash_a = (QCowHash *) a;
+    QCowHash *hash_b = (QCowHash *) b;
+    return memcmp(hash_a->data, hash_b->data, HASH_LENGTH);
+}
+
+static void qcow2_dedup_destroy_qcow_hash_node(gpointer p)
+{
+    QCowHashNode *hash_node = (QCowHashNode *) p;
+    g_free(hash_node);
+}
+
+static gint qcow2_dedup_compare_by_offset(gconstpointer a,
+                                          gconstpointer b,
+                                          gpointer data)
+{
+    uint64_t offset_a = *((uint64_t *) a);
+    uint64_t offset_b = *((uint64_t *) b);
+
+    if (offset_a > offset_b) {
+        return 1;
+    }
+    if (offset_a < offset_b) {
+        return -1;
+    }
+    return 0;
+}
+
+static int qcow2_dedup_alloc(BlockDriverState *bs)
+{
+    BDRVQcowState *s = bs->opaque;
+    int ret;
+
+    ret = qcow2_do_table_init(bs,
+                              &s->dedup_table,
+                              s->dedup_table_offset,
+                              s->dedup_table_size,
+                              false);
+
+    if (ret < 0) {
+        return ret;
+    }
+
+    s->dedup_tree_by_hash = g_tree_new_full(qcow2_dedup_compare_by_hash, NULL,
+                                            NULL,
+                                            qcow2_dedup_destroy_qcow_hash_node);
+    s->dedup_tree_by_sect = g_tree_new_full(qcow2_dedup_compare_by_offset,
+                                              NULL, NULL, NULL);
+
+    s->dedup_cluster_cache = qcow2_cache_create(bs, DEDUP_CACHE_SIZE,
+                                                s->hash_block_size);
+
+    return 0;
+}
+
+static void qcow2_dedup_free(BlockDriverState *bs)
+{
+    BDRVQcowState *s = bs->opaque;
+    g_free(s->dedup_table);
+
+    qcow2_cache_flush(bs, s->dedup_cluster_cache);
+    qcow2_cache_destroy(bs, s->dedup_cluster_cache);
+    g_tree_destroy(s->dedup_tree_by_sect);
+    g_tree_destroy(s->dedup_tree_by_hash);
+}
+
+int qcow2_dedup_init(BlockDriverState *bs)
+{
+    BDRVQcowState *s = bs->opaque;
+    int ret = 0;
+
+    s->has_dedup = true;
+
+    ret = qcow2_dedup_alloc(bs);
+
+    if (ret < 0) {
+        return ret;
+    }
+
+    /* if we are read-only we don't load the deduplication table */
+    if (bs->read_only) {
+        return 0;
+    }
+
+    s->dedup_status = QCOW_DEDUP_STARTING;
+
+    return 0;
+}
+
+void qcow2_dedup_close(BlockDriverState *bs)
+{
+    qcow2_dedup_free(bs);
+}
diff --git a/block/qcow2.h b/block/qcow2.h
index 9f5d0f0..29267a9 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -507,5 +507,7 @@ void qcow2_dedup_refcount_zero_reached(BlockDriverState *bs,
 void qcow2_dedup_refcount_half_max_reached(BlockDriverState *bs,
                                            uint64_t cluster_index);
 bool qcow2_dedup_is_running(BlockDriverState *bs);
+int qcow2_dedup_init(BlockDriverState *bs);
+void qcow2_dedup_close(BlockDriverState *bs);
 
 #endif
-- 
1.7.10.4

  parent reply	other threads:[~2013-01-16 16:27 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-16 16:24 [Qemu-devel] [RFC V5 00/36] QCOW2 deduplication core functionality Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 01/36] qcow2: Add deduplication to the qcow2 specification Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 02/36] qcow2: Add deduplication structures and fields Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 03/36] qcow2: Add qcow2_dedup_read_missing_and_concatenate Benoît Canet
2013-01-16 16:53   ` Eric Blake
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 04/36] qcow2: Make update_refcount public Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 05/36] qcow2: Create a way to link to l2 tables when deduplicating Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 06/36] qcow2: Add qcow2_dedup and related functions Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 07/36] qcow2: Add qcow2_dedup_store_new_hashes Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 08/36] qcow2: Implement qcow2_compute_cluster_hash Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 09/36] qcow2: Extract qcow2_dedup_grow_table Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 10/36] qcow2: Add qcow2_dedup_grow_table and use it Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 11/36] qcow2: Makes qcow2_alloc_cluster_link_l2 mark to deduplicate clusters Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 12/36] qcow2: make the deduplication forget a cluster hash when a cluster is to dedupe Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 13/36] qcow2: Create qcow2_is_cluster_to_dedup Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 14/36] qcow2: Load and save deduplication table header extension Benoît Canet
2013-01-16 17:35   ` Eric Blake
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 15/36] qcow2: Extract qcow2_do_table_init Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 16/36] qcow2-cache: Allow to choose table size at creation Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 17/36] qcow2: Extract qcow2_add_feature and qcow2_remove_feature Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 18/36] block: Add qemu-img dedup create option Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 19/36] qcow2: Add a deduplication boolean to update_refcount Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 20/36] qcow2: Drop hash for a given cluster when dedup makes refcount > 2^16/2 Benoît Canet
2013-01-16 17:46   ` Eric Blake
2013-01-21 11:51     ` Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 21/36] qcow2: Remove hash when cluster is deleted Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 22/36] qcow2: Add qcow2_dedup_is_running to probe if dedup is running Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 23/36] qcow2: Integrate deduplication in qcow2_co_writev loop Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 24/36] qcow2: Serialize write requests when deduplication is activated Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 25/36] qcow2: Add verification of dedup table Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 26/36] qcow2: Adapt checking of QCOW_OFLAG_COPIED for dedup Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 27/36] qcow2: Add check_dedup_l2 in order to check l2 of dedup table Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 28/36] qcow2: Do not overwrite existing entries with QCOW_OFLAG_COPIED Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 29/36] qcow2: Integrate SKEIN hash algorithm in deduplication Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 30/36] qcow2: Add lazy refcounts to deduplication to prevent qcow2_cache_set_dependency loops Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 31/36] qcow2: Use large L2 table for deduplication Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 32/36] qcow: Set large dedup hash block size Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 33/36] qemu-iotests: Filter dedup=on/off so existing tests don't break Benoît Canet
2013-01-16 16:24 ` Benoît Canet [this message]
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 35/36] qcow2: Add qcow2_co_dedup_resume to restart deduplication Benoît Canet
2013-01-16 16:24 ` [Qemu-devel] [RFC V5 36/36] qcow2: Enable the deduplication feature Benoît Canet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1358353497-5292-35-git-send-email-benoit@irqsave.net \
    --to=benoit@irqsave.net \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).