From nobody Wed Nov 5 12:43:26 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 1534525549802312.67549857512904; Fri, 17 Aug 2018 10:05:49 -0700 (PDT) Received: from localhost ([::1]:35484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqiC4-0004fg-JF for importer@patchew.org; Fri, 17 Aug 2018 13:05:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqi9M-0002i1-Cw for qemu-devel@nongnu.org; Fri, 17 Aug 2018 13:03:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqi9L-0002CV-3a for qemu-devel@nongnu.org; Fri, 17 Aug 2018 13:03:00 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47022 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 1fqi9J-0002AO-Bv; Fri, 17 Aug 2018 13:02:57 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13085401DEC6; Fri, 17 Aug 2018 17:02:57 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-205.ams2.redhat.com [10.36.116.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C58510FD285; Fri, 17 Aug 2018 17:02:55 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 17 Aug 2018 19:02:44 +0200 Message-Id: <20180817170246.14641-4-kwolf@redhat.com> In-Reply-To: <20180817170246.14641-1-kwolf@redhat.com> References: <20180817170246.14641-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 17 Aug 2018 17:02:57 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 17 Aug 2018 17:02:57 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.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] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [RFC PATCH 3/5] job: Drop AioContext lock around aio_poll() 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, famz@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Simimlar to AIO_WAIT_WHILE(), job_finish_sync() needs to release the AioContext lock of the job before calling aio_poll(). Otherwise, callbacks called by aio_poll() would possibly take the lock a second time and run into a deadlock with a nested AIO_WAIT_WHILE() call. Signed-off-by: Kevin Wolf --- job.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/job.c b/job.c index a746bfe70b..6acf55bceb 100644 --- a/job.c +++ b/job.c @@ -1016,7 +1016,10 @@ int job_finish_sync(Job *job, void (*finish)(Job *, = Error **errp), Error **errp) job_drain(job); } while (!job_is_completed(job)) { + AioContext *aio_context =3D job->aio_context; + aio_context_release(aio_context); aio_poll(qemu_get_aio_context(), true); + aio_context_acquire(aio_context); } ret =3D (job_is_cancelled(job) && job->ret =3D=3D 0) ? -ECANCELED : jo= b->ret; job_unref(job); --=20 2.13.6