From nobody Mon Feb 9 17:36:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=openvz.org ARC-Seal: i=1; a=rsa-sha256; t=1592324523; cv=none; d=zohomail.com; s=zohoarc; b=bkoLpMRTV+vJ6Txum3rz1YbLqFfMWOfZ2GS5wJF4mDFbZUPp81Fe0MM2QKbL0ZvZQVrgIt3mA5H0+RhvGbp/Cw/MiV32mOP0/CvupBAXcj9PFf1XgxyiTrisvqrJcGhLTf0Vewrej45qCXA1D/NznKqSkGyVHGkLwPpDHmP0Mh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592324523; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=56fwaQnF6c2ZMi+FkPy/fdc7bm+A0BcuYxoBo33t0u4=; b=Ema5TWqeQx05oVcnDR9tdFOFaZUuCQKpW5NgrD+wSHmjNMwx6Ssy9K4yWEHDdxVWwa8gfugImRtPkJcNOUTvHdsYGHRL7eP7jjIXfZ1vkyPUNL0v6iamYsIUsLuZ/U/jy+hFB2dxXYs1rorF1kYHWHDu4RjoEzT1xkzmYp42toE= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 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 1592324523145636.5521084995843; Tue, 16 Jun 2020 09:22:03 -0700 (PDT) Received: from localhost ([::1]:54226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlELZ-0006oa-MR for importer@patchew.org; Tue, 16 Jun 2020 12:22:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlEKM-0004vl-Oi; Tue, 16 Jun 2020 12:20:46 -0400 Received: from relay.sw.ru ([185.231.240.75]:43694 helo=relay3.sw.ru) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlEKJ-0006a0-63; Tue, 16 Jun 2020 12:20:46 -0400 Received: from [192.168.15.172] (helo=iris.lishka.ru) by relay3.sw.ru with esmtp (Exim 4.93) (envelope-from ) id 1jlEK1-0003Pf-6T; Tue, 16 Jun 2020 19:20:25 +0300 From: "Denis V. Lunev" To: qemu-block@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 2/5] block/aio_task: allow start/wait task from any coroutine Date: Tue, 16 Jun 2020 19:20:32 +0300 Message-Id: <20200616162035.29857-3-den@openvz.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200616162035.29857-1-den@openvz.org> References: <20200616162035.29857-1-den@openvz.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; Received-SPF: pass client-ip=185.231.240.75; envelope-from=den@openvz.org; helo=relay3.sw.ru X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/16 12:20:39 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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 , Fam Zheng , Vladimir Sementsov-Ogievskiy , Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Denis Plotnikov , Stefan Hajnoczi , "Denis V . Lunev" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Currently, aio task pool assumes that there is a main coroutine, which creates tasks and wait for them. Let's remove the restriction by using CoQueue. Code becomes clearer, interface more obvious. Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Denis V. Lunev CC: Kevin Wolf CC: Max Reitz CC: Stefan Hajnoczi CC: Fam Zheng CC: Juan Quintela CC: "Dr. David Alan Gilbert" CC: Vladimir Sementsov-Ogievskiy CC: Denis Plotnikov Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/aio_task.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/block/aio_task.c b/block/aio_task.c index 88989fa248..cf62e5c58b 100644 --- a/block/aio_task.c +++ b/block/aio_task.c @@ -27,11 +27,10 @@ #include "block/aio_task.h" =20 struct AioTaskPool { - Coroutine *main_co; int status; int max_busy_tasks; int busy_tasks; - bool waiting; + CoQueue waiters; }; =20 static void coroutine_fn aio_task_co(void *opaque) @@ -52,31 +51,23 @@ static void coroutine_fn aio_task_co(void *opaque) =20 g_free(task); =20 - if (pool->waiting) { - pool->waiting =3D false; - aio_co_wake(pool->main_co); - } + qemu_co_queue_restart_all(&pool->waiters); } =20 void coroutine_fn aio_task_pool_wait_one(AioTaskPool *pool) { assert(pool->busy_tasks > 0); - assert(qemu_coroutine_self() =3D=3D pool->main_co); =20 - pool->waiting =3D true; - qemu_coroutine_yield(); + qemu_co_queue_wait(&pool->waiters, NULL); =20 - assert(!pool->waiting); assert(pool->busy_tasks < pool->max_busy_tasks); } =20 void coroutine_fn aio_task_pool_wait_slot(AioTaskPool *pool) { - if (pool->busy_tasks < pool->max_busy_tasks) { - return; + while (pool->busy_tasks >=3D pool->max_busy_tasks) { + aio_task_pool_wait_one(pool); } - - aio_task_pool_wait_one(pool); } =20 void coroutine_fn aio_task_pool_wait_all(AioTaskPool *pool) @@ -98,8 +89,8 @@ AioTaskPool *coroutine_fn aio_task_pool_new(int max_busy_= tasks) { AioTaskPool *pool =3D g_new0(AioTaskPool, 1); =20 - pool->main_co =3D qemu_coroutine_self(); pool->max_busy_tasks =3D max_busy_tasks; + qemu_co_queue_init(&pool->waiters); =20 return pool; } --=20 2.17.1