[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v11 16/21] blockjob: protect iostatus field in BlockJob struct
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v11 16/21] blockjob: protect iostatus field in BlockJob struct |
Date: |
Fri, 26 Aug 2022 09:20:59 -0400 |
iostatus is the only field (together with .job) that needs
protection using the job mutex.
It is set in the main loop (GLOBAL_STATE functions) but read
in I/O code (block_job_error_action).
In order to protect it, change block_job_iostatus_set_err
to block_job_iostatus_set_err_locked(), always called under
job lock.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
block/mirror.c | 7 +++++--
blockjob.c | 5 +++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index c6bf7f40ce..7e32ee1d31 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -893,7 +893,7 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
MirrorBlockJob *s = container_of(job, MirrorBlockJob, common.job);
BlockDriverState *bs = s->mirror_top_bs->backing->bs;
BlockDriverState *target_bs = blk_bs(s->target);
- bool need_drain = true;
+ bool need_drain = true, iostatus;
int64_t length;
int64_t target_length;
BlockDriverInfo bdi;
@@ -1016,8 +1016,11 @@ static int coroutine_fn mirror_run(Job *job, Error
**errp)
* We do so every BLKOCK_JOB_SLICE_TIME nanoseconds, or when there is
* an error, or when the source is clean, whichever comes first. */
delta = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - s->last_pause_ns;
+ WITH_JOB_LOCK_GUARD() {
+ iostatus = s->common.iostatus;
+ }
if (delta < BLOCK_JOB_SLICE_TIME &&
- s->common.iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
+ iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
if (s->in_flight >= MAX_IN_FLIGHT || s->buf_free_count == 0 ||
(cnt == 0 && s->in_flight > 0)) {
trace_mirror_yield(s, cnt, s->buf_free_count, s->in_flight);
diff --git a/blockjob.c b/blockjob.c
index d8fb5311c7..d04f804001 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -363,7 +363,8 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
return block_job_query_locked(job, errp);
}
-static void block_job_iostatus_set_err(BlockJob *job, int error)
+/* Called with job lock held */
+static void block_job_iostatus_set_err_locked(BlockJob *job, int error)
{
if (job->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
job->iostatus = error == ENOSPC ? BLOCK_DEVICE_IO_STATUS_NOSPACE :
@@ -577,8 +578,8 @@ BlockErrorAction block_job_error_action(BlockJob *job,
BlockdevOnError on_err,
*/
job->job.user_paused = true;
}
+ block_job_iostatus_set_err_locked(job, error);
}
- block_job_iostatus_set_err(job, error);
}
return action;
}
--
2.31.1
- [PATCH v11 00/21] job: replace AioContext lock with job_mutex, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 02/21] job.h: categorize fields in struct Job, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 01/21] job.c: make job_mutex and job_lock/unlock() public, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 08/21] jobs: add job lock in find_* functions, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 10/21] block/mirror.c: use of job helpers in drivers, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 04/21] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 07/21] blockjob: introduce block_job _locked() APIs, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 05/21] job.c: add job_lock/unlock while keeping job.h intact, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 03/21] job.c: API functions not used outside should be static, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 16/21] blockjob: protect iostatus field in BlockJob struct,
Emanuele Giuseppe Esposito <=
- [PATCH v11 13/21] jobs: protect job.aio_context with BQL and job_mutex, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 17/21] job.h: categorize JobDriver callbacks that need the AioContext lock, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 20/21] blockjob: remove unused functions, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 14/21] blockjob.h: categorize fields in struct BlockJob, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 11/21] jobs: group together API calls under the same job lock, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 19/21] block_job_query: remove atomic read, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 12/21] job: detect change of aiocontext within job coroutine, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 21/21] job: remove unused functions, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 18/21] job.c: enable job lock/unlock and remove Aiocontext locks, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 09/21] jobs: use job locks also in the unit tests, Emanuele Giuseppe Esposito, 2022/08/26