From nobody Wed Oct 29 17:30:52 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 1526650989525716.6966774283982; Fri, 18 May 2018 06:43:09 -0700 (PDT) Received: from localhost ([::1]:39014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJff2-00023H-GI for importer@patchew.org; Fri, 18 May 2018 09:43:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJfKm-0000Cn-2n for qemu-devel@nongnu.org; Fri, 18 May 2018 09:22:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJfKk-0006HG-Pl for qemu-devel@nongnu.org; Fri, 18 May 2018 09:22:12 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40280 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 1fJfKh-0006En-UR; Fri, 18 May 2018 09:22:08 -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 96EC54023112; Fri, 18 May 2018 13:22:07 +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 47C592024CBF; Fri, 18 May 2018 13:22:06 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 18 May 2018 15:21:03 +0200 Message-Id: <20180518132114.4070-30-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.6]); Fri, 18 May 2018 13:22:07 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 18 May 2018 13:22:07 +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 29/40] job: Add job_yield() 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" This moves block_job_yield() to the Job layer. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- include/block/blockjob_int.h | 8 -------- include/qemu/job.h | 9 +++++++-- block/backup.c | 2 +- block/mirror.c | 2 +- blockjob.c | 16 ---------------- job.c | 20 ++++++++++++++++++-- tests/test-blockjob-txn.c | 2 +- 7 files changed, 28 insertions(+), 31 deletions(-) diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index 7df07b20cf..806ac64d87 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -108,14 +108,6 @@ void block_job_user_resume(Job *job); void block_job_drain(Job *job); =20 /** - * block_job_yield: - * @job: The job that calls the function. - * - * Yield the block job coroutine. - */ -void block_job_yield(BlockJob *job); - -/** * block_job_ratelimit_get_delay: * * Calculate and return delay for the next request in ns. See the document= ation diff --git a/include/qemu/job.h b/include/qemu/job.h index bbe1b0cd1a..94900ec008 100644 --- a/include/qemu/job.h +++ b/include/qemu/job.h @@ -339,6 +339,13 @@ void coroutine_fn job_pause_point(Job *job); =20 /** * @job: The job that calls the function. + * + * Yield the job coroutine. + */ +void job_yield(Job *job); + +/** + * @job: The job that calls the function. * @ns: How many nanoseconds to stop for. * * Put the job to sleep (assuming that it wasn't canceled) for @ns @@ -508,8 +515,6 @@ int job_finish_sync(Job *job, void (*finish)(Job *, Err= or **errp), Error **errp) =20 /* TODO To be removed from the public interface */ void job_state_transition(Job *job, JobStatus s1); -void coroutine_fn job_do_yield(Job *job, uint64_t ns); -bool job_should_pause(Job *job); void job_do_dismiss(Job *job); =20 #endif diff --git a/block/backup.c b/block/backup.c index b13f91d8a7..6f4f3df229 100644 --- a/block/backup.c +++ b/block/backup.c @@ -444,7 +444,7 @@ static void coroutine_fn backup_run(void *opaque) while (!job_is_cancelled(&job->common.job)) { /* Yield until the job is cancelled. We just let our before_w= rite * notify callback service CoW requests. */ - block_job_yield(&job->common); + job_yield(&job->common.job); } } else if (job->sync_mode =3D=3D MIRROR_SYNC_MODE_INCREMENTAL) { ret =3D backup_run_incremental(job); diff --git a/block/mirror.c b/block/mirror.c index c63cf7cbc9..687f955c22 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -731,7 +731,7 @@ static void coroutine_fn mirror_run(void *opaque) block_job_event_ready(&s->common); s->synced =3D true; while (!job_is_cancelled(&s->common.job) && !s->should_complete) { - block_job_yield(&s->common); + job_yield(&s->common.job); } s->common.job.cancelled =3D false; goto immediate_exit; diff --git a/blockjob.c b/blockjob.c index 438baa1778..f146fe0cbd 100644 --- a/blockjob.c +++ b/blockjob.c @@ -431,22 +431,6 @@ void *block_job_create(const char *job_id, const Block= JobDriver *driver, return job; } =20 -void block_job_yield(BlockJob *job) -{ - assert(job->job.busy); - - /* Check cancellation *before* setting busy =3D false, too! */ - if (job_is_cancelled(&job->job)) { - return; - } - - if (!job_should_pause(&job->job)) { - job_do_yield(&job->job, -1); - } - - job_pause_point(&job->job); -} - void block_job_iostatus_reset(BlockJob *job) { if (job->iostatus =3D=3D BLOCK_DEVICE_IO_STATUS_OK) { diff --git a/job.c b/job.c index 26f70bcab7..d7cdcd2456 100644 --- a/job.c +++ b/job.c @@ -226,7 +226,7 @@ static bool job_started(Job *job) return job->co; } =20 -bool job_should_pause(Job *job) +static bool job_should_pause(Job *job) { return job->pause_count > 0; } @@ -396,7 +396,7 @@ void job_enter(Job *job) * * If @ns is (uint64_t) -1, no timer is scheduled and job_enter() must be * called explicitly. */ -void coroutine_fn job_do_yield(Job *job, uint64_t ns) +static void coroutine_fn job_do_yield(Job *job, uint64_t ns) { job_lock(); if (ns !=3D -1) { @@ -441,6 +441,22 @@ void coroutine_fn job_pause_point(Job *job) } } =20 +void job_yield(Job *job) +{ + assert(job->busy); + + /* Check cancellation *before* setting busy =3D false, too! */ + if (job_is_cancelled(job)) { + return; + } + + if (!job_should_pause(job)) { + job_do_yield(job, -1); + } + + job_pause_point(job); +} + void coroutine_fn job_sleep_ns(Job *job, int64_t ns) { assert(job->busy); diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c index 34ee179574..fce836639a 100644 --- a/tests/test-blockjob-txn.c +++ b/tests/test-blockjob-txn.c @@ -47,7 +47,7 @@ static void coroutine_fn test_block_job_run(void *opaque) if (s->use_timer) { job_sleep_ns(&job->job, 0); } else { - block_job_yield(job); + job_yield(&job->job); } =20 if (job_is_cancelled(&job->job)) { --=20 2.13.6