From nobody Mon Apr 29 10:50:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1565975157; cv=none; d=zoho.com; s=zohoarc; b=Yvy99nhqRwRsAe1UKWejYjmy5+OPffbILAca1TSr11dLF6Dh0O2vBP2VJDWx0hsAUTWpQ1EL1x3asTLPRPSVFioc9Dnp0GlrJd1x5R1/viEh0gIYMxxJaJER6bF7sd45YQP7PuFzpuKMLt615zLkjlLGR/ebu8DgDqdRYuST1LM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565975157; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=iRFPtzX2NENac2OzwoOKXns6DCCIgRGSP0MVETuPMM4=; b=YOr+HY1jw4cav3pHB+MTldawwVa9p+B6QoLYlr+HiOBBeKo/6k/PCdydcnZztwJvvVRjLao/MgEVdB4haIpOn2PXm5CRK9Eu10QqqO4exGQHFsfcUEVDaKKS0xlN1fPRYmE/KaMoRMdpGhB0kf7PQDLDTLjb5OsStzKb/tFOLpA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565975157693442.43137490949573; Fri, 16 Aug 2019 10:05:57 -0700 (PDT) Received: from localhost ([::1]:58726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyffo-0003Xx-IP for importer@patchew.org; Fri, 16 Aug 2019 13:05:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49266) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyff2-0002ys-QZ for qemu-devel@nongnu.org; Fri, 16 Aug 2019 13:05:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyff1-00059L-5H for qemu-devel@nongnu.org; Fri, 16 Aug 2019 13:05:08 -0400 Received: from relay.sw.ru ([185.231.240.75]:35014) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyfew-00054Q-Ej; Fri, 16 Aug 2019 13:05:02 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hyfes-0008KG-9a; Fri, 16 Aug 2019 20:04:58 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Fri, 16 Aug 2019 20:04:57 +0300 Message-Id: <20190816170457.522990-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH] job: drop job_drain X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In job_finish_sync job_enter should be enough for a job to make some progress and draining is a wrong tool for it. So use job_enter directly here and drop job_drain with all related staff not used more. Suggested-by: Kevin Wolf Signed-off-by: Vladimir Sementsov-Ogievskiy --- It's a continuation for [PATCH v4] blockjob: drain all job nodes in block_job_drain include/block/blockjob_int.h | 19 ------------------- include/qemu/job.h | 13 ------------- block/backup.c | 19 +------------------ block/commit.c | 1 - block/mirror.c | 28 +++------------------------- block/stream.c | 1 - blockjob.c | 13 ------------- job.c | 12 +----------- 8 files changed, 5 insertions(+), 101 deletions(-) diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index e4a318dd15..e2824a36a8 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -52,17 +52,6 @@ struct BlockJobDriver { * besides job->blk to the new AioContext. */ void (*attached_aio_context)(BlockJob *job, AioContext *new_context); - - /* - * If the callback is not NULL, it will be invoked when the job has to= be - * synchronously cancelled or completed; it should drain BlockDriverSt= ates - * as required to ensure progress. - * - * Block jobs must use the default implementation for job_driver.drain, - * which will in turn call this callback after doing generic block job - * stuff. - */ - void (*drain)(BlockJob *job); }; =20 /** @@ -107,14 +96,6 @@ void block_job_free(Job *job); */ void block_job_user_resume(Job *job); =20 -/** - * block_job_drain: - * Callback to be used for JobDriver.drain in all block jobs. Drains the m= ain - * block node associated with the block jobs and calls BlockJobDriver.drai= n for - * job-specific actions. - */ -void block_job_drain(Job *job); - /** * block_job_ratelimit_get_delay: * diff --git a/include/qemu/job.h b/include/qemu/job.h index 9e7cd1e4a0..09739b8dd9 100644 --- a/include/qemu/job.h +++ b/include/qemu/job.h @@ -220,13 +220,6 @@ struct JobDriver { */ void (*complete)(Job *job, Error **errp); =20 - /* - * If the callback is not NULL, it will be invoked when the job has to= be - * synchronously cancelled or completed; it should drain any activities - * as required to ensure progress. - */ - void (*drain)(Job *job); - /** * If the callback is not NULL, prepare will be invoked when all the j= obs * belonging to the same transaction complete; or upon this job's comp= letion @@ -470,12 +463,6 @@ bool job_user_paused(Job *job); */ void job_user_resume(Job *job, Error **errp); =20 -/* - * Drain any activities as required to ensure progress. This can be called= in a - * loop to synchronously complete a job. - */ -void job_drain(Job *job); - /** * Get the next element from the list of block jobs after @job, or the * first one if @job is %NULL. diff --git a/block/backup.c b/block/backup.c index 715e1d3be8..d1ecdfa9aa 100644 --- a/block/backup.c +++ b/block/backup.c @@ -320,21 +320,6 @@ void backup_do_checkpoint(BlockJob *job, Error **errp) hbitmap_set(backup_job->copy_bitmap, 0, backup_job->len); } =20 -static void backup_drain(BlockJob *job) -{ - BackupBlockJob *s =3D container_of(job, BackupBlockJob, common); - - /* Need to keep a reference in case blk_drain triggers execution - * of backup_complete... - */ - if (s->target) { - BlockBackend *target =3D s->target; - blk_ref(target); - blk_drain(target); - blk_unref(target); - } -} - static BlockErrorAction backup_error_action(BackupBlockJob *job, bool read, int error) { @@ -488,13 +473,11 @@ static const BlockJobDriver backup_job_driver =3D { .job_type =3D JOB_TYPE_BACKUP, .free =3D block_job_free, .user_resume =3D block_job_user_resume, - .drain =3D block_job_drain, .run =3D backup_run, .commit =3D backup_commit, .abort =3D backup_abort, .clean =3D backup_clean, - }, - .drain =3D backup_drain, + } }; =20 static int64_t backup_calculate_cluster_size(BlockDriverState *target, diff --git a/block/commit.c b/block/commit.c index 2c5a6d4ebc..697a779d8e 100644 --- a/block/commit.c +++ b/block/commit.c @@ -216,7 +216,6 @@ static const BlockJobDriver commit_job_driver =3D { .job_type =3D JOB_TYPE_COMMIT, .free =3D block_job_free, .user_resume =3D block_job_user_resume, - .drain =3D block_job_drain, .run =3D commit_run, .prepare =3D commit_prepare, .abort =3D commit_abort, diff --git a/block/mirror.c b/block/mirror.c index 8cb75fb409..b91abe0288 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -644,14 +644,11 @@ static int mirror_exit_common(Job *job) bdrv_ref(mirror_top_bs); bdrv_ref(target_bs); =20 - /* Remove target parent that still uses BLK_PERM_WRITE/RESIZE before + /* + * Remove target parent that still uses BLK_PERM_WRITE/RESIZE before * inserting target_bs at s->to_replace, where we might not be able to= get * these permissions. - * - * Note that blk_unref() alone doesn't necessarily drop permissions be= cause - * we might be running nested inside mirror_drain(), which takes an ex= tra - * reference, so use an explicit blk_set_perm() first. */ - blk_set_perm(s->target, 0, BLK_PERM_ALL, &error_abort); + */ blk_unref(s->target); s->target =3D NULL; =20 @@ -1143,28 +1140,12 @@ static bool mirror_drained_poll(BlockJob *job) return !!s->in_flight; } =20 -static void mirror_drain(BlockJob *job) -{ - MirrorBlockJob *s =3D container_of(job, MirrorBlockJob, common); - - /* Need to keep a reference in case blk_drain triggers execution - * of mirror_complete... - */ - if (s->target) { - BlockBackend *target =3D s->target; - blk_ref(target); - blk_drain(target); - blk_unref(target); - } -} - static const BlockJobDriver mirror_job_driver =3D { .job_driver =3D { .instance_size =3D sizeof(MirrorBlockJob), .job_type =3D JOB_TYPE_MIRROR, .free =3D block_job_free, .user_resume =3D block_job_user_resume, - .drain =3D block_job_drain, .run =3D mirror_run, .prepare =3D mirror_prepare, .abort =3D mirror_abort, @@ -1172,7 +1153,6 @@ static const BlockJobDriver mirror_job_driver =3D { .complete =3D mirror_complete, }, .drained_poll =3D mirror_drained_poll, - .drain =3D mirror_drain, }; =20 static const BlockJobDriver commit_active_job_driver =3D { @@ -1181,7 +1161,6 @@ static const BlockJobDriver commit_active_job_driver = =3D { .job_type =3D JOB_TYPE_COMMIT, .free =3D block_job_free, .user_resume =3D block_job_user_resume, - .drain =3D block_job_drain, .run =3D mirror_run, .prepare =3D mirror_prepare, .abort =3D mirror_abort, @@ -1189,7 +1168,6 @@ static const BlockJobDriver commit_active_job_driver = =3D { .complete =3D mirror_complete, }, .drained_poll =3D mirror_drained_poll, - .drain =3D mirror_drain, }; =20 static void coroutine_fn diff --git a/block/stream.c b/block/stream.c index 6ac1e7bec4..07f9908e1a 100644 --- a/block/stream.c +++ b/block/stream.c @@ -218,7 +218,6 @@ static const BlockJobDriver stream_job_driver =3D { .abort =3D stream_abort, .clean =3D stream_clean, .user_resume =3D block_job_user_resume, - .drain =3D block_job_drain, }, }; =20 diff --git a/blockjob.c b/blockjob.c index 20b7f557da..4b8d0869c6 100644 --- a/blockjob.c +++ b/blockjob.c @@ -89,18 +89,6 @@ void block_job_free(Job *job) error_free(bjob->blocker); } =20 -void block_job_drain(Job *job) -{ - BlockJob *bjob =3D container_of(job, BlockJob, job); - const JobDriver *drv =3D job->driver; - BlockJobDriver *bjdrv =3D container_of(drv, BlockJobDriver, job_driver= ); - - blk_drain(bjob->blk); - if (bjdrv->drain) { - bjdrv->drain(bjob); - } -} - static char *child_job_get_parent_desc(BdrvChild *c) { BlockJob *job =3D c->opaque; @@ -421,7 +409,6 @@ void *block_job_create(const char *job_id, const BlockJ= obDriver *driver, assert(is_block_job(&job->job)); assert(job->job.driver->free =3D=3D &block_job_free); assert(job->job.driver->user_resume =3D=3D &block_job_user_resume); - assert(job->job.driver->drain =3D=3D &block_job_drain); =20 job->blk =3D blk; =20 diff --git a/job.c b/job.c index 28dd48f8a5..04409b40aa 100644 --- a/job.c +++ b/job.c @@ -523,16 +523,6 @@ void coroutine_fn job_sleep_ns(Job *job, int64_t ns) job_pause_point(job); } =20 -void job_drain(Job *job) -{ - /* If job is !busy this kicks it into the next pause point. */ - job_enter(job); - - if (job->driver->drain) { - job->driver->drain(job); - } -} - /* Assumes the block_job_mutex is held */ static bool job_timer_not_pending(Job *job) { @@ -991,7 +981,7 @@ int job_finish_sync(Job *job, void (*finish)(Job *, Err= or **errp), Error **errp) } =20 AIO_WAIT_WHILE(job->aio_context, - (job_drain(job), !job_is_completed(job))); + (job_enter(job), !job_is_completed(job))); =20 ret =3D (job_is_cancelled(job) && job->ret =3D=3D 0) ? -ECANCELED : jo= b->ret; job_unref(job); --=20 2.18.0