From: "Benoît Canet" <benoit@irqsave.net>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, "Benoît Canet" <benoit@irqsave.net>,
stefanha@redhat.com
Subject: [Qemu-devel] [RFC V7 30/32] qcow2: Add qcow2_dedup_init and qcow2_dedup_close.
Date: Fri, 15 Mar 2013 15:49:44 +0100 [thread overview]
Message-ID: <1363358986-8360-31-git-send-email-benoit@irqsave.net> (raw)
In-Reply-To: <1363358986-8360-1-git-send-email-benoit@irqsave.net>
Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
block/qcow2-dedup.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++
block/qcow2.h | 2 ++
2 files changed, 80 insertions(+)
diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c
index 6ad9d0c..c2dd145 100644
--- a/block/qcow2-dedup.c
+++ b/block/qcow2-dedup.c
@@ -1091,3 +1091,81 @@ bool qcow2_dedup_is_running(BlockDriverState *bs)
BDRVQcowState *s = bs->opaque;
return s->has_dedup && s->dedup_status == DEDUP_STATUS_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 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_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_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 = DEDUP_STATUS_STARTING;
+
+ return 0;
+}
+
+void qcow2_dedup_close(BlockDriverState *bs)
+{
+ qcow2_dedup_free(bs);
+}
diff --git a/block/qcow2.h b/block/qcow2.h
index a430fe1..9275be1 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -500,5 +500,7 @@ int qcow2_dedup_store_new_hashes(BlockDriverState *bs,
void qcow2_dedup_destroy_hash(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
next prev parent reply other threads:[~2013-03-15 14:52 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 14:49 [Qemu-devel] [RFC V7 00/32] QCOW2 deduplication core functionality Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 01/32] qcow2: Add deduplication to the qcow2 specification Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 02/32] qmp: Add DedupStatus enum Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 03/32] qcow2: Add deduplication structures and fields Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 04/32] qcow2: Add qcow2_dedup_read_missing_and_concatenate Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 05/32] qcow2: Create a way to link to l2 tables when deduplicating Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 06/32] qcow2: Make qcow2_update_cluster_refcount public Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 07/32] qcow2: Add qcow2_dedup and related functions Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 08/32] qcow2: Add qcow2_dedup_store_new_hashes Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 09/32] qcow2: Do allocate on rewrite on the dedup case Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 10/32] qcow2: Implement qcow2_compute_cluster_hash Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 11/32] qcow2: Add qcow2_dedup_grow_table and use it Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 12/32] qcow2: Makes qcow2_alloc_cluster_link_l2 mark to deduplicate clusters Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 13/32] qcow2: make the deduplication forget a cluster hash when a cluster is to dedupe Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 14/32] qcow2: Create qcow2_is_cluster_to_dedup Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 15/32] qcow2: Load and save deduplication table header extension Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 16/32] qcow2: Extract qcow2_do_table_init Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 17/32] qcow2-cache: Allow to choose table size at creation Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 18/32] qcow2: Extract qcow2_set_incompat_feature and qcow2_clear_incompat_feature Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 19/32] block: Add qcow2_dedup format and image creation code Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 20/32] qcow2: Drop hash for a given cluster when dedup makes refcount > 2^16/2 Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 21/32] qcow2: Remove hash when cluster is deleted Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 22/32] qcow2: Add qcow2_dedup_is_running to probe if dedup is running Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 23/32] qcow2: Integrate deduplication in qcow2_co_writev loop Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 24/32] qcow2: Serialize write requests when deduplication is activated Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 25/32] qcow2: Adapt checking of QCOW_OFLAG_COPIED for dedup Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 26/32] qcow2: Add check_dedup_l2 in order to check l2 of dedup table Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 27/32] qcow2: Add verification " Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 28/32] qcow2: Integrate SKEIN hash algorithm in deduplication Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 29/32] qcow: Set large dedup hash block size Benoît Canet
2013-03-15 14:49 ` Benoît Canet [this message]
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 31/32] qcow2: Add qcow2_co_dedup_resume to restart deduplication Benoît Canet
2013-03-15 14:49 ` [Qemu-devel] [RFC V7 32/32] 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=1363358986-8360-31-git-send-email-benoit@irqsave.net \
--to=benoit@irqsave.net \
--cc=kwolf@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).