|
|
357786 |
From c1d6c990e959598f6a1269756b481e4e4230ded8 Mon Sep 17 00:00:00 2001
|
|
|
357786 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
357786 |
Date: Tue, 26 Jun 2018 09:48:17 +0200
|
|
|
357786 |
Subject: [PATCH 48/89] job: Convert block_job_cancel_async() to Job
|
|
|
357786 |
|
|
|
357786 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
357786 |
Message-id: <20180626094856.6924-35-kwolf@redhat.com>
|
|
|
357786 |
Patchwork-id: 81072
|
|
|
357786 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 34/73] job: Convert block_job_cancel_async() to Job
|
|
|
357786 |
Bugzilla: 1513543
|
|
|
357786 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
357786 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
block_job_cancel_async() did two things that were still block job
|
|
|
357786 |
specific:
|
|
|
357786 |
|
|
|
357786 |
* Setting job->force. This field makes sense on the Job level, so we can
|
|
|
357786 |
just move it. While at it, rename it to job->force_cancel to make its
|
|
|
357786 |
purpose more obvious.
|
|
|
357786 |
|
|
|
357786 |
* Resetting the I/O status. This can't be moved because generic Jobs
|
|
|
357786 |
don't have an I/O status. What the function really implements is a
|
|
|
357786 |
user resume, except without entering the coroutine. Consequently, it
|
|
|
357786 |
makes sense to call the .user_resume driver callback here which
|
|
|
357786 |
already resets the I/O status.
|
|
|
357786 |
|
|
|
357786 |
The old block_job_cancel_async() has two separate if statements that
|
|
|
357786 |
check job->iostatus != BLOCK_DEVICE_IO_STATUS_OK and job->user_paused.
|
|
|
357786 |
However, the former condition always implies the latter (as is
|
|
|
357786 |
asserted in block_job_iostatus_reset()), so changing the explicit call
|
|
|
357786 |
of block_job_iostatus_reset() on the former condition with the
|
|
|
357786 |
.user_resume callback on the latter condition is equivalent and
|
|
|
357786 |
doesn't need to access any BlockJob specific state.
|
|
|
357786 |
|
|
|
357786 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
357786 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
(cherry picked from commit 004e95df98266da33e08c9f1731aca71b6d6d7c4)
|
|
|
357786 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
357786 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
---
|
|
|
357786 |
block/mirror.c | 4 ++--
|
|
|
357786 |
blockjob.c | 25 +++++++++++++------------
|
|
|
357786 |
include/block/blockjob.h | 6 ------
|
|
|
357786 |
include/qemu/job.h | 6 ++++++
|
|
|
357786 |
4 files changed, 21 insertions(+), 20 deletions(-)
|
|
|
357786 |
|
|
|
357786 |
diff --git a/block/mirror.c b/block/mirror.c
|
|
|
357786 |
index e9a90ea..c3951d1 100644
|
|
|
357786 |
--- a/block/mirror.c
|
|
|
357786 |
+++ b/block/mirror.c
|
|
|
357786 |
@@ -871,7 +871,7 @@ static void coroutine_fn mirror_run(void *opaque)
|
|
|
357786 |
trace_mirror_before_sleep(s, cnt, s->synced, delay_ns);
|
|
|
357786 |
job_sleep_ns(&s->common.job, delay_ns);
|
|
|
357786 |
if (job_is_cancelled(&s->common.job) &&
|
|
|
357786 |
- (!s->synced || s->common.force))
|
|
|
357786 |
+ (!s->synced || s->common.job.force_cancel))
|
|
|
357786 |
{
|
|
|
357786 |
break;
|
|
|
357786 |
}
|
|
|
357786 |
@@ -884,7 +884,7 @@ immediate_exit:
|
|
|
357786 |
* or it was cancelled prematurely so that we do not guarantee that
|
|
|
357786 |
* the target is a copy of the source.
|
|
|
357786 |
*/
|
|
|
357786 |
- assert(ret < 0 || ((s->common.force || !s->synced) &&
|
|
|
357786 |
+ assert(ret < 0 || ((s->common.job.force_cancel || !s->synced) &&
|
|
|
357786 |
job_is_cancelled(&s->common.job)));
|
|
|
357786 |
assert(need_drain);
|
|
|
357786 |
mirror_wait_for_all_io(s);
|
|
|
357786 |
diff --git a/blockjob.c b/blockjob.c
|
|
|
357786 |
index 34c57da..4cac367 100644
|
|
|
357786 |
--- a/blockjob.c
|
|
|
357786 |
+++ b/blockjob.c
|
|
|
357786 |
@@ -270,19 +270,20 @@ static int block_job_prepare(BlockJob *job)
|
|
|
357786 |
return job->job.ret;
|
|
|
357786 |
}
|
|
|
357786 |
|
|
|
357786 |
-static void block_job_cancel_async(BlockJob *job, bool force)
|
|
|
357786 |
+static void job_cancel_async(Job *job, bool force)
|
|
|
357786 |
{
|
|
|
357786 |
- if (job->iostatus != BLOCK_DEVICE_IO_STATUS_OK) {
|
|
|
357786 |
- block_job_iostatus_reset(job);
|
|
|
357786 |
- }
|
|
|
357786 |
- if (job->job.user_paused) {
|
|
|
357786 |
- /* Do not call block_job_enter here, the caller will handle it. */
|
|
|
357786 |
- job->job.user_paused = false;
|
|
|
357786 |
- job->job.pause_count--;
|
|
|
357786 |
+ if (job->user_paused) {
|
|
|
357786 |
+ /* Do not call job_enter here, the caller will handle it. */
|
|
|
357786 |
+ job->user_paused = false;
|
|
|
357786 |
+ if (job->driver->user_resume) {
|
|
|
357786 |
+ job->driver->user_resume(job);
|
|
|
357786 |
+ }
|
|
|
357786 |
+ assert(job->pause_count > 0);
|
|
|
357786 |
+ job->pause_count--;
|
|
|
357786 |
}
|
|
|
357786 |
- job->job.cancelled = true;
|
|
|
357786 |
+ job->cancelled = true;
|
|
|
357786 |
/* To prevent 'force == false' overriding a previous 'force == true' */
|
|
|
357786 |
- job->force |= force;
|
|
|
357786 |
+ job->force_cancel |= force;
|
|
|
357786 |
}
|
|
|
357786 |
|
|
|
357786 |
static int block_job_txn_apply(BlockJobTxn *txn, int fn(BlockJob *), bool lock)
|
|
|
357786 |
@@ -367,7 +368,7 @@ static void block_job_completed_txn_abort(BlockJob *job)
|
|
|
357786 |
* on the caller, so leave it. */
|
|
|
357786 |
QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
|
|
|
357786 |
if (other_job != job) {
|
|
|
357786 |
- block_job_cancel_async(other_job, false);
|
|
|
357786 |
+ job_cancel_async(&other_job->job, false);
|
|
|
357786 |
}
|
|
|
357786 |
}
|
|
|
357786 |
while (!QLIST_EMPTY(&txn->jobs)) {
|
|
|
357786 |
@@ -527,7 +528,7 @@ void block_job_cancel(BlockJob *job, bool force)
|
|
|
357786 |
job_do_dismiss(&job->job);
|
|
|
357786 |
return;
|
|
|
357786 |
}
|
|
|
357786 |
- block_job_cancel_async(job, force);
|
|
|
357786 |
+ job_cancel_async(&job->job, force);
|
|
|
357786 |
if (!job_started(&job->job)) {
|
|
|
357786 |
block_job_completed(job, -ECANCELED);
|
|
|
357786 |
} else if (job->job.deferred_to_main_loop) {
|
|
|
357786 |
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
|
|
|
357786 |
index 3f405d1..d975efe 100644
|
|
|
357786 |
--- a/include/block/blockjob.h
|
|
|
357786 |
+++ b/include/block/blockjob.h
|
|
|
357786 |
@@ -51,12 +51,6 @@ typedef struct BlockJob {
|
|
|
357786 |
BlockBackend *blk;
|
|
|
357786 |
|
|
|
357786 |
/**
|
|
|
357786 |
- * Set to true if the job should abort immediately without waiting
|
|
|
357786 |
- * for data to be in sync.
|
|
|
357786 |
- */
|
|
|
357786 |
- bool force;
|
|
|
357786 |
-
|
|
|
357786 |
- /**
|
|
|
357786 |
* Set to true when the job is ready to be completed.
|
|
|
357786 |
*/
|
|
|
357786 |
bool ready;
|
|
|
357786 |
diff --git a/include/qemu/job.h b/include/qemu/job.h
|
|
|
357786 |
index 3e817be..2648c74 100644
|
|
|
357786 |
--- a/include/qemu/job.h
|
|
|
357786 |
+++ b/include/qemu/job.h
|
|
|
357786 |
@@ -97,6 +97,12 @@ typedef struct Job {
|
|
|
357786 |
*/
|
|
|
357786 |
bool cancelled;
|
|
|
357786 |
|
|
|
357786 |
+ /**
|
|
|
357786 |
+ * Set to true if the job should abort immediately without waiting
|
|
|
357786 |
+ * for data to be in sync.
|
|
|
357786 |
+ */
|
|
|
357786 |
+ bool force_cancel;
|
|
|
357786 |
+
|
|
|
357786 |
/** Set to true when the job has deferred work to the main loop. */
|
|
|
357786 |
bool deferred_to_main_loop;
|
|
|
357786 |
|
|
|
357786 |
--
|
|
|
357786 |
1.8.3.1
|
|
|
357786 |
|