From nobody Wed Dec 17 21:46:21 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 1520959999248793.7460075137067; Tue, 13 Mar 2018 09:53:19 -0700 (PDT) Received: from localhost ([::1]:41212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnAr-00066I-DQ for importer@patchew.org; Tue, 13 Mar 2018 12:53:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evmdE-0001Qy-4E for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:18:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evmdC-0004dX-S5 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 12:18:32 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37566 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 1evmd6-0004Z7-1x; Tue, 13 Mar 2018 12:18:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A64DF40201A3; Tue, 13 Mar 2018 16:18:23 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id D62C52166BB2; Tue, 13 Mar 2018 16:18:22 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 13 Mar 2018 17:17:37 +0100 Message-Id: <20180313161803.1814-16-kwolf@redhat.com> In-Reply-To: <20180313161803.1814-1-kwolf@redhat.com> References: <20180313161803.1814-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 13 Mar 2018 16:18:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 13 Mar 2018 16:18:23 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.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] [PULL 15/41] blockjobs: add prepare callback 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, peter.maydell@linaro.org, qemu-devel@nongnu.org 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" From: John Snow Some jobs upon finalization may need to perform some work that can still fail. If these jobs are part of a transaction, it's important that these callbacks fail the entire transaction. We allow for a new callback in addition to commit/abort/clean that allows us the opportunity to have fairly late-breaking failures in the transactional process. The expected flow is: - All jobs in a transaction converge to the PENDING state, added in a forthcoming commit. - Upon being finalized, either automatically or explicitly by the user, jobs prepare to complete. - If any job fails preparation, all jobs call .abort. - Otherwise, they succeed and call .commit. Signed-off-by: John Snow Signed-off-by: Kevin Wolf --- include/block/blockjob_int.h | 10 ++++++++++ blockjob.c | 30 +++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index 259d49b32a..642adce68b 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -54,6 +54,16 @@ struct BlockJobDriver { void (*complete)(BlockJob *job, Error **errp); =20 /** + * 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 + * if it is not in a transaction. + * + * This callback will not be invoked if the job has already failed. + * If it fails, abort and then clean will be called. + */ + int (*prepare)(BlockJob *job); + + /** * If the callback is not NULL, it will be invoked when all the jobs * belonging to the same transaction complete; or upon this job's * completion if it is not in a transaction. Skipped if NULL. diff --git a/blockjob.c b/blockjob.c index 7e03824751..1395d8eed1 100644 --- a/blockjob.c +++ b/blockjob.c @@ -415,6 +415,14 @@ static void block_job_update_rc(BlockJob *job) } } =20 +static int block_job_prepare(BlockJob *job) +{ + if (job->ret =3D=3D 0 && job->driver->prepare) { + job->ret =3D job->driver->prepare(job); + } + return job->ret; +} + static void block_job_commit(BlockJob *job) { assert(!job->ret); @@ -438,7 +446,7 @@ static void block_job_clean(BlockJob *job) } } =20 -static void block_job_completed_single(BlockJob *job) +static int block_job_completed_single(BlockJob *job) { assert(job->completed); =20 @@ -472,6 +480,7 @@ static void block_job_completed_single(BlockJob *job) QLIST_REMOVE(job, txn_list); block_job_txn_unref(job->txn); block_job_conclude(job); + return 0; } =20 static void block_job_cancel_async(BlockJob *job) @@ -487,17 +496,22 @@ static void block_job_cancel_async(BlockJob *job) job->cancelled =3D true; } =20 -static void block_job_txn_apply(BlockJobTxn *txn, void fn(BlockJob *)) +static int block_job_txn_apply(BlockJobTxn *txn, int fn(BlockJob *)) { AioContext *ctx; BlockJob *job, *next; + int rc; =20 QLIST_FOREACH_SAFE(job, &txn->jobs, txn_list, next) { ctx =3D blk_get_aio_context(job->blk); aio_context_acquire(ctx); - fn(job); + rc =3D fn(job); aio_context_release(ctx); + if (rc) { + break; + } } + return rc; } =20 static int block_job_finish_sync(BlockJob *job, @@ -580,6 +594,8 @@ static void block_job_completed_txn_success(BlockJob *j= ob) { BlockJobTxn *txn =3D job->txn; BlockJob *other_job; + int rc =3D 0; + /* * Successful completion, see if there are other running jobs in this * txn. @@ -590,6 +606,14 @@ static void block_job_completed_txn_success(BlockJob *= job) } assert(other_job->ret =3D=3D 0); } + + /* Jobs may require some prep-work to complete without failure */ + rc =3D block_job_txn_apply(txn, block_job_prepare); + if (rc) { + block_job_completed_txn_abort(job); + return; + } + /* We are the last completed job, commit the transaction. */ block_job_txn_apply(txn, block_job_completed_single); } --=20 2.13.6