[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 12/20] block/mirror.c: use of job helpers in drivers to avoid
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v8 12/20] block/mirror.c: use of job helpers in drivers to avoid TOC/TOU |
Date: |
Wed, 29 Jun 2022 10:15:30 -0400 |
Once job lock is used and aiocontext is removed, mirror has
to perform job operations under the same critical section,
using the helpers prepared in previous commit.
Note: at this stage, job_{lock/unlock} and job lock guard macros
are *nop*.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/mirror.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index d8ecb9efa2..b38676e19d 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -654,9 +654,13 @@ static int mirror_exit_common(Job *job)
BlockDriverState *target_bs;
BlockDriverState *mirror_top_bs;
Error *local_err = NULL;
- bool abort = job->ret < 0;
+ bool abort;
int ret = 0;
+ WITH_JOB_LOCK_GUARD() {
+ abort = job->ret < 0;
+ }
+
if (s->prepared) {
return 0;
}
@@ -1152,8 +1156,10 @@ static void mirror_complete(Job *job, Error **errp)
s->should_complete = true;
/* If the job is paused, it will be re-entered when it is resumed */
- if (!job->paused) {
- job_enter(job);
+ WITH_JOB_LOCK_GUARD() {
+ if (!job->paused) {
+ job_enter_cond_locked(job, NULL);
+ }
}
}
@@ -1173,8 +1179,11 @@ static bool mirror_drained_poll(BlockJob *job)
* from one of our own drain sections, to avoid a deadlock waiting for
* ourselves.
*/
- if (!s->common.job.paused && !job_is_cancelled(&job->job) && !s->in_drain)
{
- return true;
+ WITH_JOB_LOCK_GUARD() {
+ if (!s->common.job.paused && !job_is_cancelled_locked(&job->job)
+ && !s->in_drain) {
+ return true;
+ }
}
return !!s->in_flight;
--
2.31.1
- [PATCH v8 11/20] jobs: use job locks also in the unit tests, (continued)
- [PATCH v8 11/20] jobs: use job locks also in the unit tests, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 08/20] blockjob.h: introduce block_job _locked() APIs, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 03/20] job.c: API functions not used outside should be static, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 15/20] job: detect change of aiocontext within job coroutine, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 20/20] job: remove unused functions, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 17/20] job.c: enable job lock/unlock and remove Aiocontext locks, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 13/20] jobs: group together API calls under the same job lock, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 05/20] job.c: add job_lock/unlock while keeping job.h intact, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 18/20] block_job_query: remove atomic read, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 19/20] blockjob: remove unused functions, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 12/20] block/mirror.c: use of job helpers in drivers to avoid TOC/TOU,
Emanuele Giuseppe Esposito <=
- [PATCH v8 16/20] jobs: protect job.aio_context with BQL and job_mutex, Emanuele Giuseppe Esposito, 2022/06/29
- [PATCH v8 14/20] commit and mirror: create new nodes using bdrv_get_aio_context, and not the job aiocontext, Emanuele Giuseppe Esposito, 2022/06/29