|
 |
26ba25 |
From 011fbd28d5f69f770357bcca6a767605de84fe95 Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Date: Wed, 10 Oct 2018 20:22:00 +0100
|
|
|
26ba25 |
Subject: [PATCH 34/49] job: Use AIO_WAIT_WHILE() in job_finish_sync()
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Message-id: <20181010202213.7372-22-kwolf@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 82612
|
|
|
26ba25 |
O-Subject: [RHEL-8 qemu-kvm PATCH 31/44] job: Use AIO_WAIT_WHILE() in job_finish_sync()
|
|
|
26ba25 |
Bugzilla: 1637976
|
|
|
26ba25 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
job_finish_sync() needs to release the AioContext lock of the job before
|
|
|
26ba25 |
calling aio_poll(). Otherwise, callbacks called by aio_poll() would
|
|
|
26ba25 |
possibly take the lock a second time and run into a deadlock with a
|
|
|
26ba25 |
nested AIO_WAIT_WHILE() call.
|
|
|
26ba25 |
|
|
|
26ba25 |
Also, job_drain() without aio_poll() isn't necessarily enough to make
|
|
|
26ba25 |
progress on a job, it could depend on bottom halves to be executed.
|
|
|
26ba25 |
|
|
|
26ba25 |
Combine both open-coded while loops into a single AIO_WAIT_WHILE() call
|
|
|
26ba25 |
that solves both of these problems.
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Reviewed-by: Fam Zheng <famz@redhat.com>
|
|
|
26ba25 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit de0fbe64806321fc3e6399bfab360553db87a41d)
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
job.c | 14 ++++++--------
|
|
|
26ba25 |
1 file changed, 6 insertions(+), 8 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/job.c b/job.c
|
|
|
26ba25 |
index 5a0ccc7..47b5a11 100644
|
|
|
26ba25 |
--- a/job.c
|
|
|
26ba25 |
+++ b/job.c
|
|
|
26ba25 |
@@ -29,6 +29,7 @@
|
|
|
26ba25 |
#include "qemu/job.h"
|
|
|
26ba25 |
#include "qemu/id.h"
|
|
|
26ba25 |
#include "qemu/main-loop.h"
|
|
|
26ba25 |
+#include "block/aio-wait.h"
|
|
|
26ba25 |
#include "trace-root.h"
|
|
|
26ba25 |
#include "qapi/qapi-events-job.h"
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -957,6 +958,7 @@ void job_complete(Job *job, Error **errp)
|
|
|
26ba25 |
int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error **errp)
|
|
|
26ba25 |
{
|
|
|
26ba25 |
Error *local_err = NULL;
|
|
|
26ba25 |
+ AioWait dummy_wait = {};
|
|
|
26ba25 |
int ret;
|
|
|
26ba25 |
|
|
|
26ba25 |
job_ref(job);
|
|
|
26ba25 |
@@ -969,14 +971,10 @@ int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error **errp)
|
|
|
26ba25 |
job_unref(job);
|
|
|
26ba25 |
return -EBUSY;
|
|
|
26ba25 |
}
|
|
|
26ba25 |
- /* job_drain calls job_enter, and it should be enough to induce progress
|
|
|
26ba25 |
- * until the job completes or moves to the main thread. */
|
|
|
26ba25 |
- while (!job->deferred_to_main_loop && !job_is_completed(job)) {
|
|
|
26ba25 |
- job_drain(job);
|
|
|
26ba25 |
- }
|
|
|
26ba25 |
- while (!job_is_completed(job)) {
|
|
|
26ba25 |
- aio_poll(qemu_get_aio_context(), true);
|
|
|
26ba25 |
- }
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+ AIO_WAIT_WHILE(&dummy_wait, job->aio_context,
|
|
|
26ba25 |
+ (job_drain(job), !job_is_completed(job)));
|
|
|
26ba25 |
+
|
|
|
26ba25 |
ret = (job_is_cancelled(job) && job->ret == 0) ? -ECANCELED : job->ret;
|
|
|
26ba25 |
job_unref(job);
|
|
|
26ba25 |
return ret;
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|