From nobody Mon Feb 9 02:28:16 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631020464782218.68104234531393; Tue, 7 Sep 2021 06:14:24 -0700 (PDT) Received: from localhost ([::1]:41898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNavf-00084k-NC for importer@patchew.org; Tue, 07 Sep 2021 09:14:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNaRW-0005w4-Nz for qemu-devel@nongnu.org; Tue, 07 Sep 2021 08:43:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNaRV-0006OO-8P for qemu-devel@nongnu.org; Tue, 07 Sep 2021 08:43:14 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-107-C_6xVonyOwCO2Z4fj6ag6w-1; Tue, 07 Sep 2021 08:43:09 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B5B2C19611A0; Tue, 7 Sep 2021 12:43:08 +0000 (UTC) Received: from localhost (unknown [10.39.193.128]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5E8A469FAE; Tue, 7 Sep 2021 12:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631018592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AFnDBnxXByl9QXAXemJ+tS66l6p4AdQc+rFG2shIY4c=; b=bDnxyLUjqUmvgnpRGLI4ZTFGWoPvJEuOGJWku+a0x4MtK52rms1PbMLME4MTA2QQXcTgkd KOPn72xFkTDGDNRnR/RLakhjtpaN72AyKOk45tjz7C835Id2Hu/QHu30Rki4IHJpLpXAe4 PHka+B+FgDYVXc02NMjHngAnIM5ZAiI= X-MC-Unique: C_6xVonyOwCO2Z4fj6ag6w-1 From: Hanna Reitz To: qemu-block@nongnu.org Subject: [PATCH v4 10/12] mirror: Stop active mirroring after force-cancel Date: Tue, 7 Sep 2021 14:42:43 +0200 Message-Id: <20210907124245.143492-11-hreitz@redhat.com> In-Reply-To: <20210907124245.143492-1-hreitz@redhat.com> References: <20210907124245.143492-1-hreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=hreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.391, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Hanna Reitz , Vladimir Sementsov-Ogievskiy , Eric Blake , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631020465391100001 Content-Type: text/plain; charset="utf-8" Once the mirror job is force-cancelled (job_is_cancelled() is true), we should not generate new I/O requests. This applies to active mirroring, too, so stop it once the job is cancelled. (We must still forward all I/O requests to the source, though, of course, but those are not really I/O requests generated by the job, so this is fine.) Signed-off-by: Hanna Reitz Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/mirror.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/mirror.c b/block/mirror.c index bf1d50ff1c..af89c1716a 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1418,6 +1418,7 @@ static int coroutine_fn bdrv_mirror_top_do_write(Bloc= kDriverState *bs, bool copy_to_target; =20 copy_to_target =3D s->job->ret >=3D 0 && + !job_is_cancelled(&s->job->common.job) && s->job->copy_mode =3D=3D MIRROR_COPY_MODE_WRITE_BLOCK= ING; =20 if (copy_to_target) { @@ -1466,6 +1467,7 @@ static int coroutine_fn bdrv_mirror_top_pwritev(Block= DriverState *bs, bool copy_to_target; =20 copy_to_target =3D s->job->ret >=3D 0 && + !job_is_cancelled(&s->job->common.job) && s->job->copy_mode =3D=3D MIRROR_COPY_MODE_WRITE_BLOCK= ING; =20 if (copy_to_target) { --=20 2.31.1