[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC V5 24/62] qcow2: Serialize write requests when dedupli
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [RFC V5 24/62] qcow2: Serialize write requests when deduplication is activated. |
Date: |
Wed, 16 Jan 2013 16:48:03 +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 6b8f85f..4f8cf68 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -523,6 +523,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 &&
@@ -814,8 +815,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;
@@ -982,6 +990,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 dc9f519..9f5d0f0 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -239,6 +239,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 V5 62/62] qmp: Add block_resume_dedup., (continued)
- [Qemu-devel] [RFC V5 62/62] qmp: Add block_resume_dedup., Benoît Canet, 2013/01/16
- Re: [Qemu-devel] [RFC V5 00/62] QCOW2 deduplication, Eric Blake, 2013/01/16
- [Qemu-devel] [RFC V5 41/62] qcow2: Collect undeduplicated cluster metric., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 25/62] qcow2: Add verification of dedup table., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 39/62] qcow2: Collect unaligned writes missing data reads metric., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 59/62] qcow2: Make dedup status persists., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 21/62] qcow2: Remove hash when cluster is deleted., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 51/62] block: Add BlockDriver function prototype to pause and resume deduplication., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 37/62] qcow2: Add deduplication metrics structures., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 24/62] qcow2: Serialize write requests when deduplication is activated.,
Benoît Canet <=
- [Qemu-devel] [RFC V5 26/62] qcow2: Adapt checking of QCOW_OFLAG_COPIED for dedup., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 40/62] qcow2: Collect deduplicated cluster metric., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 57/62] qcow2: Add qcow2_pause_dedup., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 16/62] qcow2-cache: Allow to choose table size at creation., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 58/62] qcow2: Add qcow2_resume_dedup., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 60/62] qerror: Add QERR_DEVICE_NOT_DEDUPLICATED., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 28/62] qcow2: Do not overwrite existing entries with QCOW_OFLAG_COPIED., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 15/62] qcow2: Extract qcow2_do_table_init., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 43/62] qcow2: Count QCowHashNode removal from tree for metrics., Benoît Canet, 2013/01/16
- [Qemu-devel] [RFC V5 23/62] qcow2: Integrate deduplication in qcow2_co_writev loop., Benoît Canet, 2013/01/16