From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7C42C1975A for ; Wed, 25 Mar 2020 17:25:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 95E0B20772 for ; Wed, 25 Mar 2020 17:25:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CXVjCza4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95E0B20772 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH9mr-00023q-Qq for qemu-devel@archiver.kernel.org; Wed, 25 Mar 2020 13:25:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59430) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH9kl-0006wq-KG for qemu-devel@nongnu.org; Wed, 25 Mar 2020 13:23:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH9kk-0002kw-9Q for qemu-devel@nongnu.org; Wed, 25 Mar 2020 13:23:43 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:44388) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jH9kk-0002kM-5g for qemu-devel@nongnu.org; Wed, 25 Mar 2020 13:23:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585157021; 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=z4GZIoigkEvsVG7WhJxc+xDFAFpTeOM6YrcFeweRdXQ=; b=CXVjCza48p0fYcVB6fFcXYpkFReZDrXolFPcY2txVSIaKvYD1L7TQEZDCKKBcruTXMqFwF f4CjXSJQHyRpMfMyahgJvU4tMu+S8sXAcOmSuIwOOlJme1N/KCSF0b2j8p/TeYnajXUy71 D/1zWpa8Ddh942DuiuKskQw2J/MB9KY= 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-452-17tdskvPOwiTcXnycf9HDQ-1; Wed, 25 Mar 2020 13:23:40 -0400 X-MC-Unique: 17tdskvPOwiTcXnycf9HDQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3DC61800D5F; Wed, 25 Mar 2020 17:23:39 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-184.ams2.redhat.com [10.36.113.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7B3794B57; Wed, 25 Mar 2020 17:23:37 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 2/2] mirror: Wait only for in-flight operations Date: Wed, 25 Mar 2020 18:23:26 +0100 Message-Id: <20200325172326.22347-3-kwolf@redhat.com> In-Reply-To: <20200325172326.22347-1-kwolf@redhat.com> References: <20200325172326.22347-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII 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, jsnow@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- block/mirror.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/block/mirror.c b/block/mirror.c index 393131b135..7fef52ded2 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); --=20 2.20.1