From nobody Tue Feb 10 13:34:25 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1710342747; cv=none; d=zohomail.com; s=zohoarc; b=JmdSQ9rerZjgoxX2psqC+gwUYCtbm6Z7HllxNEBDhY0Ko4Jqx1u0DdSLieBYK/cqiwWXTKNndBGFeVu9J9+aQyn5pL8AxsrSji8gTtKZYMub4a+kmcr9tUIvfz+rZCZJ+B9Sbg3cuDzPZRl3kBlBqJVrA++hVdkRvDhTDFkHuvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710342747; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WCIpyT0J+TRD9V0WFqJbUQtYMgyzqP59utLlBS1GDpE=; b=LTelWYd09hR6M5deWm3AjR9wYTlNfGjZY8UgZl/iIHkiFssWsHWalHDCD8A6lBM+M5Ka+8eLdQpkNPfA1nkABFmEWNhQUBtDoLlV48P2bbZ0iJXxb7IIXit66Usr32EX1BrovDqziz8d6YrvJSw7a+rx7AY3//8IqIqa9lTBH1A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710342747146206.12873319969594; Wed, 13 Mar 2024 08:12:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkQEo-0003m5-4z; Wed, 13 Mar 2024 11:09:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkQEc-0003bE-97; Wed, 13 Mar 2024 11:09:38 -0400 Received: from forwardcorp1b.mail.yandex.net ([178.154.239.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkQEa-0005u8-3B; Wed, 13 Mar 2024 11:09:38 -0400 Received: from mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net [IPv6:2a02:6b8:c08:8793:0:640:b059:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 6FE6160E62; Wed, 13 Mar 2024 18:09:34 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6b8:b081:7318::1:20]) by mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 99pZB52GZiE0-vwBb8tYZ; Wed, 13 Mar 2024 18:09:33 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1710342573; bh=WCIpyT0J+TRD9V0WFqJbUQtYMgyzqP59utLlBS1GDpE=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=IBPSb9vUM5Tw8Qsb8Nk4ziMv1+o0O8c8nNqOoY5CGidQ4jph1lO62/aV5YbZ0Bpw8 3xRJ7kRtBEEVYcWk0oiY15YsYLw1VSwBGuQC4errBhzfp4DidT8kscSo7BxDlW8Cy+ ZHOGJEaXZgBakNpiESdfiC8uuOdirhTvr6OgPkeM= Authentication-Results: mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, jsnow@redhat.com, vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com, devel@lists.libvirt.org, eblake@redhat.com, armbru@redhat.com, michael.roth@amd.com, pbonzini@redhat.com, pkrempa@redhat.com, f.ebner@proxmox.com Subject: [RFC 09/15] qapi: job-complete: introduce no-block-replace option for mirror Date: Wed, 13 Mar 2024 18:09:01 +0300 Message-Id: <20240313150907.623462-10-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240313150907.623462-1-vsementsov@yandex-team.ru> References: <20240313150907.623462-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=178.154.239.136; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1710342749304100003 Content-Type: text/plain; charset="utf-8" That's an alternative to block-job-cancel(hard=3Dfalse) behavior for mirror, which exactly is: complete the job, wait for in-flight requests, but don't do any block graph modifications. Why: 1. We move to deprecating block-job-* APIs and use job-* APIs instead. So we need to port somehow the functionality to job- API. 2. The specified behavior was also a kind of "quirk". It's strange to "cancel" something in a normal success path of user scenario. This block-job-cancel(hard=3Dfalse) results in BLOCK_JOB_COMPLETE event, so definitely it's just another mode of "complete", not "cancel". Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/mirror.c | 8 +++++--- include/qemu/job.h | 8 +++++++- job-qmp.c | 20 +++++++++++++++----- job.c | 12 ++++++++++-- qapi/job.json | 28 +++++++++++++++++++++++++--- stubs/qapi-jobchangeoptions-mapper.c | 5 +++++ tests/unit/test-bdrv-drain.c | 2 +- tests/unit/test-block-iothread.c | 2 +- tests/unit/test-blockjob.c | 2 +- 9 files changed, 70 insertions(+), 17 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index f474b87079..e95c54fbc6 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -69,6 +69,7 @@ typedef struct MirrorBlockJob { */ bool actively_synced; bool should_complete; + bool no_block_replace; int64_t granularity; size_t buf_size; int64_t bdev_length; @@ -740,7 +741,7 @@ static int mirror_exit_common(Job *job) } bdrv_graph_rdunlock_main_loop(); =20 - if (s->should_complete && !abort) { + if (s->should_complete && !abort && !s->no_block_replace) { BlockDriverState *to_replace =3D s->to_replace ?: src; bool ro =3D bdrv_is_read_only(to_replace); =20 @@ -1167,7 +1168,7 @@ immediate_exit: return ret; } =20 -static void mirror_complete(Job *job, Error **errp) +static void mirror_complete(Job *job, JobComplete *opts, Error **errp) { MirrorBlockJob *s =3D container_of(job, MirrorBlockJob, common.job); =20 @@ -1178,7 +1179,7 @@ static void mirror_complete(Job *job, Error **errp) } =20 /* block all operations on to_replace bs */ - if (s->replaces) { + if (s->replaces && !opts->u.mirror.no_block_replace) { s->to_replace =3D bdrv_find_node(s->replaces); if (!s->to_replace) { error_setg(errp, "Node name '%s' not found", s->replaces); @@ -1193,6 +1194,7 @@ static void mirror_complete(Job *job, Error **errp) } =20 s->should_complete =3D true; + s->no_block_replace =3D opts->u.mirror.no_block_replace; =20 /* If the job is paused, it will be re-entered when it is resumed */ WITH_JOB_LOCK_GUARD() { diff --git a/include/qemu/job.h b/include/qemu/job.h index 1c9da74a0c..eee1d5b50f 100644 --- a/include/qemu/job.h +++ b/include/qemu/job.h @@ -254,7 +254,7 @@ struct JobDriver { * Optional callback for job types whose completion must be triggered * manually. */ - void (*complete)(Job *job, Error **errp); + void (*complete)(Job *job, JobComplete *opts, Error **errp); =20 /** * If the callback is not NULL, prepare will be invoked when all the j= obs @@ -634,6 +634,12 @@ void job_early_fail(Job *job); */ void job_transition_to_ready(Job *job); =20 +/** + * Asynchronously complete the specified @job. + * Called with job lock held, but might release it temporarily. + */ +void job_complete_opts_locked(Job *job, JobComplete *opts, Error **errp); + /** * Asynchronously complete the specified @job. * Called with job lock held, but might release it temporarily. diff --git a/job-qmp.c b/job-qmp.c index 011a8736ea..c048e03d9f 100644 --- a/job-qmp.c +++ b/job-qmp.c @@ -93,19 +93,19 @@ void qmp_job_resume(const char *id, Error **errp) job_user_resume_locked(job, errp); } =20 -void qmp_job_complete(const char *id, Error **errp) +void qmp_job_complete(JobComplete *opts, Error **errp) { Job *job; =20 JOB_LOCK_GUARD(); - job =3D find_job_locked(id, errp); + job =3D find_job_locked(opts->id, errp); =20 if (!job) { return; } =20 trace_qmp_job_complete(job); - job_complete_locked(job, errp); + job_complete_opts_locked(job, opts, errp); } =20 void qmp_job_finalize(const char *id, Error **errp) @@ -204,13 +204,13 @@ JobInfoList *qmp_query_jobs(Error **errp) return head; } =20 -bool JobChangeOptions_mapper(JobChangeOptions *opts, JobType *out, Error *= *errp) +static bool job_mapper(const char *id, JobType *out, Error **errp) { Job *job; =20 JOB_LOCK_GUARD(); =20 - job =3D find_job_locked(opts->id, errp); + job =3D find_job_locked(id, errp); if (!job) { return false; } @@ -218,3 +218,13 @@ bool JobChangeOptions_mapper(JobChangeOptions *opts, J= obType *out, Error **errp) *out =3D job_type(job); return true; } + +bool JobChangeOptions_mapper(JobChangeOptions *opts, JobType *out, Error *= *errp) +{ + return job_mapper(opts->id, out, errp); +} + +bool JobComplete_mapper(JobComplete *opts, JobType *out, Error **errp) +{ + return job_mapper(opts->id, out, errp); +} diff --git a/job.c b/job.c index 69630852dc..3726ba2c9e 100644 --- a/job.c +++ b/job.c @@ -1214,11 +1214,14 @@ int job_complete_sync_locked(Job *job, Error **errp) return job_finish_sync_locked(job, job_complete_locked, errp); } =20 -void job_complete_locked(Job *job, Error **errp) +void job_complete_opts_locked(Job *job, JobComplete *opts, Error **errp) { + JobComplete local_opts =3D {}; + /* Should not be reachable via external interface for internal jobs */ assert(job->id); GLOBAL_STATE_CODE(); + if (job_apply_verb_locked(job, JOB_VERB_COMPLETE, errp)) { return; } @@ -1229,10 +1232,15 @@ void job_complete_locked(Job *job, Error **errp) } =20 job_unlock(); - job->driver->complete(job, errp); + job->driver->complete(job, opts ?: &local_opts, errp); job_lock(); } =20 +void job_complete_locked(Job *job, Error **errp) +{ + job_complete_opts_locked(job, NULL, errp); +} + int job_finish_sync_locked(Job *job, void (*finish)(Job *, Error **errp), Error **errp) diff --git a/qapi/job.json b/qapi/job.json index b3957207a4..2f1b839cfc 100644 --- a/qapi/job.json +++ b/qapi/job.json @@ -182,15 +182,37 @@ { 'command': 'job-cancel', 'data': { 'id': 'str' } } =20 ## -# @job-complete: +# @JobCompleteMirror: # -# Manually trigger completion of an active job in the READY state. +# @no-block-replace: Supported only for mirror job. If true, alter +# the mirror job completion behavior so that final switch to +# target block node is not done. Since 9.1 +# +# Since: 9.1 +## +{ 'struct': 'JobCompleteMirror', + 'data': { '*no-block-replace': 'bool' } } + +## +# @JobComplete: # # @id: The job identifier. # # Since: 3.0 ## -{ 'command': 'job-complete', 'data': { 'id': 'str' } } +{ 'union': 'JobComplete', + 'base': { 'id': 'str' }, + 'discriminator': 'JobType', + 'data': { 'mirror': 'JobCompleteMirror' } } + +## +# @job-complete: +# +# Manually trigger completion of an active job in the READY state. +# +# Since: 3.0 +## +{ 'command': 'job-complete', 'data': 'JobComplete', 'boxed': true } =20 ## # @job-dismiss: diff --git a/stubs/qapi-jobchangeoptions-mapper.c b/stubs/qapi-jobchangeopt= ions-mapper.c index e4acfd91b3..8031a5317c 100644 --- a/stubs/qapi-jobchangeoptions-mapper.c +++ b/stubs/qapi-jobchangeoptions-mapper.c @@ -6,3 +6,8 @@ bool JobChangeOptions_mapper(JobChangeOptions *opts, JobTyp= e *out, Error **errp) { g_assert_not_reached(); } + +bool JobComplete_mapper(JobComplete *opts, JobType *out, Error **errp) +{ + g_assert_not_reached(); +} diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c index 666880472b..933d3dd990 100644 --- a/tests/unit/test-bdrv-drain.c +++ b/tests/unit/test-bdrv-drain.c @@ -682,7 +682,7 @@ static int coroutine_fn test_job_run(Job *job, Error **= errp) return s->run_ret; } =20 -static void test_job_complete(Job *job, Error **errp) +static void test_job_complete(Job *job, JobComplete *opts, Error **errp) { TestBlockJob *s =3D container_of(job, TestBlockJob, common.job); s->should_complete =3D true; diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothr= ead.c index 3766d5de6b..dce33a8b9b 100644 --- a/tests/unit/test-block-iothread.c +++ b/tests/unit/test-block-iothread.c @@ -529,7 +529,7 @@ static int coroutine_fn test_job_run(Job *job, Error **= errp) return 0; } =20 -static void test_job_complete(Job *job, Error **errp) +static void test_job_complete(Job *job, JobComplete *opts, Error **errp) { TestBlockJob *s =3D container_of(job, TestBlockJob, common.job); s->should_complete =3D true; diff --git a/tests/unit/test-blockjob.c b/tests/unit/test-blockjob.c index fe3e0d2d38..027a2dd886 100644 --- a/tests/unit/test-blockjob.c +++ b/tests/unit/test-blockjob.c @@ -165,7 +165,7 @@ typedef struct CancelJob { bool should_complete; } CancelJob; =20 -static void cancel_job_complete(Job *job, Error **errp) +static void cancel_job_complete(Job *job, JobComplete *opts, Error **errp) { CancelJob *s =3D container_of(job, CancelJob, common.job); s->should_complete =3D true; --=20 2.34.1