From nobody Mon Feb 9 19:53:18 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149269055208970.69745736320999; Thu, 20 Apr 2017 05:15:52 -0700 (PDT) Received: from localhost ([::1]:53621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1B02-0001Xg-Nz for importer@patchew.org; Thu, 20 Apr 2017 08:15:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1Amn-0007cR-3D for qemu-devel@nongnu.org; Thu, 20 Apr 2017 08:02:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1Ama-0002yS-7t for qemu-devel@nongnu.org; Thu, 20 Apr 2017 08:02:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34568) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d1Alv-0002SQ-2x; Thu, 20 Apr 2017 08:01:15 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 503AFC0467F3; Thu, 20 Apr 2017 12:01:13 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-9.ams2.redhat.com [10.36.117.9]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v3KC0w3w002037; Thu, 20 Apr 2017 08:01:12 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 503AFC0467F3 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 503AFC0467F3 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 20 Apr 2017 14:00:49 +0200 Message-Id: <20170420120058.28404-9-pbonzini@redhat.com> In-Reply-To: <20170420120058.28404-1-pbonzini@redhat.com> References: <20170420120058.28404-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 20 Apr 2017 12:01:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 08/17] throttle-groups: protect throttled requests with a CoMutex 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: qemu-block@nongnu.org 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" Signed-off-by: Paolo Bonzini --- block/block-backend.c | 1 + block/throttle-groups.c | 11 +++++++++-- include/sysemu/block-backend.h | 7 ++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index 915ccc5..a37d74d 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -163,6 +163,7 @@ BlockBackend *blk_new(uint64_t perm, uint64_t shared_pe= rm) blk->shared_perm =3D shared_perm; blk_set_enable_write_cache(blk, true); =20 + qemu_co_mutex_init(&blk->public.reqs_lock); qemu_co_queue_init(&blk->public.throttled_reqs[0]); qemu_co_queue_init(&blk->public.throttled_reqs[1]); =20 diff --git a/block/throttle-groups.c b/block/throttle-groups.c index d66bf62..695d28d 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -268,8 +268,13 @@ static bool throttle_group_schedule_timer(BlockBackend= *blk, bool is_write) static bool throttle_group_co_restart_queue(BlockBackend *blk, bool is_wri= te) { BlockBackendPublic *blkp =3D blk_get_public(blk); + bool ret; =20 - return qemu_co_queue_next(&blkp->throttled_reqs[is_write]); + qemu_co_mutex_lock(&blkp->reqs_lock); + ret =3D qemu_co_queue_next(&blkp->throttled_reqs[is_write]); + qemu_co_mutex_unlock(&blkp->reqs_lock); + + return ret; } =20 /* Look for the next pending I/O request and schedule it. @@ -338,7 +343,9 @@ void coroutine_fn throttle_group_co_io_limits_intercept= (BlockBackend *blk, if (must_wait || blkp->pending_reqs[is_write]) { blkp->pending_reqs[is_write]++; qemu_mutex_unlock(&tg->lock); - qemu_co_queue_wait(&blkp->throttled_reqs[is_write], NULL); + qemu_co_mutex_lock(&blkp->reqs_lock); + qemu_co_queue_wait(&blkp->throttled_reqs[is_write], &blkp->reqs_lo= ck); + qemu_co_mutex_unlock(&blkp->reqs_lock); qemu_mutex_lock(&tg->lock); blkp->pending_reqs[is_write]--; } diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 87a43b0..e9529fb 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -72,11 +72,8 @@ typedef struct BlockDevOps { * fields that must be public. This is in particular for QLIST_ENTRY() and * friends so that BlockBackends can be kept in lists outside block-backen= d.c */ typedef struct BlockBackendPublic { - /* I/O throttling has its own locking, but also some fields are - * protected by the AioContext lock. - */ - - /* Protected by AioContext lock. */ + /* reqs_lock protects the CoQueues for throttled requests. */ + CoMutex reqs_lock; CoQueue throttled_reqs[2]; =20 /* Nonzero if the I/O limits are currently being ignored; generally --=20 2.9.3