[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] blockjob: use deferred_to_main_loop to indica
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/10] blockjob: use deferred_to_main_loop to indicate the coroutine has ended |
Date: |
Thu, 23 Mar 2017 18:39:28 +0100 |
All block jobs are using block_job_defer_to_main_loop as the final
step just before the coroutine terminates. At this point,
block_job_enter should do nothing, but currently it restarts
the freed coroutine.
Now, the job->co states should probably be changed to an enum
(e.g. BEFORE_START, STARTED, YIELDED, COMPLETED) subsuming
block_job_started, job->deferred_to_main_loop and job->busy.
For now, this patch eliminates the problematic reenter by
removing the reset of job->deferred_to_main_loop (which served
no purpose, as far as I could see) and checking the flag in
block_job_enter.
Signed-off-by: Paolo Bonzini <address@hidden>
---
blockjob.c | 10 ++++++++--
include/block/blockjob_int.h | 3 ++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index 3fa2885..2d80dae 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -750,7 +750,14 @@ void block_job_resume_all(void)
void block_job_enter(BlockJob *job)
{
- if (job->co && !job->busy) {
+ if (!block_job_started(job)) {
+ return;
+ }
+ if (job->deferred_to_main_loop) {
+ return;
+ }
+
+ if (!job->busy) {
qemu_coroutine_enter(job->co);
}
}
@@ -874,7 +881,6 @@ static void block_job_defer_to_main_loop_bh(void *opaque)
aio_context_acquire(aio_context);
}
- data->job->deferred_to_main_loop = false;
data->fn(data->job, data->opaque);
if (aio_context != data->aio_context) {
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
index 97ffc43..4d287ba 100644
--- a/include/block/blockjob_int.h
+++ b/include/block/blockjob_int.h
@@ -227,7 +227,8 @@ typedef void BlockJobDeferToMainLoopFn(BlockJob *job, void
*opaque);
* @fn: The function to run in the main loop
* @opaque: The opaque value that is passed to @fn
*
- * Execute a given function in the main loop with the BlockDriverState
+ * This function must be called by the main job coroutine just before it
+ * returns. @fn is executed in the main loop with the BlockDriverState
* AioContext acquired. Block jobs must call bdrv_unref(), bdrv_close(), and
* anything that uses bdrv_drain_all() in the main loop.
*
--
2.9.3
- [Qemu-devel] [PATCH for-2.10 00/10] Preparation for block job mutex, Paolo Bonzini, 2017/03/23
- [Qemu-devel] [PATCH 01/10] blockjob: remove unnecessary check, Paolo Bonzini, 2017/03/23
- [Qemu-devel] [PATCH 02/10] blockjob: remove iostatus_reset callback, Paolo Bonzini, 2017/03/23
- [Qemu-devel] [PATCH 03/10] blockjob: introduce block_job_fail, Paolo Bonzini, 2017/03/23
- [Qemu-devel] [PATCH 05/10] blockjob: separate monitor and blockjob APIs, Paolo Bonzini, 2017/03/23
- [Qemu-devel] [PATCH 04/10] blockjob: introduce block_job_pause/resume_all, Paolo Bonzini, 2017/03/23
- [Qemu-devel] [PATCH 06/10] blockjob: move iostatus reset inside block_job_user_resume, Paolo Bonzini, 2017/03/23
- [Qemu-devel] [PATCH 09/10] blockjob: reorganize block_job_completed_txn_abort, Paolo Bonzini, 2017/03/23
- [Qemu-devel] [PATCH 08/10] blockjob: introduce block_job_cancel_async, Paolo Bonzini, 2017/03/23
- [Qemu-devel] [PATCH 07/10] blockjob: strengthen a bit test-blockjob-txn, Paolo Bonzini, 2017/03/23
- [Qemu-devel] [PATCH 10/10] blockjob: use deferred_to_main_loop to indicate the coroutine has ended,
Paolo Bonzini <=