[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 14/16] qcow2: Execute run_dependent_requests() w
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [RFC PATCH 14/16] qcow2: Execute run_dependent_requests() without lock |
Date: |
Tue, 18 Sep 2012 13:40:40 +0200 |
There's no reason for run_dependent_requests() to hold s->lock, and a
later patch will require that in fact the lock is not held.
Also, before this patch, run_dependent_requests() not only does what its
name suggests, but also removes the l2meta from the list of in-flight
requests. Change this, while we're touching it.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2.c | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index e001436..88a2020 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -739,16 +739,9 @@ fail:
static void run_dependent_requests(BDRVQcowState *s, QCowL2Meta *m)
{
- /* Take the request off the list of running requests */
- if (m->nb_clusters != 0) {
- QLIST_REMOVE(m, next_in_flight);
- }
-
/* Restart all dependent requests */
if (!qemu_co_queue_empty(&m->dependent_requests)) {
- qemu_co_mutex_unlock(&s->lock);
qemu_co_queue_restart_all(&m->dependent_requests);
- qemu_co_mutex_lock(&s->lock);
}
}
@@ -800,10 +793,18 @@ again:
goto again;
}
+ qemu_co_mutex_unlock(&s->lock);
+
+ /* Take the request off the list of running requests */
+ if (m->nb_clusters != 0) {
+ QLIST_REMOVE(m, next_in_flight);
+ }
+
+ /* Meanwhile some new dependencies could have accumulated */
run_dependent_requests(s, m);
+
g_free(m);
- qemu_co_mutex_unlock(&s->lock);
qemu_co_rwlock_unlock(&s->l2meta_flush);
}
@@ -961,13 +962,16 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState
*bs,
ret = 0;
fail:
+ qemu_co_mutex_unlock(&s->lock);
+
if (l2meta != NULL) {
+ if (l2meta->nb_clusters != 0) {
+ QLIST_REMOVE(l2meta, next_in_flight);
+ }
run_dependent_requests(s, l2meta);
g_free(l2meta);
}
- qemu_co_mutex_unlock(&s->lock);
-
qemu_iovec_destroy(&hd_qiov);
qemu_vfree(cluster_data);
trace_qcow2_writev_done_req(qemu_coroutine_self(), ret);
@@ -1259,7 +1263,7 @@ static int preallocate(BlockDriverState *bs)
/* There are no dependent requests, but we need to remove our request
* from the list of in-flight requests */
if (meta != NULL) {
- run_dependent_requests(bs->opaque, meta);
+ QLIST_REMOVE(meta, next_in_flight);
}
/* TODO Preallocate data if requested */
--
1.7.6.5
- [Qemu-devel] [RFC PATCH 03/16] qcow2: Allocate l2meta dynamically, (continued)
- [Qemu-devel] [RFC PATCH 03/16] qcow2: Allocate l2meta dynamically, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 08/16] qcow2: Reading from areas not in L2 tables yet, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 16/16] [BROKEN] qcow2: Overwrite COW and allocate new cluster at the same time, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 02/16] qcow2: Introduce Qcow2COWRegion, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 01/16] qcow2: Round QCowL2Meta.offset down to cluster boundary, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 04/16] qcow2: Drop l2meta.cluster_offset, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 07/16] qcow2: Factor out handle_dependencies(), Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 06/16] qcow2: Enable dirty flag in qcow2_alloc_cluster_link_l2, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 05/16] qcow2: Allocate l2meta only for cluster allocations, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 12/16] qcow2: Handle dependencies earlier, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 14/16] qcow2: Execute run_dependent_requests() without lock,
Kevin Wolf <=
- [Qemu-devel] [RFC PATCH 09/16] qcow2: Move COW and L2 update into own coroutine, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 13/16] qcow2: Change handle_dependency to byte granularity, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 11/16] qcow2: Add error handling to the l2meta coroutine, Kevin Wolf, 2012/09/18
- [Qemu-devel] [RFC PATCH 10/16] qcow2: Delay the COW, Kevin Wolf, 2012/09/18