From nobody Mon Feb 9 02:28:27 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 1631020350420242.71412011030213; Tue, 7 Sep 2021 06:12:30 -0700 (PDT) Received: from localhost ([::1]:33762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNatp-0002Oa-D1 for importer@patchew.org; Tue, 07 Sep 2021 09:12:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNaRT-0005tL-JJ for qemu-devel@nongnu.org; Tue, 07 Sep 2021 08:43:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59293) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNaRR-0006Mj-Ps for qemu-devel@nongnu.org; Tue, 07 Sep 2021 08:43:11 -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-322-hYyg7iv_OmuU8fgdFDQl2A-1; Tue, 07 Sep 2021 08:43:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B0327835DE2; Tue, 7 Sep 2021 12:43:06 +0000 (UTC) Received: from localhost (unknown [10.39.193.128]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 550E860BE5; Tue, 7 Sep 2021 12:43:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631018588; 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=NJXHXfb3pQ+8VZadOR9DzFDVfBhAMoHjd+yo1PNqLpw=; b=YHI4O5GGM6yTKkUpo1i2rX5dHFAGUsG5R4G1YnDpag8IWGU1huOfrf7LncP69IH+DwzcZk mhxHD8aG6fGmIdyKMRmxPNrVRBaqD1T1iM4kWARzTUZsbXgIXXWJC0+VIsDG2k9Yfohn9k kIMlAlmhVCuVvi6nFi9+4mCXLTM5nf0= X-MC-Unique: hYyg7iv_OmuU8fgdFDQl2A-1 From: Hanna Reitz To: qemu-block@nongnu.org Subject: [PATCH v4 09/12] mirror: Check job_is_cancelled() earlier Date: Tue, 7 Sep 2021 14:42:42 +0200 Message-Id: <20210907124245.143492-10-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.12 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=170.10.133.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=ham 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: 1631020352140100001 Content-Type: text/plain; charset="utf-8" We must check whether the job is force-cancelled early in our main loop, most importantly before any `continue` statement. For example, we used to have `continue`s before our current checking location that are triggered by `mirror_flush()` failing. So, if `mirror_flush()` kept failing, force-cancelling the job would not terminate it. Jobs can be cancelled while they yield, and once they are (force-cancelled), they should not generate new I/O requests. Therefore, we should put the check after the last yield before mirror_iteration() is invoked. Buglink: https://gitlab.com/qemu-project/qemu/-/issues/462 Signed-off-by: Hanna Reitz Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/mirror.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 024fa2dcea..bf1d50ff1c 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1000,6 +1000,11 @@ static int coroutine_fn mirror_run(Job *job, Error *= *errp) =20 job_pause_point(&s->common.job); =20 + if (job_is_cancelled(&s->common.job)) { + ret =3D 0; + goto immediate_exit; + } + cnt =3D bdrv_get_dirty_count(s->dirty_bitmap); /* cnt is the number of dirty bytes remaining and s->bytes_in_flig= ht is * the number of bytes currently being processed; together those a= re @@ -1078,8 +1083,6 @@ static int coroutine_fn mirror_run(Job *job, Error **= errp) break; } =20 - ret =3D 0; - if (job_is_ready(&s->common.job) && !should_complete) { delay_ns =3D (s->in_flight =3D=3D 0 && cnt =3D=3D 0 ? BLOCK_JOB_SLICE_TIME : 0); @@ -1087,9 +1090,6 @@ static int coroutine_fn mirror_run(Job *job, Error **= errp) trace_mirror_before_sleep(s, cnt, job_is_ready(&s->common.job), delay_ns); job_sleep_ns(&s->common.job, delay_ns); - if (job_is_cancelled(&s->common.job)) { - break; - } s->last_pause_ns =3D qemu_clock_get_ns(QEMU_CLOCK_REALTIME); } =20 --=20 2.31.1