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 V4 11/30] qcow2: create function to load deduplication hashes at startup.
Date: Wed,  2 Jan 2013 17:16:14 +0100	[thread overview]
Message-ID: <1357143393-29832-12-git-send-email-benoit@irqsave.net> (raw)
In-Reply-To: <1357143393-29832-1-git-send-email-benoit@irqsave.net>

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

diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c
index b998a2d..4c391e5 100644
--- a/block/qcow2-dedup.c
+++ b/block/qcow2-dedup.c
@@ -918,3 +918,71 @@ int qcow2_dedup_store_new_hashes(BlockDriverState *bs,
 
     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_sect,
+                                    &hash_node->physical_sect);
+
+    if (!newer_hash_node) {
+        g_tree_insert(s->dedup_tree_by_hash, &hash_node->hash, hash_node);
+        g_tree_insert(s->dedup_tree_by_sect, &hash_node->physical_sect,
+                      hash_node);
+    } else {
+        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;
+    QCowHash hash, null_hash;
+    uint64_t max_clusters, i;
+    uint64_t first_logical_sect;
+    int nb_hash_in_hash_block = s->hash_block_size / (HASH_LENGTH + 8);
+    QCowHashNode *hash_node;
+
+    /* prepare the null hash */
+    memset(&null_hash, 0, sizeof(null_hash));
+
+    max_clusters = s->dedup_table_size * nb_hash_in_hash_block;
+
+    for (i = 0; i < max_clusters; i++) {
+        /* get the hash */
+        qemu_co_mutex_lock(&s->lock);
+        ret = qcow2_dedup_read_write_hash(bs, &hash,
+                                          &first_logical_sect,
+                                          i * s->cluster_sectors,
+                                          false);
+
+        if (ret < 0) {
+            qemu_co_mutex_unlock(&s->lock);
+            error_report("Failed to load deduplication hash.");
+            continue;
+        }
+
+        /* if the hash is null don't load it */
+        if (!memcmp(hash.data, null_hash.data, HASH_LENGTH)) {
+            qemu_co_mutex_unlock(&s->lock);
+            continue;
+        }
+
+        hash_node = qcow2_dedup_build_qcow_hash_node(&hash,
+                                                     i * s->cluster_sectors,
+                                                     first_logical_sect);
+        qcow2_dedup_insert_hash_and_preserve_newer(bs, hash_node);
+        qemu_co_mutex_unlock(&s->lock);
+    }
+}
diff --git a/block/qcow2.h b/block/qcow2.h
index afa730e..5cbfc82 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -467,5 +467,6 @@ int qcow2_dedup_store_new_hashes(BlockDriverState *bs,
                                  int count,
                                  uint64_t logical_sect,
                                  uint64_t physical_sect);
+void coroutine_fn qcow2_co_load_dedup_hashes(void *opaque);
 
 #endif
-- 
1.7.10.4

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

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-02 16:16 [Qemu-devel] [RFC V4 00/30] QCOW2 deduplication Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 01/30] qcow2: Add deduplication to the qcow2 specification Benoît Canet
2013-01-03 18:18   ` Eric Blake
2013-01-04 14:49     ` Benoît Canet
2013-01-16 14:50     ` Benoît Canet
2013-01-16 15:58       ` Eric Blake
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 02/30] qcow2: Add deduplication structures and fields Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 03/30] qcow2: Add qcow2_dedup_read_missing_and_concatenate Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 04/30] qcow2: Make update_refcount public Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 05/30] qcow2: Create a way to link to l2 tables when deduplicating Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 06/30] qcow2: Add qcow2_dedup and related functions Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 07/30] qcow2: Add qcow2_dedup_store_new_hashes Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 08/30] qcow2: Implement qcow2_compute_cluster_hash Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 09/30] qcow2: Extract qcow2_dedup_grow_table Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 10/30] qcow2: Add qcow2_dedup_grow_table and use it Benoît Canet
2013-01-02 16:16 ` Benoît Canet [this message]
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 12/30] qcow2: Load and save deduplication table header extension Benoît Canet
2013-01-05  0:02   ` Eric Blake
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 13/30] qcow2: Extract qcow2_do_table_init Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 14/30] qcow2-cache: Allow to choose table size at creation Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 15/30] qcow2: Add qcow2_dedup_init and qcow2_dedup_close Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 16/30] qcow2: Extract qcow2_add_feature and qcow2_remove_feature Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 17/30] block: Add qemu-img dedup create option Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 18/30] qcow2: Behave correctly when refcount reach 0 or 2^16 Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 19/30] qcow2: Integrate deduplication in qcow2_co_writev loop Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 20/30] qcow2: Serialize write requests when deduplication is activated Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 21/30] qcow2: Add verification of dedup table Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 22/30] qcow2: Adapt checking of QCOW_OFLAG_COPIED for dedup Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 23/30] qcow2: Add check_dedup_l2 in order to check l2 of dedup table Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 24/30] qcow2: Do not overwrite existing entries with QCOW_OFLAG_COPIED Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 25/30] qcow2: Integrate SKEIN hash algorithm in deduplication Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 26/30] qcow2: Add lazy refcounts to deduplication to prevent qcow2_cache_set_dependency loops Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 27/30] qcow2: Use large L2 table for deduplication Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 28/30] qcow: Set dedup cluster block size to 64KB Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 29/30] qcow2: init and cleanup deduplication Benoît Canet
2013-01-02 16:16 ` [Qemu-devel] [RFC V4 30/30] qemu-iotests: Filter dedup=on/off so existing tests don't break Benoît Canet
2013-01-02 16:42   ` Eric Blake
2013-01-02 16:50     ` Benoît Canet
2013-01-02 17:10 ` [Qemu-devel] [RFC V4 00/30] QCOW2 deduplication Troy Benjegerdes
2013-01-02 17:33   ` Benoît Canet
2013-01-02 18:01     ` Eric Blake
2013-01-02 18:16       ` Benoît Canet
2013-01-02 18:26     ` Troy Benjegerdes
2013-01-02 18:40       ` Benoît Canet
2013-01-02 18:47         ` ronnie sahlberg
2013-01-02 18:55           ` Benoît Canet
2013-01-02 19:18           ` Troy Benjegerdes
2013-01-03  2:16             ` ronnie sahlberg
2013-01-03 12:39       ` Stefan Hajnoczi
2013-01-03 19:51         ` Troy Benjegerdes
2013-01-04  7:09           ` Dietmar Maurer
2013-01-04  9:49           ` Stefan Hajnoczi
2013-01-03 17:18 ` 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=1357143393-29832-12-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).