[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC V6 25/33] qcow2: Serialize write requests when dedupli
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [RFC V6 25/33] qcow2: Serialize write requests when deduplication is activated. |
Date: |
Wed, 6 Feb 2013 13:31:58 +0100 |
This fix the sub cluster sized writes race conditions while waiting
for a more faster solution.
Signed-off-by: Benoit Canet <address@hidden>
---
block/qcow2.c | 14 +++++++++++++-
block/qcow2.h | 1 +
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index f39b6d5..5cfffd2 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -524,6 +524,7 @@ static int qcow2_open(BlockDriverState *bs, int flags)
/* Initialise locks */
qemu_co_mutex_init(&s->lock);
+ qemu_co_mutex_init(&s->dedup_lock);
/* Repair image if dirty */
if (!(flags & BDRV_O_CHECK) && !bs->read_only &&
@@ -815,8 +816,15 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState
*bs,
s->cluster_cache_offset = -1; /* disable compressed cache */
qemu_co_mutex_lock(&s->lock);
-
atomic_dedup_is_running = qcow2_dedup_is_running(bs);
+ qemu_co_mutex_unlock(&s->lock);
+
+ if (atomic_dedup_is_running) {
+ qemu_co_mutex_lock(&s->dedup_lock);
+ }
+
+ qemu_co_mutex_lock(&s->lock);
+
if (atomic_dedup_is_running) {
QTAILQ_INIT(&ds.undedupables);
ds.phash.reuse = false;
@@ -983,6 +991,10 @@ fail:
g_free(l2meta);
}
+ if (atomic_dedup_is_running) {
+ qemu_co_mutex_unlock(&s->dedup_lock);
+ }
+
qemu_iovec_destroy(&hd_qiov);
qemu_vfree(cluster_data);
qemu_vfree(dedup_cluster_data);
diff --git a/block/qcow2.h b/block/qcow2.h
index a13ec75..81dc0ea 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -236,6 +236,7 @@ typedef struct BDRVQcowState {
GTree *dedup_tree_by_sect;
CoMutex lock;
+ CoMutex dedup_lock;
uint32_t crypt_method; /* current crypt method, 0 if no key yet */
uint32_t crypt_method_header;
--
1.7.10.4
- [Qemu-devel] [RFC V6 16/33] qcow2: Extract qcow2_do_table_init., (continued)
- [Qemu-devel] [RFC V6 16/33] qcow2: Extract qcow2_do_table_init., Benoît Canet, 2013/02/06
- [Qemu-devel] [RFC V6 20/33] qcow2: Add a deduplication boolean to update_refcount., Benoît Canet, 2013/02/06
- [Qemu-devel] [RFC V6 21/33] qcow2: Drop hash for a given cluster when dedup makes refcount > 2^16/2., Benoît Canet, 2013/02/06
- [Qemu-devel] [RFC V6 22/33] qcow2: Remove hash when cluster is deleted., Benoît Canet, 2013/02/06
- [Qemu-devel] [RFC V6 19/33] block: Add qcow2_dedup format and image creation code., Benoît Canet, 2013/02/06
- [Qemu-devel] [RFC V6 25/33] qcow2: Serialize write requests when deduplication is activated.,
Benoît Canet <=
- [Qemu-devel] [RFC V6 30/33] qcow2: Integrate SKEIN hash algorithm in deduplication., Benoît Canet, 2013/02/06
- [Qemu-devel] [RFC V6 32/33] qemu-iotests: Filter dedup=on/off so existing tests don't break., Benoît Canet, 2013/02/06
- [Qemu-devel] [RFC V6 31/33] qcow: Set large dedup hash block size., Benoît Canet, 2013/02/06
- [Qemu-devel] [RFC V6 33/33] qcow2: Add qcow2_dedup_init and qcow2_dedup_close., Benoît Canet, 2013/02/06