[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 08/10] blockjob: introduce block_job_do_yield
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 08/10] blockjob: introduce block_job_do_yield |
Date: |
Wed, 29 Nov 2017 16:26:26 +0100 |
From: Paolo Bonzini <address@hidden>
Hide the clearing of job->busy in a single function, and set it
in block_job_enter. This lets block_job_do_yield verify that
qemu_coroutine_enter is not used while job->busy = false.
Signed-off-by: Paolo Bonzini <address@hidden>
Tested-By: Jeff Cody <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockjob.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index db9e4fc89a..4d22b7d2fb 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -729,6 +729,15 @@ static bool block_job_should_pause(BlockJob *job)
return job->pause_count > 0;
}
+static void block_job_do_yield(BlockJob *job)
+{
+ job->busy = false;
+ qemu_coroutine_yield();
+
+ /* Set by block_job_enter before re-entering the coroutine. */
+ assert(job->busy);
+}
+
void coroutine_fn block_job_pause_point(BlockJob *job)
{
assert(job && block_job_started(job));
@@ -746,9 +755,7 @@ void coroutine_fn block_job_pause_point(BlockJob *job)
if (block_job_should_pause(job) && !block_job_is_cancelled(job)) {
job->paused = true;
- job->busy = false;
- qemu_coroutine_yield(); /* wait for block_job_resume() */
- job->busy = true;
+ block_job_do_yield(job);
job->paused = false;
}
@@ -778,9 +785,12 @@ void block_job_enter(BlockJob *job)
return;
}
- if (!job->busy) {
- bdrv_coroutine_enter(blk_bs(job->blk), job->co);
+ if (job->busy) {
+ return;
}
+
+ job->busy = true;
+ aio_co_wake(job->co);
}
bool block_job_is_cancelled(BlockJob *job)
@@ -819,11 +829,9 @@ void block_job_yield(BlockJob *job)
return;
}
- job->busy = false;
if (!block_job_should_pause(job)) {
- qemu_coroutine_yield();
+ block_job_do_yield(job);
}
- job->busy = true;
block_job_pause_point(job);
}
--
2.13.6
- [Qemu-block] [PULL 00/10] Block layer fixes for 2.11.0-rc3, Kevin Wolf, 2017/11/29
- [Qemu-block] [PULL 01/10] iotests: fix 075 and 078, Kevin Wolf, 2017/11/29
- [Qemu-block] [PULL 03/10] qemu-options: Mention locking option of file driver, Kevin Wolf, 2017/11/29
- [Qemu-block] [PULL 05/10] blockjob: Remove the job from the list earlier in block_job_unref(), Kevin Wolf, 2017/11/29
- [Qemu-block] [PULL 04/10] QAPI & interop: Clarify events emitted by 'block-job-cancel', Kevin Wolf, 2017/11/29
- [Qemu-block] [PULL 02/10] docs: Add image locking subsection, Kevin Wolf, 2017/11/29
- [Qemu-block] [PULL 06/10] block: Expect graph changes in bdrv_parent_drained_begin/end, Kevin Wolf, 2017/11/29
- [Qemu-block] [PULL 07/10] blockjob: remove clock argument from block_job_sleep_ns, Kevin Wolf, 2017/11/29
- [Qemu-block] [PULL 08/10] blockjob: introduce block_job_do_yield,
Kevin Wolf <=
- [Qemu-block] [PULL 09/10] blockjob: reimplement block_job_sleep_ns to allow cancellation, Kevin Wolf, 2017/11/29
- [Qemu-block] [PULL 10/10] block/nfs: fix nfs_client_open for filesize greater than 1TB, Kevin Wolf, 2017/11/29
- Re: [Qemu-block] [PULL 00/10] Block layer fixes for 2.11.0-rc3, Peter Maydell, 2017/11/29