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 V3 10/24] qcow2: create function to load deduplication hashes at startup.
Date: Mon, 26 Nov 2012 14:05:09 +0100 [thread overview]
Message-ID: <1353935123-24199-11-git-send-email-benoit@irqsave.net> (raw)
In-Reply-To: <1353935123-24199-1-git-send-email-benoit@irqsave.net>
Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
block/qcow2-dedup.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
block/qcow2.h | 1 +
2 files changed, 67 insertions(+)
diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c
index 2ebbbcf..1760e8a 100644
--- a/block/qcow2-dedup.c
+++ b/block/qcow2-dedup.c
@@ -690,6 +690,72 @@ fail:
return ret;
}
+static void qcow2_dedup_insert_hash_and_preserve_newer(BlockDriverState *bs,
+ QCowHashNode *hash_node)
+{
+ BDRVQcowState *s = bs->opaque;
+ QCowHashNode *newer_hash_node;
+
+ newer_hash_node = g_tree_lookup(s->dedup_tree_by_offset,
+ &hash_node->offset);
+
+ if (!newer_hash_node) {
+ g_tree_insert(s->dedup_tree_by_hash, hash_node->hash, hash_node);
+ g_tree_insert(s->dedup_tree_by_offset, &hash_node->offset, hash_node);
+ } else {
+ g_free(hash_node->hash);
+ g_free(hash_node);
+ }
+}
+
+/*
+ * This coroutine load the deduplication hashes in the tree
+ *
+ * @data: the given BlockDriverState
+ * @ret: NULL
+ */
+void coroutine_fn qcow2_co_load_dedup_hashes(void *opaque)
+{
+ BlockDriverState *bs = opaque;
+ BDRVQcowState *s = bs->opaque;
+ int ret;
+ uint8_t *hash = NULL;
+ uint8_t null_hash[HASH_LENGTH];
+ uint64_t max_cluster_offset, i;
+ uint64_t first_logical_offset;
+ int nb_hash_in_dedup_cluster = s->cluster_size / (HASH_LENGTH + 8);
+ QCowHashNode *hash_node;
+
+ /* prepare the null hash */
+ memset(null_hash, 0, HASH_LENGTH);
+
+ max_cluster_offset = s->dedup_table_size * nb_hash_in_dedup_cluster;
+
+ for (i = 0; i < max_cluster_offset; i++) {
+ /* get the hash */
+ qemu_co_mutex_lock(&s->lock);
+ ret = qcow2_dedup_read_write_hash(bs, &hash,
+ &first_logical_offset,
+ i * s->cluster_sectors,
+ false);
+ if (ret < 0) {
+ qemu_co_mutex_unlock(&s->lock);
+ error_report("Failed to load deduplication hash.");
+ }
+
+ /* if the hash is not null load it into the tree */
+ if (memcmp(hash, null_hash, HASH_LENGTH)) {
+ hash_node = qcow2_dedup_build_qcow_hash_node(hash,
+ i * s->cluster_sectors,
+ first_logical_offset);
+ qcow2_dedup_insert_hash_and_preserve_newer(bs, hash_node);
+ } else {
+ free(hash);
+ }
+ qemu_co_mutex_unlock(&s->lock);
+ }
+}
+
/*
* Save the dedup table information into the header extensions
*
diff --git a/block/qcow2.h b/block/qcow2.h
index 62822b7..c7edb14 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -396,6 +396,7 @@ int qcow2_dedup_write_new_hashes(BlockDriverState *bs,
int hash_count,
uint64_t logical_cluster_offset,
uint64_t physical_cluster_offset);
+void coroutine_fn qcow2_co_load_dedup_hashes(void *opaque);
int qcow2_dedup_grow_table(BlockDriverState *bs,
int min_size,
bool exact_size);
--
1.7.10.4
next prev parent reply other threads:[~2012-11-26 13:06 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-26 13:04 [Qemu-devel] [RFC V3 00/24] QCOW2 deduplication Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 01/24] qcow2: Add deduplication to the qcow2 specification Benoît Canet
2012-12-11 11:28 ` Stefan Hajnoczi
2012-12-11 11:32 ` Stefan Hajnoczi
2012-12-12 15:57 ` Benoît Canet
2012-12-18 13:38 ` Stefan Hajnoczi
2012-12-11 23:03 ` Eric Blake
2012-12-12 15:59 ` Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 02/24] qcow2: Add deduplication structures and fields Benoît Canet
2012-12-11 11:34 ` Stefan Hajnoczi
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 03/24] qcow2: Add qcow2_dedup_read_missing_and_concatenate Benoît Canet
2012-12-11 11:52 ` Stefan Hajnoczi
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 04/24] qcow2: Make update_cluster_refcount public Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 05/24] qcow2: Create a way to link to l2 tables in dedup Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 06/24] qcow2: Add qcow2_dedup and related functions Benoît Canet
2012-12-11 13:16 ` Stefan Hajnoczi
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 07/24] qcow2: Add qcow2_dedup_write_new_hashes Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 08/24] qcow2: Implement qcow2_compute_cluster_hash Benoît Canet
2012-12-11 13:28 ` Stefan Hajnoczi
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 09/24] qcow2: Extract qcow2_dedup_grow_table Benoît Canet
2012-11-26 13:05 ` Benoît Canet [this message]
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 11/24] qcow2: Load and save deduplication table header extension Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 12/24] qcow2: Extract qcow2_do_table_init Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 13/24] qcow2: Add qcow2_dedup_init and qcow2_dedup_close Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 14/24] qcow2: Extract qcow2_add_feature and qcow2_remove_feature Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 15/24] block: Add dedup image create option Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 16/24] qcow2: Allow creation of images using deduplication Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 17/24] qcow2: Behave correctly when refcount reach 0 or 2^16 Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 18/24] qcow2: Integrate deduplication in qcow2_co_writev loop Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 19/24] qcow2: Add verification of dedup table Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 20/24] qcow2: Adapt checking of QCOW_OFLAG_COPIED for dedup Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 21/24] qcow2: Add check_dedup_l2 in order to check l2 of dedup table Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 22/24] qcow2: Do not overwrite existing entries with QCOW_OFLAG_COPIED Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 23/24] qcow2: init and cleanup deduplication Benoît Canet
2012-11-26 13:05 ` [Qemu-devel] [RFC V3 24/24] qemu-iotests: Filter dedup=on/off so existing tests don't break Benoît Canet
2012-12-11 14:19 ` [Qemu-devel] [RFC V3 00/24] QCOW2 deduplication Stefan Hajnoczi
2012-12-11 14:38 ` Stefan Hajnoczi
2012-12-12 16:14 ` Benoît Canet
2012-12-18 13:42 ` Stefan Hajnoczi
2012-12-24 12:26 ` 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=1353935123-24199-11-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).