From nobody Thu Apr 17 08:17:02 2025
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=1665145763; cv=none;
d=zohomail.com; s=zohoarc;
b=fm5m5/cH9xQLjs1RDZ+L5NPZTm7lZSSTLgI3Ik58s8u0GqSYjlNQ9xVdWV8/XpvnR23ilC9vszEVLsgSdwRVpl/CPHmFu/60gcXgmXxqJFZ+GBOi9DQw93bgAqhjBLE3tgql9d9W8fwBxuLqQZUbkvw/GaGiQub+QJpknL954SY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1665145763;
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=sZIzJHueKKSWA78PMnN+y4KB31b58z/EQ+UCkBjNpwU=;
b=mD9HZV3M8IIJxKJq0kdZT8VpYR/wmwIZKU64t25WJeacqxwFvjkAk6AvauRSYEYYftRhqfyBt3k9jcavIUA6zpnbQ7WavdrdUDee5fhrHQimgK2FhW99MC7nOmRmYyMsRrYC8bUAAy223QsfwgHz6psCLWQXcZpbcP7T4zijPEk=
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=<kwolf@redhat.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 16651457639591001.3111162546567;
Fri, 7 Oct 2022 05:29:23 -0700 (PDT)
Received: from localhost ([::1]:39620 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1ogmTi-0005QB-UT
for importer@patchew.org; Fri, 07 Oct 2022 08:29:22 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:54236)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1ogkuL-0005sC-32
for qemu-devel@nongnu.org; Fri, 07 Oct 2022 06:48:45 -0400
Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:47835)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <kwolf@redhat.com>) id 1ogkuI-0003HJ-BC
for qemu-devel@nongnu.org; Fri, 07 Oct 2022 06:48:44 -0400
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
(version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
us-mta-649-9LY7nk5xMMORamKUScGwNg-1; Fri, 07 Oct 2022 06:48:38 -0400
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
[10.11.54.4])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4FEFF85A583;
Fri, 7 Oct 2022 10:48:38 +0000 (UTC)
Received: from merkur.fritz.box (unknown [10.39.192.109])
by smtp.corp.redhat.com (Postfix) with ESMTP id 8BFBF2024CBB;
Fri, 7 Oct 2022 10:48:37 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1665139721;
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=sZIzJHueKKSWA78PMnN+y4KB31b58z/EQ+UCkBjNpwU=;
b=H2LOcd5c3GDAAeoC28UuYSxqkM8jmrFsbhz/3K1WPOahEvKbhITnDNbEYK9TgN06tUxAmK
5QewV/wVYrLVcnED7G1eUXx1CY32+693CcFfjlVUMSiQS3XGdyKCRJVD4phIb/BczRxHaB
Ly281AB4nzuijLdfCXjOhNxafDbW4MM=
X-MC-Unique: 9LY7nk5xMMORamKUScGwNg-1
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com,
stefanha@redhat.com,
qemu-devel@nongnu.org
Subject: [PULL 38/50] block/mirror.c: use of job helpers in drivers
Date: Fri, 7 Oct 2022 12:47:40 +0200
Message-Id: <20221007104752.141361-39-kwolf@redhat.com>
In-Reply-To: <20221007104752.141361-1-kwolf@redhat.com>
References: <20221007104752.141361-1-kwolf@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4
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=kwolf@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
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, DKIMWL_WL_HIGH=-0.001,
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 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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1665145766146100001
Content-Type: text/plain; charset="utf-8"
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Once job lock is used and aiocontext is removed, mirror has
to perform job operations under the same critical section,
Note: at this stage, job_{lock/unlock} and job lock guard macros
are *nop*.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20220926093214.506243-11-eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/mirror.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 3c4ab1159d..c6bf7f40ce 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1152,8 +1152,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 +1175,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.37.3