From nobody Tue Feb 10 17:08:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523473528388351.0472175450035; Wed, 11 Apr 2018 12:05:28 -0700 (PDT) Received: from localhost ([::1]:48638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6L3f-0004P8-Ht for importer@patchew.org; Wed, 11 Apr 2018 15:05:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6KtN-0003CM-Co for qemu-devel@nongnu.org; Wed, 11 Apr 2018 14:54:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f6KtJ-0005w7-C4 for qemu-devel@nongnu.org; Wed, 11 Apr 2018 14:54:49 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:38674 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f6KtG-0005tJ-9B; Wed, 11 Apr 2018 14:54:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C4BA94023141; Wed, 11 Apr 2018 18:54:41 +0000 (UTC) Received: from localhost (ovpn-204-29.brq.redhat.com [10.40.204.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A724215CDC6; Wed, 11 Apr 2018 18:54:41 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 11 Apr 2018 20:54:15 +0200 Message-Id: <20180411185425.2461-4-mreitz@redhat.com> In-Reply-To: <20180411185425.2461-1-mreitz@redhat.com> References: <20180411185425.2461-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 11 Apr 2018 18:54:41 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 11 Apr 2018 18:54:41 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mreitz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v4 03/13] block/mirror: Use CoQueue to wait on in-flight ops X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , John Snow , qemu-devel@nongnu.org, Stefan Hajnoczi , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Attach a CoQueue to each in-flight operation so if we need to wait for any we can use it to wait instead of just blindly yielding and hoping for some operation to wake us. A later patch will use this infrastructure to allow requests accessing the same area of the virtual disk to specifically wait for each other. Signed-off-by: Max Reitz Reviewed-by: Fam Zheng --- block/mirror.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index bd8ee7d92c..1af6481876 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -13,6 +13,7 @@ =20 #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/coroutine.h" #include "trace.h" #include "block/blockjob_int.h" #include "block/block_int.h" @@ -34,6 +35,8 @@ typedef struct MirrorBuffer { QSIMPLEQ_ENTRY(MirrorBuffer) next; } MirrorBuffer; =20 +typedef struct MirrorOp MirrorOp; + typedef struct MirrorBlockJob { BlockJob common; RateLimit limit; @@ -67,15 +70,15 @@ typedef struct MirrorBlockJob { unsigned long *in_flight_bitmap; int in_flight; int64_t bytes_in_flight; + QTAILQ_HEAD(MirrorOpList, MirrorOp) ops_in_flight; int ret; bool unmap; - bool waiting_for_io; int target_cluster_size; int max_iov; bool initial_zeroing_ongoing; } MirrorBlockJob; =20 -typedef struct MirrorOp { +struct MirrorOp { MirrorBlockJob *s; QEMUIOVector qiov; int64_t offset; @@ -84,7 +87,11 @@ typedef struct MirrorOp { /* The pointee is set by mirror_co_read(), mirror_co_zero(), and * mirror_co_discard() before yielding for the first time */ int64_t *bytes_handled; -} MirrorOp; + + CoQueue waiting_requests; + + QTAILQ_ENTRY(MirrorOp) next; +}; =20 typedef enum MirrorMethod { MIRROR_METHOD_COPY, @@ -125,7 +132,9 @@ static void coroutine_fn mirror_iteration_done(MirrorOp= *op, int ret) =20 chunk_num =3D op->offset / s->granularity; nb_chunks =3D DIV_ROUND_UP(op->bytes, s->granularity); + bitmap_clear(s->in_flight_bitmap, chunk_num, nb_chunks); + QTAILQ_REMOVE(&s->ops_in_flight, op, next); if (ret >=3D 0) { if (s->cow_bitmap) { bitmap_set(s->cow_bitmap, chunk_num, nb_chunks); @@ -135,11 +144,9 @@ static void coroutine_fn mirror_iteration_done(MirrorO= p *op, int ret) } } qemu_iovec_destroy(&op->qiov); - g_free(op); =20 - if (s->waiting_for_io) { - qemu_coroutine_enter(s->common.co); - } + qemu_co_queue_restart_all(&op->waiting_requests); + g_free(op); } =20 static void coroutine_fn mirror_write_complete(MirrorOp *op, int ret) @@ -229,10 +236,11 @@ static int mirror_cow_align(MirrorBlockJob *s, int64_= t *offset, =20 static inline void mirror_wait_for_io(MirrorBlockJob *s) { - assert(!s->waiting_for_io); - s->waiting_for_io =3D true; - qemu_coroutine_yield(); - s->waiting_for_io =3D false; + MirrorOp *op; + + op =3D QTAILQ_FIRST(&s->ops_in_flight); + assert(op); + qemu_co_queue_wait(&op->waiting_requests, NULL); } =20 /* Perform a mirror copy operation. @@ -342,6 +350,7 @@ static unsigned mirror_perform(MirrorBlockJob *s, int64= _t offset, .bytes =3D bytes, .bytes_handled =3D &bytes_handled, }; + qemu_co_queue_init(&op->waiting_requests); =20 switch (mirror_method) { case MIRROR_METHOD_COPY: @@ -357,6 +366,7 @@ static unsigned mirror_perform(MirrorBlockJob *s, int64= _t offset, abort(); } =20 + QTAILQ_INSERT_TAIL(&s->ops_in_flight, op, next); qemu_coroutine_enter(co); /* At this point, ownership of op has been moved to the coroutine * and the object may already be freed */ @@ -1283,6 +1293,8 @@ static void mirror_start_job(const char *job_id, Bloc= kDriverState *bs, } } =20 + QTAILQ_INIT(&s->ops_in_flight); + trace_mirror_start(bs, s, opaque); block_job_start(&s->common); return; --=20 2.14.3