From nobody Wed Oct 29 17:29:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526651470351943.3537130681743; Fri, 18 May 2018 06:51:10 -0700 (PDT) Received: from localhost ([::1]:39061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJfmn-0008Sa-Fi for importer@patchew.org; Fri, 18 May 2018 09:51:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJfKs-0000MR-PU for qemu-devel@nongnu.org; Fri, 18 May 2018 09:22:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJfKr-0006OH-Cc for qemu-devel@nongnu.org; Fri, 18 May 2018 09:22:18 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46724 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fJfKm-0006IX-Kr; Fri, 18 May 2018 09:22:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4AC5081FE16E; Fri, 18 May 2018 13:22:12 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-149.ams2.redhat.com [10.36.117.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id F14C12024CBF; Fri, 18 May 2018 13:22:10 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 18 May 2018 15:21:06 +0200 Message-Id: <20180518132114.4070-33-kwolf@redhat.com> In-Reply-To: <20180518132114.4070-1-kwolf@redhat.com> References: <20180518132114.4070-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 18 May 2018 13:22:12 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 18 May 2018 13:22:12 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 32/40] job: Add job_transition_to_ready() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org, jsnow@redhat.com, jcody@redhat.com, armbru@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The transition to the READY state was still performed in the BlockJob layer, in the same function that sent the BLOCK_JOB_READY QMP event. This patch brings the state transition to the Job layer and implements the QMP event using a notifier called from the Job layer, like we already do for other events related to state transitions. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- include/block/blockjob.h | 3 +++ include/block/blockjob_int.h | 8 -------- include/qemu/job.h | 9 ++++++--- block/mirror.c | 6 +++--- blockjob.c | 33 ++++++++++++++++++--------------- job.c | 16 +++++++++++++--- tests/test-bdrv-drain.c | 2 +- tests/test-blockjob.c | 2 +- 8 files changed, 45 insertions(+), 34 deletions(-) diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 8e1e1ee0de..4fca45f6a1 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -76,6 +76,9 @@ typedef struct BlockJob { /** Called when the job transitions to PENDING */ Notifier pending_notifier; =20 + /** Called when the job transitions to READY */ + Notifier ready_notifier; + /** BlockDriverStates that are involved in this block job */ GSList *nodes; } BlockJob; diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index 806ac64d87..5cd50c6639 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -116,14 +116,6 @@ void block_job_drain(Job *job); int64_t block_job_ratelimit_get_delay(BlockJob *job, uint64_t n); =20 /** - * block_job_event_ready: - * @job: The job which is now ready to be completed. - * - * Send a BLOCK_JOB_READY event for the specified job. - */ -void block_job_event_ready(BlockJob *job); - -/** * block_job_error_action: * @job: The job to signal an error for. * @on_err: The error action setting. diff --git a/include/qemu/job.h b/include/qemu/job.h index 487f9d9a32..bfc2bc5611 100644 --- a/include/qemu/job.h +++ b/include/qemu/job.h @@ -132,6 +132,9 @@ typedef struct Job { /** Notifiers called when the job transitions to PENDING */ NotifierList on_pending; =20 + /** Notifiers called when the job transitions to READY */ + NotifierList on_ready; + /** Element of the list of jobs */ QLIST_ENTRY(Job) job_list; =20 @@ -426,6 +429,9 @@ int job_apply_verb(Job *job, JobVerb verb, Error **errp= ); /** The @job could not be started, free it. */ void job_early_fail(Job *job); =20 +/** Moves the @job from RUNNING to READY */ +void job_transition_to_ready(Job *job); + /** * @job: The job being completed. * @ret: The status code. @@ -522,7 +528,4 @@ void job_defer_to_main_loop(Job *job, JobDeferToMainLoo= pFn *fn, void *opaque); */ int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error *= *errp); =20 -/* TODO To be removed from the public interface */ -void job_state_transition(Job *job, JobStatus s1); - #endif diff --git a/block/mirror.c b/block/mirror.c index 687f955c22..bdc1b5b7b9 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -727,8 +727,8 @@ static void coroutine_fn mirror_run(void *opaque) } =20 if (s->bdev_length =3D=3D 0) { - /* Report BLOCK_JOB_READY and wait for complete. */ - block_job_event_ready(&s->common); + /* Transition to the READY state and wait for complete. */ + job_transition_to_ready(&s->common.job); s->synced =3D true; while (!job_is_cancelled(&s->common.job) && !s->should_complete) { job_yield(&s->common.job); @@ -824,7 +824,7 @@ static void coroutine_fn mirror_run(void *opaque) * report completion. This way, block-job-cancel will lea= ve * the target in a consistent state. */ - block_job_event_ready(&s->common); + job_transition_to_ready(&s->common.job); s->synced =3D true; } =20 diff --git a/blockjob.c b/blockjob.c index 38f18e9ba3..da11b3b763 100644 --- a/blockjob.c +++ b/blockjob.c @@ -338,6 +338,22 @@ static void block_job_event_pending(Notifier *n, void = *opaque) &error_abort); } =20 +static void block_job_event_ready(Notifier *n, void *opaque) +{ + BlockJob *job =3D opaque; + + if (block_job_is_internal(job)) { + return; + } + + qapi_event_send_block_job_ready(job_type(&job->job), + job->job.id, + job->len, + job->offset, + job->speed, &error_abort); +} + + /* * API for block job drivers and the block layer. These functions are * declared in blockjob_int.h. @@ -386,12 +402,14 @@ void *block_job_create(const char *job_id, const Bloc= kJobDriver *driver, job->finalize_cancelled_notifier.notify =3D block_job_event_cancelled; job->finalize_completed_notifier.notify =3D block_job_event_completed; job->pending_notifier.notify =3D block_job_event_pending; + job->ready_notifier.notify =3D block_job_event_ready; =20 notifier_list_add(&job->job.on_finalize_cancelled, &job->finalize_cancelled_notifier); notifier_list_add(&job->job.on_finalize_completed, &job->finalize_completed_notifier); notifier_list_add(&job->job.on_pending, &job->pending_notifier); + notifier_list_add(&job->job.on_ready, &job->ready_notifier); =20 error_setg(&job->blocker, "block device is in use by block job: %s", job_type_str(&job->job)); @@ -433,21 +451,6 @@ void block_job_user_resume(Job *job) block_job_iostatus_reset(bjob); } =20 -void block_job_event_ready(BlockJob *job) -{ - job_state_transition(&job->job, JOB_STATUS_READY); - - if (block_job_is_internal(job)) { - return; - } - - qapi_event_send_block_job_ready(job_type(&job->job), - job->job.id, - job->len, - job->offset, - job->speed, &error_abort); -} - BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_= err, int is_read, int error) { diff --git a/job.c b/job.c index 66ee26f2a0..34304f2883 100644 --- a/job.c +++ b/job.c @@ -157,9 +157,7 @@ static int job_txn_apply(JobTxn *txn, int fn(Job *), bo= ol lock) return rc; } =20 - -/* TODO Make static once the whole state machine is in job.c */ -void job_state_transition(Job *job, JobStatus s1) +static void job_state_transition(Job *job, JobStatus s1) { JobStatus s0 =3D job->status; assert(s1 >=3D 0 && s1 <=3D JOB_STATUS__MAX); @@ -321,6 +319,7 @@ void *job_create(const char *job_id, const JobDriver *d= river, JobTxn *txn, notifier_list_init(&job->on_finalize_cancelled); notifier_list_init(&job->on_finalize_completed); notifier_list_init(&job->on_pending); + notifier_list_init(&job->on_ready); =20 job_state_transition(job, JOB_STATUS_CREATED); aio_timer_init(qemu_get_aio_context(), &job->sleep_timer, @@ -380,6 +379,11 @@ static void job_event_pending(Job *job) notifier_list_notify(&job->on_pending, job); } =20 +static void job_event_ready(Job *job) +{ + notifier_list_notify(&job->on_ready, job); +} + void job_enter_cond(Job *job, bool(*fn)(Job *job)) { if (!job_started(job)) { @@ -799,6 +803,12 @@ static int job_transition_to_pending(Job *job) return 0; } =20 +void job_transition_to_ready(Job *job) +{ + job_state_transition(job, JOB_STATUS_READY); + job_event_ready(job); +} + static void job_completed_txn_success(Job *job) { JobTxn *txn =3D job->txn; diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c index 3600ffd3fb..2cba63b881 100644 --- a/tests/test-bdrv-drain.c +++ b/tests/test-bdrv-drain.c @@ -505,7 +505,7 @@ static void coroutine_fn test_job_start(void *opaque) { TestBlockJob *s =3D opaque; =20 - block_job_event_ready(&s->common); + job_transition_to_ready(&s->common.job); while (!s->should_complete) { job_sleep_ns(&s->common.job, 100000); } diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c index 8180d03a5f..e408d52351 100644 --- a/tests/test-blockjob.c +++ b/tests/test-blockjob.c @@ -186,7 +186,7 @@ static void coroutine_fn cancel_job_start(void *opaque) } =20 if (!job_is_ready(&s->common.job) && s->should_converge) { - block_job_event_ready(&s->common); + job_transition_to_ready(&s->common.job); } =20 job_sleep_ns(&s->common.job, 100000); --=20 2.13.6