From nobody Mon Nov 17 17:47:49 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1606982160; cv=none; d=zohomail.com; s=zohoarc; b=hH8CxGtlpI+MRSrDDfcD7NHYNRKvZVsvPBByB6ATEjVUDBo/YBZ8V/L5KZp6V+mGDV7P5Jgwc3dJg0yqILBK6QRglCuzySi9hvK8iYmTmo5TSvG7mGbFgh/op7Rs/O1xQo97vyqSsguB5mXCdjSYCI6qYaTT6sItwhVWyXdtZW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606982160; 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=R1hDqR9QDxrI+HEKEGTPxroqWX5h6KeLOyPLCrfS6us=; b=HHlsNcvflP/FNIq9/rGyVXXZRB6PxT2QKVFaZnPskNSIr3RZtY+8zATDu5x1lAzo59JXZ3/RXtlC4HJw0Fgzc52DN12WsYZ4DVwWSY2mwByUlM0TWTn30Ppvo5xvL1swiZpnCJfVHQi6AiZ5Ptuc5H7hKK0R5Phyxl3RcKdQdl8= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606982160800877.3774271096619; Wed, 2 Dec 2020 23:56:00 -0800 (PST) Received: from localhost ([::1]:53652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkjT5-0005cN-Pg for importer@patchew.org; Thu, 03 Dec 2020 02:55:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkjPk-0002ME-Kw; Thu, 03 Dec 2020 02:52:32 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkjPi-00049i-5a; Thu, 03 Dec 2020 02:52:32 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Cmp2Q1QnczhlqS; Thu, 3 Dec 2020 15:51:58 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Thu, 3 Dec 2020 15:52:16 +0800 From: Gan Qixin To: , Subject: [PATCH v2 3/4] block/throttle-groups: Use lock guard macros Date: Thu, 3 Dec 2020 15:50:54 +0800 Message-ID: <20201203075055.127773-4-ganqixin@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201203075055.127773-1-ganqixin@huawei.com> References: <20201203075055.127773-1-ganqixin@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected 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=45.249.212.191; envelope-from=ganqixin@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: kwolf@redhat.com, zhang.zhanghailiang@huawei.com, armbru@redhat.com, Gan Qixin , kuhn.chenqun@huawei.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Replace manual lock()/unlock() calls with lock guard macros (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD) in block/throttle-groups. Signed-off-by: Gan Qixin --- Cc: Kevin Wolf Cc: Paolo Bonzini Cc: Markus Armbruster --- block/throttle-groups.c | 48 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/block/throttle-groups.c b/block/throttle-groups.c index e2f2813c0f..abd16ed9db 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -546,7 +546,7 @@ void throttle_group_register_tgm(ThrottleGroupMember *t= gm, tgm->aio_context =3D ctx; qatomic_set(&tgm->restart_pending, 0); =20 - qemu_mutex_lock(&tg->lock); + QEMU_LOCK_GUARD(&tg->lock); /* If the ThrottleGroup is new set this ThrottleGroupMember as the tok= en */ for (i =3D 0; i < 2; i++) { if (!tg->tokens[i]) { @@ -565,8 +565,6 @@ void throttle_group_register_tgm(ThrottleGroupMember *t= gm, qemu_co_mutex_init(&tgm->throttled_reqs_lock); qemu_co_queue_init(&tgm->throttled_reqs[0]); qemu_co_queue_init(&tgm->throttled_reqs[1]); - - qemu_mutex_unlock(&tg->lock); } =20 /* Unregister a ThrottleGroupMember from its group, removing it from the l= ist, @@ -594,25 +592,25 @@ void throttle_group_unregister_tgm(ThrottleGroupMembe= r *tgm) /* Wait for throttle_group_restart_queue_entry() coroutines to finish = */ AIO_WAIT_WHILE(tgm->aio_context, qatomic_read(&tgm->restart_pending) >= 0); =20 - qemu_mutex_lock(&tg->lock); - for (i =3D 0; i < 2; i++) { - assert(tgm->pending_reqs[i] =3D=3D 0); - assert(qemu_co_queue_empty(&tgm->throttled_reqs[i])); - assert(!timer_pending(tgm->throttle_timers.timers[i])); - if (tg->tokens[i] =3D=3D tgm) { - token =3D throttle_group_next_tgm(tgm); - /* Take care of the case where this is the last tgm in the gro= up */ - if (token =3D=3D tgm) { - token =3D NULL; + WITH_QEMU_LOCK_GUARD(&tg->lock) { + for (i =3D 0; i < 2; i++) { + assert(tgm->pending_reqs[i] =3D=3D 0); + assert(qemu_co_queue_empty(&tgm->throttled_reqs[i])); + assert(!timer_pending(tgm->throttle_timers.timers[i])); + if (tg->tokens[i] =3D=3D tgm) { + token =3D throttle_group_next_tgm(tgm); + /* Take care of the case where this is the last tgm in the= group */ + if (token =3D=3D tgm) { + token =3D NULL; + } + tg->tokens[i] =3D token; } - tg->tokens[i] =3D token; } - } =20 - /* remove the current tgm from the list */ - QLIST_REMOVE(tgm, round_robin); - throttle_timers_destroy(&tgm->throttle_timers); - qemu_mutex_unlock(&tg->lock); + /* remove the current tgm from the list */ + QLIST_REMOVE(tgm, round_robin); + throttle_timers_destroy(&tgm->throttle_timers); + } =20 throttle_group_unref(&tg->ts); tgm->throttle_state =3D NULL; @@ -638,14 +636,14 @@ void throttle_group_detach_aio_context(ThrottleGroupM= ember *tgm) assert(qemu_co_queue_empty(&tgm->throttled_reqs[1])); =20 /* Kick off next ThrottleGroupMember, if necessary */ - qemu_mutex_lock(&tg->lock); - for (i =3D 0; i < 2; i++) { - if (timer_pending(tt->timers[i])) { - tg->any_timer_armed[i] =3D false; - schedule_next_request(tgm, i); + WITH_QEMU_LOCK_GUARD(&tg->lock) { + for (i =3D 0; i < 2; i++) { + if (timer_pending(tt->timers[i])) { + tg->any_timer_armed[i] =3D false; + schedule_next_request(tgm, i); + } } } - qemu_mutex_unlock(&tg->lock); =20 throttle_timers_detach_aio_context(tt); tgm->aio_context =3D NULL; --=20 2.27.0