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 10/36] qcow2: Add qcow2_dedup_grow_table and use it.
Date: Wed, 16 Jan 2013 17:24:31 +0100 [thread overview]
Message-ID: <1358353497-5292-11-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 | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c
index de1b366..de6e3a3 100644
--- a/block/qcow2-dedup.c
+++ b/block/qcow2-dedup.c
@@ -38,6 +38,44 @@ static int qcow2_dedup_read_write_hash(BlockDriverState *bs,
bool write);
/*
+ * Save the dedup table information into the header extensions
+ *
+ * @table_offset: the dedup table offset in the QCOW2 file
+ * @size: the size of the dedup table
+ * @ret: 0 on success, -errno on error
+ */
+static int qcow2_dedup_save_table_info(BlockDriverState *bs,
+ int64_t table_offset, int size)
+{
+ BDRVQcowState *s = bs->opaque;
+ s->dedup_table_offset = table_offset;
+ s->dedup_table_size = size;
+ return qcow2_update_header(bs);
+}
+
+/*
+ * Grow the deduplication table
+ *
+ * @min_size: minimal size
+ * @exact_size: if true force to grow to the exact size
+ * @ret: 0 on success, -errno on error
+ */
+static int qcow2_dedup_grow_table(BlockDriverState *bs,
+ int min_size,
+ bool exact_size)
+{
+ BDRVQcowState *s = bs->opaque;
+ return qcow2_do_grow_table(bs,
+ min_size,
+ exact_size,
+ &s->dedup_table,
+ &s->dedup_table_offset,
+ &s->dedup_table_size,
+ qcow2_dedup_save_table_info,
+ "dedup");
+}
+
+/*
* Prepare a buffer containing all the required data required to compute cluster
* sized deduplication hashes.
* If sector_num or nb_sectors are not cluster-aligned, missing data
@@ -712,7 +750,11 @@ static int qcow2_dedup_read_write_hash(BlockDriverState *bs,
index_in_dedup_table = cluster_number / nb_hash_in_block;
if (s->dedup_table_size <= index_in_dedup_table) {
- return -ENOSPC;
+ ret = qcow2_dedup_grow_table(bs, index_in_dedup_table + 1, false);
+ }
+
+ if (ret < 0) {
+ return ret;
}
/* if we must read and there is nothing to read return a null hash */
--
1.7.10.4
next prev parent reply other threads:[~2013-01-16 16:25 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 ` Benoît Canet [this message]
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 ` [Qemu-devel] [RFC V5 34/36] qcow2: Add qcow2_dedup_init and qcow2_dedup_close Benoît Canet
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-11-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).