From nobody Thu Dec 18 13:17:49 2025 Delivered-To: importer@patchew.org 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; 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=1585322525; cv=none; d=zohomail.com; s=zohoarc; b=bLU0cUOjKEgZY2+fT1NCLXThUK8dy4naUSG/fBQ4+OntLVrouwxyV4iBaXCA+bQytkrtL113JKUrX98x4RmOwYw11+CRwQhSfUMXS1ZTKvi9coM47WqCYvCE5hs6b6l3n0AvXGz01RJhrZ7tbu5g9eBdz33qka5zNjMh3ItqldI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585322525; h=Content-Type: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=LpFx3xbDjLHgnld7KEsJo+oSoeRXqHdzp2xWL/JMMOs=; b=P6iIJRCHOqOzp04s1O1rTePE4NclIOf7TVlX8Wn2UxbjtuWe0TfCwfVLCgxGW7awNyWPrki4ZeLqQ6VZ/OEnavlaIs8q+ev3tv6s8ZWUKPO5wUTW6kpu3hRAZ52i80Az34QBhqhcv9i75EFEUeyumWblGPeZIe1HX2L+0zGcHpA= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585322525192857.8519203628098; Fri, 27 Mar 2020 08:22:05 -0700 (PDT) Received: from localhost ([::1]:42978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqo8-00014v-2y for importer@patchew.org; Fri, 27 Mar 2020 11:22:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41597) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHqmP-00075U-VJ for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHqmO-0005YN-Fr for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:17 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:24279) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHqmO-0005WA-Aj for qemu-devel@nongnu.org; Fri, 27 Mar 2020 11:20:16 -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-374-ujUbC-szOW66SbZrDsrcFQ-1; Fri, 27 Mar 2020 11:20:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EA95A801E72; Fri, 27 Mar 2020 15:20:11 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-253.ams2.redhat.com [10.36.113.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id E65CF5C28F; Fri, 27 Mar 2020 15:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585322415; 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=LpFx3xbDjLHgnld7KEsJo+oSoeRXqHdzp2xWL/JMMOs=; b=iEcBh5fJDBxwNJ448jdPi5E7itAA19L3d6IAmkcUit01MBzf5h1aao+Ek6PXz7mKJXZgMr Zez24PPiPmOGYUultRddz/dXfDuG4W57fEZDWpqhxOGERfoDLHfU+RMqDrtR/utYYB8LdQ uxzZAJatr59MGPAI6FDUl+GkOYnrOXI= X-MC-Unique: ujUbC-szOW66SbZrDsrcFQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 5/6] mirror: Wait only for in-flight operations Date: Fri, 27 Mar 2020 16:19:49 +0100 Message-Id: <20200327151950.11820-6-kwolf@redhat.com> In-Reply-To: <20200327151950.11820-1-kwolf@redhat.com> References: <20200327151950.11820-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" mirror_wait_for_free_in_flight_slot() just picks a random operation to wait for. However, a MirrorOp is already in s->ops_in_flight when mirror_co_read() waits for free slots, so if not enough slots are immediately available, an operation can end up waiting for itself, or two or more operations can wait for each other to complete, which results in a hang. Fix this by adding a flag to MirrorOp that tells us if the request is already in flight (and therefore occupies slots that it will later free), and picking only such operations for waiting. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1794692 Signed-off-by: Kevin Wolf Message-Id: <20200326153628.4869-3-kwolf@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- block/mirror.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/block/mirror.c b/block/mirror.c index 5879e63473..c26fd9260d 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -102,6 +102,7 @@ struct MirrorOp { =20 bool is_pseudo_op; bool is_active_write; + bool is_in_flight; CoQueue waiting_requests; Coroutine *co; =20 @@ -293,7 +294,9 @@ mirror_wait_for_any_operation(MirrorBlockJob *s, bool a= ctive) * caller of this function. Since there is only one pseudo op * at any given time, we will always find some real operation * to wait on. */ - if (!op->is_pseudo_op && op->is_active_write =3D=3D active) { + if (!op->is_pseudo_op && op->is_in_flight && + op->is_active_write =3D=3D active) + { qemu_co_queue_wait(&op->waiting_requests, NULL); return; } @@ -367,6 +370,7 @@ static void coroutine_fn mirror_co_read(void *opaque) /* Copy the dirty cluster. */ s->in_flight++; s->bytes_in_flight +=3D op->bytes; + op->is_in_flight =3D true; trace_mirror_one_iteration(s, op->offset, op->bytes); =20 ret =3D bdrv_co_preadv(s->mirror_top_bs->backing, op->offset, op->byte= s, @@ -382,6 +386,7 @@ static void coroutine_fn mirror_co_zero(void *opaque) op->s->in_flight++; op->s->bytes_in_flight +=3D op->bytes; *op->bytes_handled =3D op->bytes; + op->is_in_flight =3D true; =20 ret =3D blk_co_pwrite_zeroes(op->s->target, op->offset, op->bytes, op->s->unmap ? BDRV_REQ_MAY_UNMAP : 0); @@ -396,6 +401,7 @@ static void coroutine_fn mirror_co_discard(void *opaque) op->s->in_flight++; op->s->bytes_in_flight +=3D op->bytes; *op->bytes_handled =3D op->bytes; + op->is_in_flight =3D true; =20 ret =3D blk_co_pdiscard(op->s->target, op->offset, op->bytes); mirror_write_complete(op, ret); @@ -1319,6 +1325,7 @@ static MirrorOp *coroutine_fn active_write_prepare(Mi= rrorBlockJob *s, .offset =3D offset, .bytes =3D bytes, .is_active_write =3D true, + .is_in_flight =3D true, }; qemu_co_queue_init(&op->waiting_requests); QTAILQ_INSERT_TAIL(&s->ops_in_flight, op, next); --=20 2.20.1