From nobody Mon Feb 9 12:56:31 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 ARC-Seal: i=1; a=rsa-sha256; t=1606982161; cv=none; d=zohomail.com; s=zohoarc; b=g5UCtCKktzvMHVZM+HtVImigVj+bRPH8wnRyPgnHdnI8dYdWLkfKToCtgE8K01nKpWCHWy2Gwy6r6FQE/gE/v7Vbhoqy6Fmx0YwyOi/nW9logonaYWP8gkZGZDP8YyZQ80CUFC4oFj0BsAuDwOr7909/c5jma69le/ao2cLQo5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606982161; 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=M4uiqQHQX/tVpIXofqxDSCxci7D1b6QO5/9oPvBUhQI=; b=RRJjHAAKhOkU6fWUhAkHVNgB7rNAOW5/FH6AAeYRtyDByv5z2+ilEh7BLbVBi3JcXfjVXb2JW7DQGNVKOWqus9KIt0Kbj9EaqbtXyUBvmuBBlMhlkVeBjnPntPnPNQf2892AiAix4vJTejinHsAS/EeML4E0nCNFKOkEL7v190s= 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 1606982161181239.02363915031003; Wed, 2 Dec 2020 23:56:01 -0800 (PST) Received: from localhost ([::1]:53692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkjT6-0005dN-20 for importer@patchew.org; Thu, 03 Dec 2020 02:56:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkjPh-0002Hn-VU; Thu, 03 Dec 2020 02:52:29 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:2107) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkjPe-00047a-Mb; Thu, 03 Dec 2020 02:52:29 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Cmp2R1JGLzhcLy; Thu, 3 Dec 2020 15:51:59 +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:12 +0800 From: Gan Qixin To: , Subject: [PATCH v2 1/4] block/accounting: Use lock guard macros Date: Thu, 3 Dec 2020 15:50:52 +0800 Message-ID: <20201203075055.127773-2-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.32; envelope-from=ganqixin@huawei.com; helo=szxga06-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_H4=0.001, RCVD_IN_MSPIKE_WL=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/accounting. Signed-off-by: Gan Qixin Reviewed-by: Paolo Bonzini --- Cc: Kevin Wolf Cc: Markus Armbruster --- block/accounting.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/block/accounting.c b/block/accounting.c index 8d41c8a83a..2030851d79 100644 --- a/block/accounting.c +++ b/block/accounting.c @@ -199,29 +199,27 @@ static void block_account_one_io(BlockAcctStats *stat= s, BlockAcctCookie *cookie, return; } =20 - qemu_mutex_lock(&stats->lock); - - if (failed) { - stats->failed_ops[cookie->type]++; - } else { - stats->nr_bytes[cookie->type] +=3D cookie->bytes; - stats->nr_ops[cookie->type]++; - } + WITH_QEMU_LOCK_GUARD(&stats->lock) { + if (failed) { + stats->failed_ops[cookie->type]++; + } else { + stats->nr_bytes[cookie->type] +=3D cookie->bytes; + stats->nr_ops[cookie->type]++; + } =20 - block_latency_histogram_account(&stats->latency_histogram[cookie->type= ], - latency_ns); + block_latency_histogram_account(&stats->latency_histogram[cookie->= type], + latency_ns); =20 - if (!failed || stats->account_failed) { - stats->total_time_ns[cookie->type] +=3D latency_ns; - stats->last_access_time_ns =3D time_ns; + if (!failed || stats->account_failed) { + stats->total_time_ns[cookie->type] +=3D latency_ns; + stats->last_access_time_ns =3D time_ns; =20 - QSLIST_FOREACH(s, &stats->intervals, entries) { - timed_average_account(&s->latency[cookie->type], latency_ns); + QSLIST_FOREACH(s, &stats->intervals, entries) { + timed_average_account(&s->latency[cookie->type], latency_n= s); + } } } =20 - qemu_mutex_unlock(&stats->lock); - cookie->type =3D BLOCK_ACCT_NONE; } =20 --=20 2.27.0 From nobody Mon Feb 9 12:56:31 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 ARC-Seal: i=1; a=rsa-sha256; t=1606982020; cv=none; d=zohomail.com; s=zohoarc; b=OR6Z4rjwI8xbLTL3ZtIjHKYnfp8QLSUCrgU3a9nK9pY0HVG6e77G2ybfrdmAGYkVB5MGEUtRKWOaqZwyQuSa/PcyLd5GWKwjOlF2fMEuXi/St/muGH99Yx8uy1j+DCScz6SDB4DS08NiDZIwVrLIs8tq+VT/508UWgTTabiItvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606982020; 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=MKFbsiSf5YkYAQg8sch6t8JaDzSDAbolhYR67fLAL+c=; b=LDaGsCRAruww2QSDXD7cC35NTAt5+IvyGmkCkIZynT/3sgW5CBiCZRrw7W85Ksu4qxmbIXH1lDxa+mkwchKXC4ocsgweFQg2TP9LAdOa8iVpK/f9+opApZXXpZK1lrGNSAhCyXzXRIKAkPBy5U3uuZxLUl1NRPa/0JFjZnIZIIE= 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 1606982020955953.2775810034755; Wed, 2 Dec 2020 23:53:40 -0800 (PST) Received: from localhost ([::1]:48866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkjQp-0003NK-D3 for importer@patchew.org; Thu, 03 Dec 2020 02:53:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkjPh-0002HV-BI; Thu, 03 Dec 2020 02:52:29 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:2109) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkjPe-00047b-MH; Thu, 03 Dec 2020 02:52:28 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Cmp2R1jmczhlmm; Thu, 3 Dec 2020 15:51:59 +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:14 +0800 From: Gan Qixin To: , Subject: [PATCH v2 2/4] block/curl: Use lock guard macros Date: Thu, 3 Dec 2020 15:50:53 +0800 Message-ID: <20201203075055.127773-3-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.32; envelope-from=ganqixin@huawei.com; helo=szxga06-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_H4=0.001, RCVD_IN_MSPIKE_WL=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/curl. Signed-off-by: Gan Qixin Reviewed-by: Paolo Bonzini --- Cc: Kevin Wolf Cc: Markus Armbruster --- block/curl.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/block/curl.c b/block/curl.c index 4f907c47be..d24a4c5897 100644 --- a/block/curl.c +++ b/block/curl.c @@ -564,23 +564,23 @@ static void curl_detach_aio_context(BlockDriverState = *bs) BDRVCURLState *s =3D bs->opaque; int i; =20 - qemu_mutex_lock(&s->mutex); - for (i =3D 0; i < CURL_NUM_STATES; i++) { - if (s->states[i].in_use) { - curl_clean_state(&s->states[i]); + WITH_QEMU_LOCK_GUARD(&s->mutex) { + for (i =3D 0; i < CURL_NUM_STATES; i++) { + if (s->states[i].in_use) { + curl_clean_state(&s->states[i]); + } + if (s->states[i].curl) { + curl_easy_cleanup(s->states[i].curl); + s->states[i].curl =3D NULL; + } + g_free(s->states[i].orig_buf); + s->states[i].orig_buf =3D NULL; } - if (s->states[i].curl) { - curl_easy_cleanup(s->states[i].curl); - s->states[i].curl =3D NULL; + if (s->multi) { + curl_multi_cleanup(s->multi); + s->multi =3D NULL; } - g_free(s->states[i].orig_buf); - s->states[i].orig_buf =3D NULL; - } - if (s->multi) { - curl_multi_cleanup(s->multi); - s->multi =3D NULL; } - qemu_mutex_unlock(&s->mutex); =20 timer_del(&s->timer); } --=20 2.27.0 From nobody Mon Feb 9 12:56:31 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 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 From nobody Mon Feb 9 12:56:31 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 ARC-Seal: i=1; a=rsa-sha256; t=1606982244; cv=none; d=zohomail.com; s=zohoarc; b=NQavrdChAS1ndTv1OaltMIsDOLz8fibzLpEr+eKHVt84MPivCTTmhJSfNTHJUdQFYkwx3pkmID79en2zucp3k0mEXoA924bSCT+xfxoCO7PEWDNQY6Ciazsp1J/mOC2hiL6EaUzcfnML1JX07+dUM/Wu0mnonPwYD/i50txMnGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606982244; 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=DZ+W6vC0NFdQIEoKIHcq46EHnqUVS2x6X+jBSbtewZI=; b=bwT3sCDWdcuelg/rHgJYxy5Dwzi9wae9CDd9jI4VM8bnmzsfwd9c+VRI8NV6viDDa1c5W29fpKdq7PjX/3ao1EDnhj6W3px9IiJTGYUvCsbaf9aniQRVRoVHTayLYRaO1hypO+cYfHTR0XbgIZjeL10A0B1T1ObiWVyHAf9BVb0= 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 1606982244580390.3150793339163; Wed, 2 Dec 2020 23:57:24 -0800 (PST) Received: from localhost ([::1]:57212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkjUR-0007C0-JX for importer@patchew.org; Thu, 03 Dec 2020 02:57:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkjPn-0002Sl-79; Thu, 03 Dec 2020 02:52:35 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:2544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkjPl-0004C5-07; Thu, 03 Dec 2020 02:52:34 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Cmp2d2Jbvzhldb; Thu, 3 Dec 2020 15:52:09 +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:21 +0800 From: Gan Qixin To: , Subject: [PATCH v2 4/4] block/iscsi: Use lock guard macros Date: Thu, 3 Dec 2020 15:50:55 +0800 Message-ID: <20201203075055.127773-5-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.32; envelope-from=ganqixin@huawei.com; helo=szxga06-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_H4=0.001, RCVD_IN_MSPIKE_WL=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/iscsi. Signed-off-by: Gan Qixin --- Cc: Kevin Wolf Cc: Paolo Bonzini Cc: Markus Armbruster --- block/iscsi.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index e30a7e3606..7d4b3b56d5 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -322,25 +322,23 @@ iscsi_aio_cancel(BlockAIOCB *blockacb) IscsiAIOCB *acb =3D (IscsiAIOCB *)blockacb; IscsiLun *iscsilun =3D acb->iscsilun; =20 - qemu_mutex_lock(&iscsilun->mutex); + WITH_QEMU_LOCK_GUARD(&iscsilun->mutex) { =20 - /* If it was cancelled or completed already, our work is done here */ - if (acb->cancelled || acb->status !=3D -EINPROGRESS) { - qemu_mutex_unlock(&iscsilun->mutex); - return; - } + /* If it was cancelled or completed already, our work is done here= */ + if (acb->cancelled || acb->status !=3D -EINPROGRESS) { + return; + } =20 - acb->cancelled =3D true; + acb->cancelled =3D true; =20 - qemu_aio_ref(acb); /* released in iscsi_abort_task_cb() */ + qemu_aio_ref(acb); /* released in iscsi_abort_task_cb() */ =20 - /* send a task mgmt call to the target to cancel the task on the targe= t */ - if (iscsi_task_mgmt_abort_task_async(iscsilun->iscsi, acb->task, - iscsi_abort_task_cb, acb) < 0) { - qemu_aio_unref(acb); /* since iscsi_abort_task_cb() won't be calle= d */ + /* send a task mgmt call to the target to cancel the task on the t= arget */ + if (iscsi_task_mgmt_abort_task_async(iscsilun->iscsi, acb->task, + iscsi_abort_task_cb, acb) < 0= ) { + qemu_aio_unref(acb); /* since iscsi_abort_task_cb() won't be c= alled */ + } } - - qemu_mutex_unlock(&iscsilun->mutex); } =20 static const AIOCBInfo iscsi_aiocb_info =3D { @@ -375,22 +373,22 @@ static void iscsi_timed_check_events(void *opaque) { IscsiLun *iscsilun =3D opaque; =20 - qemu_mutex_lock(&iscsilun->mutex); + WITH_QEMU_LOCK_GUARD(&iscsilun->mutex) { + /* check for timed out requests */ + iscsi_service(iscsilun->iscsi, 0); =20 - /* check for timed out requests */ - iscsi_service(iscsilun->iscsi, 0); + if (iscsilun->request_timed_out) { + iscsilun->request_timed_out =3D false; + iscsi_reconnect(iscsilun->iscsi); + } =20 - if (iscsilun->request_timed_out) { - iscsilun->request_timed_out =3D false; - iscsi_reconnect(iscsilun->iscsi); + /* + * newer versions of libiscsi may return zero events. Ensure we are + * able to return to service once this situation changes. + */ + iscsi_set_events(iscsilun); } =20 - /* newer versions of libiscsi may return zero events. Ensure we are ab= le - * to return to service once this situation changes. */ - iscsi_set_events(iscsilun); - - qemu_mutex_unlock(&iscsilun->mutex); - timer_mod(iscsilun->event_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + EVENT_INTERVAL); } --=20 2.27.0