From nobody Thu Apr 25 00:17:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1568132988; cv=none; d=zoho.com; s=zohoarc; b=hd9ToyH0jakdQQY0gGS8+3X/aC5I+ULfY2XB18wrqytZVAf2hVP0PHtImcmmtUtWYPvb4NFSuOZ0bJik0nemF5+5zyyqVLsegXGSg3E3pEIXwg6UZE3RU23K9HQfvUy4x40CnLNQsfTBzcsIxE0f7gObnFnUZrLjEEQ6ATD11Cs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568132988; 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:ARC-Authentication-Results; bh=e5DpLsSpojuux1hvYWc8QR1thQogzIAV/HEN/5mc2to=; b=Yq6SocUu2QRO5yORJ5nwvRQOvq4RmNWjSMum5i9NSWV3+AUwcazOCrGsaUWK9XPlmcxHiLPgr6VuOQXWPQEBPkjH+ehCKoBKmV4ou82VDFDXs9qiJfbUqS+kaMk/08UN8krqJ6UR14pQNTq5hohckdu39Y1HZWXmacxGLJX8264= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1568132988189499.69368071616464; Tue, 10 Sep 2019 09:29:48 -0700 (PDT) Received: from localhost ([::1]:42188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7j1W-0006mS-QH for importer@patchew.org; Tue, 10 Sep 2019 12:29:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45790) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7izL-0004qr-FE for qemu-devel@nongnu.org; Tue, 10 Sep 2019 12:27:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7izK-0003UC-3w for qemu-devel@nongnu.org; Tue, 10 Sep 2019 12:27:31 -0400 Received: from relay.sw.ru ([185.231.240.75]:44320) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7izH-0003Q6-C1; Tue, 10 Sep 2019 12:27:27 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1i7izE-0001NT-9d; Tue, 10 Sep 2019 19:27:24 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Tue, 10 Sep 2019 19:27:22 +0300 Message-Id: <20190910162724.79574-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190910162724.79574-1-vsementsov@virtuozzo.com> References: <20190910162724.79574-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 1/3] block: move bdrv_can_store_new_dirty_bitmap to block/dirty-bitmap.c 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@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, armbru@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com 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" block/dirty-bitmap.c seems to be more appropriate for it and bdrv_remove_persistent_dirty_bitmap already in it. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 22 ---------------------- block/dirty-bitmap.c | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/block.c b/block.c index 5944124845..bea03cfcc9 100644 --- a/block.c +++ b/block.c @@ -6555,25 +6555,3 @@ void bdrv_del_child(BlockDriverState *parent_bs, Bdr= vChild *child, Error **errp) =20 parent_bs->drv->bdrv_del_child(parent_bs, child, errp); } - -bool bdrv_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *nam= e, - uint32_t granularity, Error **errp) -{ - BlockDriver *drv =3D bs->drv; - - if (!drv) { - error_setg_errno(errp, ENOMEDIUM, - "Can't store persistent bitmaps to %s", - bdrv_get_device_or_node_name(bs)); - return false; - } - - if (!drv->bdrv_can_store_new_dirty_bitmap) { - error_setg_errno(errp, ENOTSUP, - "Can't store persistent bitmaps to %s", - bdrv_get_device_or_node_name(bs)); - return false; - } - - return drv->bdrv_can_store_new_dirty_bitmap(bs, name, granularity, err= p); -} diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 134e0c9a0c..8f42015db9 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -464,6 +464,28 @@ void bdrv_remove_persistent_dirty_bitmap(BlockDriverSt= ate *bs, } } =20 +bool bdrv_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *nam= e, + uint32_t granularity, Error **errp) +{ + BlockDriver *drv =3D bs->drv; + + if (!drv) { + error_setg_errno(errp, ENOMEDIUM, + "Can't store persistent bitmaps to %s", + bdrv_get_device_or_node_name(bs)); + return false; + } + + if (!drv->bdrv_can_store_new_dirty_bitmap) { + error_setg_errno(errp, ENOTSUP, + "Can't store persistent bitmaps to %s", + bdrv_get_device_or_node_name(bs)); + return false; + } + + return drv->bdrv_can_store_new_dirty_bitmap(bs, name, granularity, err= p); +} + void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap) { bdrv_dirty_bitmap_lock(bitmap); --=20 2.18.0 From nobody Thu Apr 25 00:17:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1568133196; cv=none; d=zoho.com; s=zohoarc; b=O2Qg9TrWoTdq8pzkdS2VQCouONUZATw+iqWv2Q5eVD/xDQp7eN1EiMN+XuW9O8k8hsHZlZZyGtRE4PVmcRoWONw1xhtwJ13+cQcxLcP+GGmnQbSqYg94kE2KNFycc1G4aEAxt46SkBoJL4cbCm5TPqmgnZmgoweB7qoX1AVkUd4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568133196; 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:ARC-Authentication-Results; bh=S5dVbWQo+vVywhvwMNPQVdArskGerCDMfYzwc7myAXw=; b=kG0dRuoOW3sALDBOrxxbV+PuWFS6Gfp3LqQPBJyJNhDof5jYGTb30uFZcLHQCXx2eGYO39U6FxtLVbzP7m/zIcEEdUuB1dS/Iz4oEDDt/tIIHRhQ02FGbCh7nQz8N409Wiw1g8pI6y/GHOacwYmdodv1hYFFYfSTkFtZQnSg/Bs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568133196335242.65567389657087; Tue, 10 Sep 2019 09:33:16 -0700 (PDT) Received: from localhost ([::1]:42292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7j4l-00014T-9g for importer@patchew.org; Tue, 10 Sep 2019 12:33:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45812) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7izM-0004rz-BV for qemu-devel@nongnu.org; Tue, 10 Sep 2019 12:27:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7izL-0003Ue-0K for qemu-devel@nongnu.org; Tue, 10 Sep 2019 12:27:32 -0400 Received: from relay.sw.ru ([185.231.240.75]:44314) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7izH-0003Q7-Bd; Tue, 10 Sep 2019 12:27:27 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1i7izE-0001NT-D4; Tue, 10 Sep 2019 19:27:24 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Tue, 10 Sep 2019 19:27:23 +0300 Message-Id: <20190910162724.79574-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190910162724.79574-1-vsementsov@virtuozzo.com> References: <20190910162724.79574-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 2/3] block/dirty-bitmap: return int from bdrv_remove_persistent_dirty_bitmap 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@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, armbru@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com 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" It's more comfortable to not deal with local_err. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.h | 5 ++--- include/block/block_int.h | 6 +++--- include/block/dirty-bitmap.h | 5 ++--- block/dirty-bitmap.c | 9 +++++---- block/qcow2-bitmap.c | 20 +++++++++++--------- blockdev.c | 7 +++---- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/block/qcow2.h b/block/qcow2.h index 998bcdaef1..99ee88f802 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -747,9 +747,8 @@ bool qcow2_can_store_new_dirty_bitmap(BlockDriverState = *bs, const char *name, uint32_t granularity, Error **errp); -void qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, - const char *name, - Error **errp); +int qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char = *name, + Error **errp); =20 ssize_t coroutine_fn qcow2_co_compress(BlockDriverState *bs, void *dest, size_t dest_size, diff --git a/include/block/block_int.h b/include/block/block_int.h index 0422acdf1c..503ac9e3cd 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -556,9 +556,9 @@ struct BlockDriver { const char *name, uint32_t granularity, Error **errp); - void (*bdrv_remove_persistent_dirty_bitmap)(BlockDriverState *bs, - const char *name, - Error **errp); + int (*bdrv_remove_persistent_dirty_bitmap)(BlockDriverState *bs, + const char *name, + Error **errp); =20 /** * Register/unregister a buffer for I/O. For example, when the driver = is diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index 4b4b731b46..07503b03b5 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -37,9 +37,8 @@ int bdrv_dirty_bitmap_check(const BdrvDirtyBitmap *bitmap= , uint32_t flags, Error **errp); void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitm= ap); void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs); -void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, - const char *name, - Error **errp); +int bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *= name, + Error **errp); void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap); void bdrv_enable_dirty_bitmap(BdrvDirtyBitmap *bitmap); void bdrv_enable_dirty_bitmap_locked(BdrvDirtyBitmap *bitmap); diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 8f42015db9..a52b83b619 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -455,13 +455,14 @@ void bdrv_release_named_dirty_bitmaps(BlockDriverStat= e *bs) * not fail. * This function doesn't release corresponding BdrvDirtyBitmap. */ -void bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, - const char *name, - Error **errp) +int bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *= name, + Error **errp) { if (bs->drv && bs->drv->bdrv_remove_persistent_dirty_bitmap) { - bs->drv->bdrv_remove_persistent_dirty_bitmap(bs, name, errp); + return bs->drv->bdrv_remove_persistent_dirty_bitmap(bs, name, errp= ); } + + return -ENOTSUP; } =20 bool bdrv_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *nam= e, diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index b2487101ed..1aaedb3b55 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -1404,11 +1404,10 @@ static Qcow2Bitmap *find_bitmap_by_name(Qcow2Bitmap= List *bm_list, return NULL; } =20 -void qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, - const char *name, - Error **errp) +int qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char = *name, + Error **errp) { - int ret; + int ret =3D 0; BDRVQcow2State *s =3D bs->opaque; Qcow2Bitmap *bm; Qcow2BitmapList *bm_list; @@ -1416,18 +1415,19 @@ void qcow2_remove_persistent_dirty_bitmap(BlockDriv= erState *bs, if (s->nb_bitmaps =3D=3D 0) { /* Absence of the bitmap is not an error: see explanation above * bdrv_remove_persistent_dirty_bitmap() definition. */ - return; + return 0; } =20 bm_list =3D bitmap_list_load(bs, s->bitmap_directory_offset, s->bitmap_directory_size, errp); if (bm_list =3D=3D NULL) { - return; + return -EIO; } =20 bm =3D find_bitmap_by_name(bm_list, name); if (bm =3D=3D NULL) { - goto fail; + ret =3D -EINVAL; + goto out; } =20 QSIMPLEQ_REMOVE(bm_list, bm, Qcow2Bitmap, entry); @@ -1435,14 +1435,16 @@ void qcow2_remove_persistent_dirty_bitmap(BlockDriv= erState *bs, ret =3D update_ext_header_and_dir(bs, bm_list); if (ret < 0) { error_setg_errno(errp, -ret, "Failed to update bitmap extension"); - goto fail; + goto out; } =20 free_bitmap_clusters(bs, &bm->table); =20 -fail: +out: bitmap_free(bm); bitmap_list_free(bm_list); + + return ret; } =20 void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **er= rp) diff --git a/blockdev.c b/blockdev.c index fbef6845c8..0813adfb2b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2940,15 +2940,14 @@ static BdrvDirtyBitmap *do_block_dirty_bitmap_remov= e( } =20 if (bdrv_dirty_bitmap_get_persistence(bitmap)) { + int ret; AioContext *aio_context =3D bdrv_get_aio_context(bs); - Error *local_err =3D NULL; =20 aio_context_acquire(aio_context); - bdrv_remove_persistent_dirty_bitmap(bs, name, &local_err); + ret =3D bdrv_remove_persistent_dirty_bitmap(bs, name, errp); aio_context_release(aio_context); =20 - if (local_err !=3D NULL) { - error_propagate(errp, local_err); + if (ret < 0) { return NULL; } } --=20 2.18.0 From nobody Thu Apr 25 00:17:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1568133210; cv=none; d=zoho.com; s=zohoarc; b=PYuBXvu2SB8QzxzZmWxftQoT0ZbS91lQ08Wcbm3w/l+BF8NLq8CwAy7HTeXoxtcu7A3YOxNwTwN2ioZVA7gMoYM1X9zCCGj3AwLN4Rj4DWnnWQuc3t1IE5Q5c2dzaseLWuQf4ZEgtZ5tUA+/W3oMv7pzx2ncstiZi+hsNRtAww4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568133210; 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:ARC-Authentication-Results; bh=yTAVmJ9wCXACZSDe1uGILMh/BOP+94eeNvX5yW3YNRs=; b=kqA69eJmi4Zppp2Zl9iejwDcleG9Ff5WUIv7L/byPzUoiaB+VXM6kSNJj4DVaR0fBYn1HtJkdgVORjbS5ivcxHjLd1dArjMEwqriSumugvYpDJJwocib7r8/5AX5le9Bey6mB5c2L3R4Puq5/kEuBoOOoTtton4qXjX3ebWR8Mo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1568133210768514.0021152165245; Tue, 10 Sep 2019 09:33:30 -0700 (PDT) Received: from localhost ([::1]:42310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7j57-00018m-Ao for importer@patchew.org; Tue, 10 Sep 2019 12:33:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45830) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7izN-0004tn-Ir for qemu-devel@nongnu.org; Tue, 10 Sep 2019 12:27:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7izL-0003VH-Qn for qemu-devel@nongnu.org; Tue, 10 Sep 2019 12:27:33 -0400 Received: from relay.sw.ru ([185.231.240.75]:44318) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7izH-0003Q4-C2; Tue, 10 Sep 2019 12:27:27 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1i7izE-0001NT-GJ; Tue, 10 Sep 2019 19:27:24 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Tue, 10 Sep 2019 19:27:24 +0300 Message-Id: <20190910162724.79574-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190910162724.79574-1-vsementsov@virtuozzo.com> References: <20190910162724.79574-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 3/3] block/qcow2: proper locking on bitmap add/remove paths 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@euphon.net, kwolf@redhat.com, vsementsov@virtuozzo.com, armbru@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com 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" qmp_block_dirty_bitmap_add and do_block_dirty_bitmap_remove do acquire aio context since 0a6c86d024c52b. But this is not enough: we also must lock qcow2 mutex when access in-image metadata. Especially it concerns freeing qcow2 clusters. To achieve this, move qcow2_can_store_new_dirty_bitmap and qcow2_remove_persistent_dirty_bitmap to coroutine context. Since we work in coroutines in correct aio context, we don't need context acquiring in blockdev.c anymore, drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.h | 11 ++-- include/block/block_int.h | 10 ++-- block/dirty-bitmap.c | 102 +++++++++++++++++++++++++++++++++++--- block/qcow2-bitmap.c | 22 +++++--- block/qcow2.c | 5 +- blockdev.c | 27 +++------- 6 files changed, 130 insertions(+), 47 deletions(-) diff --git a/block/qcow2.h b/block/qcow2.h index 99ee88f802..27e20c9b4a 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -743,12 +743,13 @@ int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Err= or **errp); int qcow2_truncate_bitmaps_check(BlockDriverState *bs, Error **errp); void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **er= rp); int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp); -bool qcow2_can_store_new_dirty_bitmap(BlockDriverState *bs, - const char *name, - uint32_t granularity, - Error **errp); -int qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char = *name, +bool qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, + const char *name, + uint32_t granularity, Error **errp); +int qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, + const char *name, + Error **errp); =20 ssize_t coroutine_fn qcow2_co_compress(BlockDriverState *bs, void *dest, size_t dest_size, diff --git a/include/block/block_int.h b/include/block/block_int.h index 503ac9e3cd..1e54486ad1 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -552,13 +552,13 @@ struct BlockDriver { * field of BlockDirtyBitmap's in case of success. */ int (*bdrv_reopen_bitmaps_rw)(BlockDriverState *bs, Error **errp); - bool (*bdrv_can_store_new_dirty_bitmap)(BlockDriverState *bs, - const char *name, - uint32_t granularity, - Error **errp); - int (*bdrv_remove_persistent_dirty_bitmap)(BlockDriverState *bs, + bool (*bdrv_co_can_store_new_dirty_bitmap)(BlockDriverState *bs, const char *name, + uint32_t granularity, Error **errp); + int (*bdrv_co_remove_persistent_dirty_bitmap)(BlockDriverState *bs, + const char *name, + Error **errp); =20 /** * Register/unregister a buffer for I/O. For example, when the driver = is diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index a52b83b619..f50c682308 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -26,6 +26,7 @@ #include "trace.h" #include "block/block_int.h" #include "block/blockjob.h" +#include "qemu/main-loop.h" =20 struct BdrvDirtyBitmap { QemuMutex *mutex; @@ -455,18 +456,59 @@ void bdrv_release_named_dirty_bitmaps(BlockDriverStat= e *bs) * not fail. * This function doesn't release corresponding BdrvDirtyBitmap. */ -int bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *= name, - Error **errp) +static int coroutine_fn +bdrv_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *n= ame, + Error **errp) { - if (bs->drv && bs->drv->bdrv_remove_persistent_dirty_bitmap) { - return bs->drv->bdrv_remove_persistent_dirty_bitmap(bs, name, errp= ); + if (bs->drv && bs->drv->bdrv_co_remove_persistent_dirty_bitmap) { + return bs->drv->bdrv_co_remove_persistent_dirty_bitmap(bs, name, e= rrp); } =20 return -ENOTSUP; } =20 -bool bdrv_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *nam= e, - uint32_t granularity, Error **errp) +typedef struct BdrvRemovePersistentDirtyBitmapCo { + BlockDriverState *bs; + const char *name; + Error **errp; + int ret; +} BdrvRemovePersistentDirtyBitmapCo; + +static void coroutine_fn +bdrv_co_remove_persistent_dirty_bitmap_entry(void *opaque) +{ + BdrvRemovePersistentDirtyBitmapCo *s =3D opaque; + + s->ret =3D bdrv_co_remove_persistent_dirty_bitmap(s->bs, s->name, s->e= rrp); + aio_wait_kick(); +} + +int bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *= name, + Error **errp) +{ + if (qemu_in_coroutine()) { + return bdrv_co_remove_persistent_dirty_bitmap(bs, name, errp); + } else { + Coroutine *co; + BdrvRemovePersistentDirtyBitmapCo s =3D { + .bs =3D bs, + .name =3D name, + .errp =3D errp, + .ret =3D -EINPROGRESS, + }; + + co =3D qemu_coroutine_create(bdrv_co_remove_persistent_dirty_bitma= p_entry, + &s); + bdrv_coroutine_enter(bs, co); + BDRV_POLL_WHILE(bs, s.ret =3D=3D -EINPROGRESS); + + return s.ret; + } +} + +static bool coroutine_fn +bdrv_co_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *name, + uint32_t granularity, Error **errp) { BlockDriver *drv =3D bs->drv; =20 @@ -477,14 +519,58 @@ bool bdrv_can_store_new_dirty_bitmap(BlockDriverState= *bs, const char *name, return false; } =20 - if (!drv->bdrv_can_store_new_dirty_bitmap) { + if (!drv->bdrv_co_can_store_new_dirty_bitmap) { error_setg_errno(errp, ENOTSUP, "Can't store persistent bitmaps to %s", bdrv_get_device_or_node_name(bs)); return false; } =20 - return drv->bdrv_can_store_new_dirty_bitmap(bs, name, granularity, err= p); + return drv->bdrv_co_can_store_new_dirty_bitmap(bs, name, granularity, = errp); +} + +typedef struct BdrvCanStoreNewDirtyBitmapCo { + BlockDriverState *bs; + const char *name; + uint32_t granularity; + Error **errp; + bool ret; + + bool in_progress; +} BdrvCanStoreNewDirtyBitmapCo; + +static void coroutine_fn bdrv_co_can_store_new_dirty_bitmap_entry(void *op= aque) +{ + BdrvCanStoreNewDirtyBitmapCo *s =3D opaque; + + s->ret =3D bdrv_co_can_store_new_dirty_bitmap(s->bs, s->name, s->granu= larity, + s->errp); + s->in_progress =3D false; + aio_wait_kick(); +} + +bool bdrv_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *nam= e, + uint32_t granularity, Error **errp) +{ + if (qemu_in_coroutine()) { + return bdrv_co_can_store_new_dirty_bitmap(bs, name, granularity, e= rrp); + } else { + Coroutine *co; + BdrvCanStoreNewDirtyBitmapCo s =3D { + .bs =3D bs, + .name =3D name, + .granularity =3D granularity, + .errp =3D errp, + .in_progress =3D true, + }; + + co =3D qemu_coroutine_create(bdrv_co_can_store_new_dirty_bitmap_en= try, + &s); + bdrv_coroutine_enter(bs, co); + BDRV_POLL_WHILE(bs, s.in_progress); + + return s.ret; + } } =20 void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 1aaedb3b55..4829053cec 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -1404,8 +1404,9 @@ static Qcow2Bitmap *find_bitmap_by_name(Qcow2BitmapLi= st *bm_list, return NULL; } =20 -int qcow2_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char = *name, - Error **errp) +int coroutine_fn qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState = *bs, + const char *name, + Error **errp) { int ret =3D 0; BDRVQcow2State *s =3D bs->opaque; @@ -1418,10 +1419,13 @@ int qcow2_remove_persistent_dirty_bitmap(BlockDrive= rState *bs, const char *name, return 0; } =20 + qemu_co_mutex_lock(&s->lock); + bm_list =3D bitmap_list_load(bs, s->bitmap_directory_offset, s->bitmap_directory_size, errp); if (bm_list =3D=3D NULL) { - return -EIO; + ret =3D -EIO; + goto out; } =20 bm =3D find_bitmap_by_name(bm_list, name); @@ -1441,6 +1445,8 @@ int qcow2_remove_persistent_dirty_bitmap(BlockDriverS= tate *bs, const char *name, free_bitmap_clusters(bs, &bm->table); =20 out: + qemu_co_mutex_unlock(&s->lock); + bitmap_free(bm); bitmap_list_free(bm_list); =20 @@ -1615,10 +1621,10 @@ int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, E= rror **errp) return 0; } =20 -bool qcow2_can_store_new_dirty_bitmap(BlockDriverState *bs, - const char *name, - uint32_t granularity, - Error **errp) +bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, + const char *name, + uint32_t granularity, + Error **errp) { BDRVQcow2State *s =3D bs->opaque; bool found; @@ -1655,8 +1661,10 @@ bool qcow2_can_store_new_dirty_bitmap(BlockDriverSta= te *bs, goto fail; } =20 + qemu_co_mutex_lock(&s->lock); bm_list =3D bitmap_list_load(bs, s->bitmap_directory_offset, s->bitmap_directory_size, errp); + qemu_co_mutex_unlock(&s->lock); if (bm_list =3D=3D NULL) { goto fail; } diff --git a/block/qcow2.c b/block/qcow2.c index 0882ff6e92..488738f499 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -5258,8 +5258,9 @@ BlockDriver bdrv_qcow2 =3D { .bdrv_attach_aio_context =3D qcow2_attach_aio_context, =20 .bdrv_reopen_bitmaps_rw =3D qcow2_reopen_bitmaps_rw, - .bdrv_can_store_new_dirty_bitmap =3D qcow2_can_store_new_dirty_bitmap, - .bdrv_remove_persistent_dirty_bitmap =3D qcow2_remove_persistent_dirty= _bitmap, + .bdrv_co_can_store_new_dirty_bitmap =3D qcow2_co_can_store_new_dirty_b= itmap, + .bdrv_co_remove_persistent_dirty_bitmap =3D + qcow2_co_remove_persistent_dirty_bitmap, }; =20 static void bdrv_qcow2_init(void) diff --git a/blockdev.c b/blockdev.c index 0813adfb2b..228ce94a88 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2898,16 +2898,10 @@ void qmp_block_dirty_bitmap_add(const char *node, c= onst char *name, disabled =3D false; } =20 - if (persistent) { - AioContext *aio_context =3D bdrv_get_aio_context(bs); - bool ok; - - aio_context_acquire(aio_context); - ok =3D bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp= ); - aio_context_release(aio_context); - if (!ok) { - return; - } + if (persistent && + !bdrv_can_store_new_dirty_bitmap(bs, name, granularity, errp)) + { + return; } =20 bitmap =3D bdrv_create_dirty_bitmap(bs, granularity, name, errp); @@ -2939,17 +2933,10 @@ static BdrvDirtyBitmap *do_block_dirty_bitmap_remov= e( return NULL; } =20 - if (bdrv_dirty_bitmap_get_persistence(bitmap)) { - int ret; - AioContext *aio_context =3D bdrv_get_aio_context(bs); - - aio_context_acquire(aio_context); - ret =3D bdrv_remove_persistent_dirty_bitmap(bs, name, errp); - aio_context_release(aio_context); - - if (ret < 0) { + if (bdrv_dirty_bitmap_get_persistence(bitmap) && + bdrv_remove_persistent_dirty_bitmap(bs, name, errp) < 0) + { return NULL; - } } =20 if (release) { --=20 2.18.0