From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C877C606D1 for ; Mon, 8 Jul 2019 22:07:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 36BA32166E for ; Mon, 8 Jul 2019 22:07:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 36BA32166E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkbnB-0003Y6-FE for qemu-devel@archiver.kernel.org; Mon, 08 Jul 2019 18:07:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43979) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkbl8-0001vw-8z for qemu-devel@nongnu.org; Mon, 08 Jul 2019 18:05:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkbl5-0003gZ-KB for qemu-devel@nongnu.org; Mon, 08 Jul 2019 18:05:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49058) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkbl2-0003aa-Cy; Mon, 08 Jul 2019 18:05:12 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2615E7CBA0; Mon, 8 Jul 2019 22:05:11 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-215.bos.redhat.com [10.18.17.215]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE7C11001DC8; Mon, 8 Jul 2019 22:05:09 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 8 Jul 2019 18:05:00 -0400 Message-Id: <20190708220502.12977-2-jsnow@redhat.com> In-Reply-To: <20190708220502.12977-1-jsnow@redhat.com> References: <20190708220502.12977-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 08 Jul 2019 22:05:11 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/3] blockdev: reduce aio_context locked sections in bitmap add/remove 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: Fam Zheng , Kevin Wolf , vsementsov@virtuozzo.com, Juan Quintela , John Snow , "Dr. David Alan Gilbert" , Max Reitz , Stefan Hajnoczi , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Vladimir Sementsov-Ogievskiy Commit 0a6c86d024c52 returned these locks back to add/remove functionality, to protect from intersection of persistent bitmap related IO with other IO. But other bitmap-related functions called here are unrelated to the problem, and there are no needs to keep these calls inside critical sections. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: John Snow Signed-off-by: John Snow --- blockdev.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/blockdev.c b/blockdev.c index 4d141e9a1f..01248252ca 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2811,7 +2811,6 @@ void qmp_block_dirty_bitmap_add(const char *node, c= onst char *name, { BlockDriverState *bs; BdrvDirtyBitmap *bitmap; - AioContext *aio_context =3D NULL; =20 if (!name || name[0] =3D=3D '\0') { error_setg(errp, "Bitmap name cannot be empty"); @@ -2847,16 +2846,20 @@ void qmp_block_dirty_bitmap_add(const char *node,= const char *name, } =20 if (persistent) { - aio_context =3D bdrv_get_aio_context(bs); + AioContext *aio_context =3D bdrv_get_aio_context(bs); + bool ok; + aio_context_acquire(aio_context); - if (!bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp= )) { - goto out; + ok =3D bdrv_can_store_new_dirty_bitmap(bs, name, granularity, er= rp); + aio_context_release(aio_context); + if (!ok) { + return; } } =20 bitmap =3D bdrv_create_dirty_bitmap(bs, granularity, name, errp); if (bitmap =3D=3D NULL) { - goto out; + return; } =20 if (disabled) { @@ -2864,10 +2867,6 @@ void qmp_block_dirty_bitmap_add(const char *node, = const char *name, } =20 bdrv_dirty_bitmap_set_persistence(bitmap, persistent); - out: - if (aio_context) { - aio_context_release(aio_context); - } } =20 void qmp_block_dirty_bitmap_remove(const char *node, const char *name, @@ -2875,8 +2874,6 @@ void qmp_block_dirty_bitmap_remove(const char *node= , const char *name, { BlockDriverState *bs; BdrvDirtyBitmap *bitmap; - Error *local_err =3D NULL; - AioContext *aio_context =3D NULL; =20 bitmap =3D block_dirty_bitmap_lookup(node, name, &bs, errp); if (!bitmap || !bs) { @@ -2889,20 +2886,19 @@ void qmp_block_dirty_bitmap_remove(const char *no= de, const char *name, } =20 if (bdrv_dirty_bitmap_get_persistence(bitmap)) { - aio_context =3D bdrv_get_aio_context(bs); + AioContext *aio_context =3D bdrv_get_aio_context(bs); + Error *local_err =3D NULL; + aio_context_acquire(aio_context); bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err); + aio_context_release(aio_context); if (local_err !=3D NULL) { error_propagate(errp, local_err); - goto out; + return; } } =20 bdrv_release_dirty_bitmap(bs, bitmap); - out: - if (aio_context) { - aio_context_release(aio_context); - } } =20 /** --=20 2.21.0