From nobody Mon Feb 9 18:46:28 2026 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490290940446442.1402009984024; Thu, 23 Mar 2017 10:42:20 -0700 (PDT) Received: from localhost ([::1]:57687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cr6kd-0007Un-4R for importer@patchew.org; Thu, 23 Mar 2017 13:42:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cr6i1-0005Pz-Cv for qemu-devel@nongnu.org; Thu, 23 Mar 2017 13:39:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cr6i0-0002RI-4c for qemu-devel@nongnu.org; Thu, 23 Mar 2017 13:39:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37358) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cr6hz-0002R9-Rv for qemu-devel@nongnu.org; Thu, 23 Mar 2017 13:39:36 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E1655624A9 for ; Thu, 23 Mar 2017 17:39:35 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-116-97.ams2.redhat.com [10.36.116.97]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2NHdS1i032060; Thu, 23 Mar 2017 13:39:34 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E1655624A9 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E1655624A9 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 23 Mar 2017 18:39:22 +0100 Message-Id: <20170323173928.14439-5-pbonzini@redhat.com> In-Reply-To: <20170323173928.14439-1-pbonzini@redhat.com> References: <20170323173928.14439-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 23 Mar 2017 17:39:36 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 04/10] blockjob: introduce block_job_pause/resume_all 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: jcody@redhat.com, jsnow@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" Remove use of block_job_pause/resume from outside blockjob.c, thus making them static. Again, one reason to do this is that block_job_pause/resume will have different locking rules compared to everything else that block.c and block/io.c use. Signed-off-by: Paolo Bonzini Reviewed-by: John Snow Reviewed-by: Stefan Hajnoczi --- block/io.c | 18 +------- blockjob.c | 114 ++++++++++++++++++++++++++++---------------= ---- include/block/blockjob.h | 14 +++--- 3 files changed, 77 insertions(+), 69 deletions(-) diff --git a/block/io.c b/block/io.c index 2709a70..1cc9318 100644 --- a/block/io.c +++ b/block/io.c @@ -284,16 +284,9 @@ void bdrv_drain_all_begin(void) bool waited =3D true; BlockDriverState *bs; BdrvNextIterator it; - BlockJob *job =3D NULL; GSList *aio_ctxs =3D NULL, *ctx; =20 - while ((job =3D block_job_next(job))) { - AioContext *aio_context =3D blk_get_aio_context(job->blk); - - aio_context_acquire(aio_context); - block_job_pause(job); - aio_context_release(aio_context); - } + block_job_pause_all(); =20 for (bs =3D bdrv_first(&it); bs; bs =3D bdrv_next(&it)) { AioContext *aio_context =3D bdrv_get_aio_context(bs); @@ -337,7 +330,6 @@ void bdrv_drain_all_end(void) { BlockDriverState *bs; BdrvNextIterator it; - BlockJob *job =3D NULL; =20 for (bs =3D bdrv_first(&it); bs; bs =3D bdrv_next(&it)) { AioContext *aio_context =3D bdrv_get_aio_context(bs); @@ -348,13 +340,7 @@ void bdrv_drain_all_end(void) aio_context_release(aio_context); } =20 - while ((job =3D block_job_next(job))) { - AioContext *aio_context =3D blk_get_aio_context(job->blk); - - aio_context_acquire(aio_context); - block_job_resume(job); - aio_context_release(aio_context); - } + block_job_resume_all(); } =20 void bdrv_drain_all(void) diff --git a/blockjob.c b/blockjob.c index 1c63d15..caca718 100644 --- a/blockjob.c +++ b/blockjob.c @@ -55,36 +55,6 @@ struct BlockJobTxn { =20 static QLIST_HEAD(, BlockJob) block_jobs =3D QLIST_HEAD_INITIALIZER(block_= jobs); =20 -static char *child_job_get_parent_desc(BdrvChild *c) -{ - BlockJob *job =3D c->opaque; - return g_strdup_printf("%s job '%s'", - BlockJobType_lookup[job->driver->job_type], - job->id); -} - -static const BdrvChildRole child_job =3D { - .get_parent_desc =3D child_job_get_parent_desc, - .stay_at_node =3D true, -}; - -static void block_job_drained_begin(void *opaque) -{ - BlockJob *job =3D opaque; - block_job_pause(job); -} - -static void block_job_drained_end(void *opaque) -{ - BlockJob *job =3D opaque; - block_job_resume(job); -} - -static const BlockDevOps block_job_dev_ops =3D { - .drained_begin =3D block_job_drained_begin, - .drained_end =3D block_job_drained_end, -}; - BlockJob *block_job_next(BlockJob *job) { if (!job) { @@ -106,6 +76,21 @@ BlockJob *block_job_get(const char *id) return NULL; } =20 +static void block_job_pause(BlockJob *job) +{ + job->pause_count++; +} + +static void block_job_resume(BlockJob *job) +{ + assert(job->pause_count > 0); + job->pause_count--; + if (job->pause_count) { + return; + } + block_job_enter(job); +} + static void block_job_ref(BlockJob *job) { ++job->refcnt; @@ -171,6 +156,36 @@ static void block_job_detach_aio_context(void *opaque) block_job_unref(job); } =20 +static char *child_job_get_parent_desc(BdrvChild *c) +{ + BlockJob *job =3D c->opaque; + return g_strdup_printf("%s job '%s'", + BlockJobType_lookup[job->driver->job_type], + job->id); +} + +static const BdrvChildRole child_job =3D { + .get_parent_desc =3D child_job_get_parent_desc, + .stay_at_node =3D true, +}; + +static void block_job_drained_begin(void *opaque) +{ + BlockJob *job =3D opaque; + block_job_pause(job); +} + +static void block_job_drained_end(void *opaque) +{ + BlockJob *job =3D opaque; + block_job_resume(job); +} + +static const BlockDevOps block_job_dev_ops =3D { + .drained_begin =3D block_job_drained_begin, + .drained_end =3D block_job_drained_end, +}; + void block_job_remove_all_bdrv(BlockJob *job) { GSList *l; @@ -471,11 +486,6 @@ void block_job_complete(BlockJob *job, Error **errp) job->driver->complete(job, errp); } =20 -void block_job_pause(BlockJob *job) -{ - job->pause_count++; -} - void block_job_user_pause(BlockJob *job) { job->user_paused =3D true; @@ -520,16 +530,6 @@ void coroutine_fn block_job_pause_point(BlockJob *job) } } =20 -void block_job_resume(BlockJob *job) -{ - assert(job->pause_count > 0); - job->pause_count--; - if (job->pause_count) { - return; - } - block_job_enter(job); -} - void block_job_user_resume(BlockJob *job) { if (job && job->user_paused && job->pause_count > 0) { @@ -723,6 +723,30 @@ static void block_job_event_completed(BlockJob *job, c= onst char *msg) &error_abort); } =20 +void block_job_pause_all(void) +{ + BlockJob *job =3D NULL; + while ((job =3D block_job_next(job))) { + AioContext *aio_context =3D blk_get_aio_context(job->blk); + + aio_context_acquire(aio_context); + block_job_pause(job); + aio_context_release(aio_context); + } +} + +void block_job_resume_all(void) +{ + BlockJob *job =3D NULL; + while ((job =3D block_job_next(job))) { + AioContext *aio_context =3D blk_get_aio_context(job->blk); + + aio_context_acquire(aio_context); + block_job_resume(job); + aio_context_release(aio_context); + } +} + void block_job_event_ready(BlockJob *job) { job->ready =3D true; diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 9e906f7..aac87cd 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -235,12 +235,11 @@ void block_job_complete(BlockJob *job, Error **errp); BlockJobInfo *block_job_query(BlockJob *job, Error **errp); =20 /** - * block_job_pause: - * @job: The job to be paused. + * block_job_pause_all: * - * Asynchronously pause the specified job. + * Asynchronously pause all jobs. */ -void block_job_pause(BlockJob *job); +void block_job_pause_all(void); =20 /** * block_job_user_pause: @@ -260,12 +259,11 @@ void block_job_user_pause(BlockJob *job); bool block_job_user_paused(BlockJob *job); =20 /** - * block_job_resume: - * @job: The job to be resumed. + * block_job_resume_all: * - * Resume the specified job. Must be paired with a preceding block_job_pa= use. + * Resume all block jobs. Must be paired with a preceding block_job_pause= _all. */ -void block_job_resume(BlockJob *job); +void block_job_resume_all(void); =20 /** * block_job_user_resume: --=20 2.9.3