diff options
| author | Emanuele Giuseppe Esposito <eesposit@redhat.com> | 2022-09-26 05:32:09 -0400 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2022-10-07 12:11:41 +0200 |
| commit | d59cb66de32c27443b12b774147b611f8e459e9b (patch) | |
| tree | 139c107ff47319a0260cc69063400c8a15489c16 /block/mirror.c | |
| parent | 243c6ec7fe8a2ce8bf1481444049ffce649c8f76 (diff) | |
| download | qemu-d59cb66de32c27443b12b774147b611f8e459e9b.zip qemu-d59cb66de32c27443b12b774147b611f8e459e9b.tar.gz qemu-d59cb66de32c27443b12b774147b611f8e459e9b.tar.bz2 | |
blockjob: protect iostatus field in BlockJob struct
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>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20220926093214.506243-17-eesposit@redhat.com>
[kwolf: Fixed up type of iostatus]
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/mirror.c')
| -rw-r--r-- | block/mirror.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/mirror.c b/block/mirror.c index c6bf7f4..80c0109 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -894,6 +894,7 @@ static int coroutine_fn mirror_run(Job *job, Error **errp) BlockDriverState *bs = s->mirror_top_bs->backing->bs; BlockDriverState *target_bs = blk_bs(s->target); bool need_drain = true; + BlockDeviceIoStatus iostatus; int64_t length; int64_t target_length; BlockDriverInfo bdi; @@ -1016,8 +1017,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); |