From nobody Mon Feb 9 16:35:16 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1656514234; cv=none; d=zohomail.com; s=zohoarc; b=UqqCdsN7eN3OSV/gKDPRP4iMV8EbcsZZhk0zJQnhH8oGugPjpJHthte8PBwZBG5upNl+0Ug6jTp9a6Oa30xkYGTrv1gr6AWPKkJ+El/NdEP3i50mqLFZ2nd8he+8GnyYPUtmTqUTwIeEffobfmfjcRixdE5RTxB639HxF99oBjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656514234; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=onSpRKVFNRnC1visFTu1hPTv/cFs0iPy6zmldJBqPI8=; b=gp3nJQZ/E39PlzyEPMV69/0pEDxV8lWaeoJg5lkwJ3/J/rdIWsnjZeIqzI1KC5REcRr+DCYXWqT8lxli4F3SkEU6ljkg57lEh2hVxCUt0nycDoP+y8Q07XBHFyPT10b2sHh7yiNz8kndwuh9OtiyUtNRWoa2MSoUWjT8D6jUiAs= 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 1656514234389218.71054277895553; Wed, 29 Jun 2022 07:50:34 -0700 (PDT) Received: from localhost ([::1]:52908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6Z1U-0007AW-Ki for importer@patchew.org; Wed, 29 Jun 2022 10:50:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6YU8-000814-8V for qemu-devel@nongnu.org; Wed, 29 Jun 2022 10:16:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:36267) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6YTx-00026A-O5 for qemu-devel@nongnu.org; Wed, 29 Jun 2022 10:16:03 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-339-hpXgYvdyMXOBlU-kV7Sz5w-1; Wed, 29 Jun 2022 10:15:47 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 58FC51C006BE; Wed, 29 Jun 2022 14:15:47 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0966E18EAA; Wed, 29 Jun 2022 14:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656512153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=onSpRKVFNRnC1visFTu1hPTv/cFs0iPy6zmldJBqPI8=; b=TwQAwmZg/pYq01g0+hYHEDLgtG+g+eDEnoQg2jotieyVyknykcC35LdEFT704ii6bZT8XL 05AT2lZI+Kx20pR1V8vE+muz0e5VKYpYdJWhcX45HMI//i5KbKtV4wAFEdAWXhV95hSHfv r53lYPMxEntl6J5auXKWxROUgtP9sD4= X-MC-Unique: hpXgYvdyMXOBlU-kV7Sz5w-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Cc: Kevin Wolf , Hanna Reitz , Paolo Bonzini , John Snow , Vladimir Sementsov-Ogievskiy , Wen Congyang , Xie Changlong , Markus Armbruster , Stefan Hajnoczi , Fam Zheng , qemu-devel@nongnu.org, Emanuele Giuseppe Esposito Subject: [PATCH v8 12/20] block/mirror.c: use of job helpers in drivers to avoid TOC/TOU Date: Wed, 29 Jun 2022 10:15:30 -0400 Message-Id: <20220629141538.3400679-13-eesposit@redhat.com> In-Reply-To: <20220629141538.3400679-1-eesposit@redhat.com> References: <20220629141538.3400679-1-eesposit@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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=170.10.129.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656514235601100001 Content-Type: text/plain; charset="utf-8" Once job lock is used and aiocontext is removed, mirror has to perform job operations under the same critical section, using the helpers prepared in previous commit. Note: at this stage, job_{lock/unlock} and job lock guard macros are *nop*. Signed-off-by: Emanuele Giuseppe Esposito Reviewed-by: Stefan Hajnoczi --- block/mirror.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index d8ecb9efa2..b38676e19d 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -654,9 +654,13 @@ static int mirror_exit_common(Job *job) BlockDriverState *target_bs; BlockDriverState *mirror_top_bs; Error *local_err =3D NULL; - bool abort =3D job->ret < 0; + bool abort; int ret =3D 0; =20 + WITH_JOB_LOCK_GUARD() { + abort =3D job->ret < 0; + } + if (s->prepared) { return 0; } @@ -1152,8 +1156,10 @@ static void mirror_complete(Job *job, Error **errp) s->should_complete =3D true; =20 /* If the job is paused, it will be re-entered when it is resumed */ - if (!job->paused) { - job_enter(job); + WITH_JOB_LOCK_GUARD() { + if (!job->paused) { + job_enter_cond_locked(job, NULL); + } } } =20 @@ -1173,8 +1179,11 @@ static bool mirror_drained_poll(BlockJob *job) * from one of our own drain sections, to avoid a deadlock waiting for * ourselves. */ - if (!s->common.job.paused && !job_is_cancelled(&job->job) && !s->in_dr= ain) { - return true; + WITH_JOB_LOCK_GUARD() { + if (!s->common.job.paused && !job_is_cancelled_locked(&job->job) + && !s->in_drain) { + return true; + } } =20 return !!s->in_flight; --=20 2.31.1