From nobody Mon May 13 06:36:32 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562018485; cv=none; d=zoho.com; s=zohoarc; b=Q1oh0THG0V5+Gluf0rFGOptZuNivJ6g1obrzbMXewD5UJQ5U2BrEaBkd1QI5fVZLvBVfa09qdvkRC+o4PkiPnu6PSoSQ401NqBSp2hSenPGgnxdUHa43pDfs63JkSjyI76K8E/wS6/AsgellSNcIRbg3Eglop02FrbYmuD9sXYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562018485; h=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:ARC-Authentication-Results; bh=8ql83Ji0VXdLtGZyhwPiruKNxY/+1qRQpla5fycMzUM=; b=nqlqZWu2ONq1rNIxeVt9NJ6OenYgi1ubkyxagQRqud8cu5TlUQ+tI8PYLcB6nUCqol5KIvWWRmvvqrJyr97LKeq7ndLhJOkVSzk7bNbXoH4cYIBVDX1sy60GqxNoTCJxXq50hVwpKfHiqKNwDCFU8N1zhPaGRGuOirvSPNlwTVE= 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 1562018485897733.3915291754726; Mon, 1 Jul 2019 15:01:25 -0700 (PDT) Received: from localhost ([::1]:45878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi4MW-00046W-QK for importer@patchew.org; Mon, 01 Jul 2019 18:01:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55944) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi3X4-0007Su-Na for qemu-devel@nongnu.org; Mon, 01 Jul 2019 17:08:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hi3X2-0006Cz-PM for qemu-devel@nongnu.org; Mon, 01 Jul 2019 17:08:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58482) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hi3Wz-00067T-0C; Mon, 01 Jul 2019 17:08:09 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A1F7C81E15; Mon, 1 Jul 2019 20:13:39 +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 6D5727ADA1; Mon, 1 Jul 2019 20:13:37 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 1 Jul 2019 16:13:28 -0400 Message-Id: <20190701201330.29718-2-jsnow@redhat.com> In-Reply-To: <20190701201330.29718-1-jsnow@redhat.com> References: <20190701201330.29718-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 01 Jul 2019 20:13:47 +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 v2 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: Kevin Wolf , Fam Zheng , vsementsov@virtuozzo.com, Juan Quintela , Markus Armbruster , Max Reitz , Stefan Hajnoczi , John Snow , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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, con= st 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, c= onst 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, errp= ); + 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, co= nst 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 *node= , 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 From nobody Mon May 13 06:36:32 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562021411; cv=none; d=zoho.com; s=zohoarc; b=FYkF6EswLISZlwVM4g8WuzhwDxFfIRBYl0EQPpkcKMUTPmJmztXkCJ8/3rMl7AeVo1XADFKl4svDZwUaiQCUr/R20r5Qy4qwWfmXgReyMSHUcLsgEBu+3SJlRKj/8r+uAt8wati0b6I2RYpdvWfkoxz3uvU5ZKUgt5Lu+wZlShw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562021411; h=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:ARC-Authentication-Results; bh=3RhTLZ3t8bgfsd0elngC+WSEUzTlh+HFYifUk+FwRzw=; b=VjnWWxNO82Mw9Z6CAcVDagac4KPKcVUWl6A43uwYbtImW7U4KwP66V1jIQgdte62cMCAr04hxmNumsnhcA9fn3fRu1q4EbXpG8FYod56y9J+9hLhATqEZ15ua3rlz2PDndzyvUeJYGdPt8JJjiE6o3xOVwnwBZ1IYixd+OvCGY4= 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 1562021411957964.2469447305499; Mon, 1 Jul 2019 15:50:11 -0700 (PDT) Received: from localhost ([::1]:46100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi57T-00008Q-MQ for importer@patchew.org; Mon, 01 Jul 2019 18:49:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56648) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi3Xq-0008MF-9U for qemu-devel@nongnu.org; Mon, 01 Jul 2019 17:09:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hi3Xo-0006c5-JH for qemu-devel@nongnu.org; Mon, 01 Jul 2019 17:09:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34346) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hi3Xe-0006WZ-Av; Mon, 01 Jul 2019 17:08:52 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 086832D1CE; Mon, 1 Jul 2019 20:13:42 +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 C43EA7A4B8; Mon, 1 Jul 2019 20:13:39 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 1 Jul 2019 16:13:29 -0400 Message-Id: <20190701201330.29718-3-jsnow@redhat.com> In-Reply-To: <20190701201330.29718-1-jsnow@redhat.com> References: <20190701201330.29718-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 01 Jul 2019 20:13:47 +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 v2 2/3] qapi: implement block-dirty-bitmap-remove transaction 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: Kevin Wolf , Fam Zheng , vsementsov@virtuozzo.com, Juan Quintela , Markus Armbruster , Max Reitz , Stefan Hajnoczi , John Snow , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" It is used to do transactional movement of the bitmap (which is possible in conjunction with merge command). Transactional bitmap movement is needed in scenarios with external snapshot, when we don't want to leave copy of the bitmap in the base image. Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: John Snow --- qapi/transaction.json | 2 + include/block/dirty-bitmap.h | 3 +- block.c | 2 +- block/dirty-bitmap.c | 16 +++---- blockdev.c | 79 +++++++++++++++++++++++++++++++--- migration/block-dirty-bitmap.c | 2 +- 6 files changed, 87 insertions(+), 17 deletions(-) diff --git a/qapi/transaction.json b/qapi/transaction.json index 95edb78227..da95b804aa 100644 --- a/qapi/transaction.json +++ b/qapi/transaction.json @@ -45,6 +45,7 @@ # # - @abort: since 1.6 # - @block-dirty-bitmap-add: since 2.5 +# - @block-dirty-bitmap-remove: since 4.1 # - @block-dirty-bitmap-clear: since 2.5 # - @block-dirty-bitmap-enable: since 4.0 # - @block-dirty-bitmap-disable: since 4.0 @@ -61,6 +62,7 @@ 'data': { 'abort': 'Abort', 'block-dirty-bitmap-add': 'BlockDirtyBitmapAdd', + 'block-dirty-bitmap-remove': 'BlockDirtyBitmap', 'block-dirty-bitmap-clear': 'BlockDirtyBitmap', 'block-dirty-bitmap-enable': 'BlockDirtyBitmap', 'block-dirty-bitmap-disable': 'BlockDirtyBitmap', diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index 62682eb865..aa2737f41e 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -83,7 +83,8 @@ void bdrv_dirty_bitmap_set_inconsistent(BdrvDirtyBitmap *= bitmap); void bdrv_dirty_bitmap_set_busy(BdrvDirtyBitmap *bitmap, bool busy); void bdrv_merge_dirty_bitmap(BdrvDirtyBitmap *dest, const BdrvDirtyBitmap = *src, HBitmap **backup, Error **errp); -void bdrv_dirty_bitmap_set_migration(BdrvDirtyBitmap *bitmap, bool migrati= on); +void bdrv_dirty_bitmap_squelch_persistence(BdrvDirtyBitmap *bitmap, + bool squelch); =20 /* Functions that require manual locking. */ void bdrv_dirty_bitmap_lock(BdrvDirtyBitmap *bitmap); diff --git a/block.c b/block.c index c139540f2b..b934c522eb 100644 --- a/block.c +++ b/block.c @@ -5316,7 +5316,7 @@ static void coroutine_fn bdrv_co_invalidate_cache(Blo= ckDriverState *bs, for (bm =3D bdrv_dirty_bitmap_next(bs, NULL); bm; bm =3D bdrv_dirty_bitmap_next(bs, bm)) { - bdrv_dirty_bitmap_set_migration(bm, false); + bdrv_dirty_bitmap_squelch_persistence(bm, false); } =20 ret =3D refresh_total_sectors(bs, bs->total_sectors); diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 95a9c2a5d8..8551f8219e 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -48,10 +48,9 @@ struct BdrvDirtyBitmap { bool inconsistent; /* bitmap is persistent, but inconsistent. It cannot be used at all in any way, ex= cept a QMP user can remove it. */ - bool migration; /* Bitmap is selected for migration, it sh= ould - not be stored on the next inactivation - (persistent flag doesn't matter until n= ext - invalidation).*/ + bool squelch_persistence; /* We are either migrating or deleting this + * bitmap; it should not be stored on the = next + * inactivation. */ QLIST_ENTRY(BdrvDirtyBitmap) list; }; =20 @@ -757,16 +756,17 @@ void bdrv_dirty_bitmap_set_inconsistent(BdrvDirtyBitm= ap *bitmap) } =20 /* Called with BQL taken. */ -void bdrv_dirty_bitmap_set_migration(BdrvDirtyBitmap *bitmap, bool migrati= on) +void bdrv_dirty_bitmap_squelch_persistence(BdrvDirtyBitmap *bitmap, + bool squelch) { qemu_mutex_lock(bitmap->mutex); - bitmap->migration =3D migration; + bitmap->squelch_persistence =3D squelch; qemu_mutex_unlock(bitmap->mutex); } =20 bool bdrv_dirty_bitmap_get_persistence(BdrvDirtyBitmap *bitmap) { - return bitmap->persistent && !bitmap->migration; + return bitmap->persistent && !bitmap->squelch_persistence; } =20 bool bdrv_dirty_bitmap_inconsistent(const BdrvDirtyBitmap *bitmap) @@ -778,7 +778,7 @@ bool bdrv_has_changed_persistent_bitmaps(BlockDriverSta= te *bs) { BdrvDirtyBitmap *bm; QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) { - if (bm->persistent && !bm->readonly && !bm->migration) { + if (bm->persistent && !bm->readonly && !bm->squelch_persistence) { return true; } } diff --git a/blockdev.c b/blockdev.c index 01248252ca..4143ab7bbb 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2134,6 +2134,51 @@ static void block_dirty_bitmap_merge_prepare(BlkActi= onState *common, errp); } =20 +static BdrvDirtyBitmap *do_block_dirty_bitmap_remove( + const char *node, const char *name, bool release, + BlockDriverState **bitmap_bs, Error **errp); + +static void block_dirty_bitmap_remove_prepare(BlkActionState *common, + Error **errp) +{ + BlockDirtyBitmap *action; + BlockDirtyBitmapState *state =3D DO_UPCAST(BlockDirtyBitmapState, + common, common); + + if (action_check_completion_mode(common, errp) < 0) { + return; + } + + action =3D common->action->u.block_dirty_bitmap_remove.data; + + state->bitmap =3D do_block_dirty_bitmap_remove(action->node, action->n= ame, + false, &state->bs, errp); + if (state->bitmap) { + bdrv_dirty_bitmap_squelch_persistence(state->bitmap, true); + bdrv_dirty_bitmap_set_busy(state->bitmap, true); + } +} + +static void block_dirty_bitmap_remove_abort(BlkActionState *common) +{ + BlockDirtyBitmapState *state =3D DO_UPCAST(BlockDirtyBitmapState, + common, common); + + if (state->bitmap) { + bdrv_dirty_bitmap_squelch_persistence(state->bitmap, false); + bdrv_dirty_bitmap_set_busy(state->bitmap, false); + } +} + +static void block_dirty_bitmap_remove_commit(BlkActionState *common) +{ + BlockDirtyBitmapState *state =3D DO_UPCAST(BlockDirtyBitmapState, + common, common); + + bdrv_dirty_bitmap_set_busy(state->bitmap, false); + bdrv_release_dirty_bitmap(state->bs, state->bitmap); +} + static void abort_prepare(BlkActionState *common, Error **errp) { error_setg(errp, "Transaction aborted using Abort action"); @@ -2211,6 +2256,12 @@ static const BlkActionOps actions[] =3D { .commit =3D block_dirty_bitmap_free_backup, .abort =3D block_dirty_bitmap_restore, }, + [TRANSACTION_ACTION_KIND_BLOCK_DIRTY_BITMAP_REMOVE] =3D { + .instance_size =3D sizeof(BlockDirtyBitmapState), + .prepare =3D block_dirty_bitmap_remove_prepare, + .commit =3D block_dirty_bitmap_remove_commit, + .abort =3D block_dirty_bitmap_remove_abort, + }, /* Where are transactions for MIRROR, COMMIT and STREAM? * Although these blockjobs use transaction callbacks like the backup = job, * these jobs do not necessarily adhere to transaction semantics. @@ -2869,20 +2920,21 @@ void qmp_block_dirty_bitmap_add(const char *node, c= onst char *name, bdrv_dirty_bitmap_set_persistence(bitmap, persistent); } =20 -void qmp_block_dirty_bitmap_remove(const char *node, const char *name, - Error **errp) +static BdrvDirtyBitmap *do_block_dirty_bitmap_remove( + const char *node, const char *name, bool release, + BlockDriverState **bitmap_bs, Error **errp) { BlockDriverState *bs; BdrvDirtyBitmap *bitmap; =20 bitmap =3D block_dirty_bitmap_lookup(node, name, &bs, errp); if (!bitmap || !bs) { - return; + return NULL; } =20 if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_BUSY | BDRV_BITMAP_RO, errp)) { - return; + return NULL; } =20 if (bdrv_dirty_bitmap_get_persistence(bitmap)) { @@ -2892,13 +2944,28 @@ void qmp_block_dirty_bitmap_remove(const char *node= , const char *name, 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); - return; + return NULL; } } =20 - bdrv_release_dirty_bitmap(bs, bitmap); + if (release) { + bdrv_release_dirty_bitmap(bs, bitmap); + } + + if (bitmap_bs) { + *bitmap_bs =3D bs; + } + + return bitmap; +} + +void qmp_block_dirty_bitmap_remove(const char *node, const char *name, + Error **errp) +{ + do_block_dirty_bitmap_remove(node, name, true, NULL, errp); } =20 /** diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 4a896a09eb..c742b706a9 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -326,7 +326,7 @@ static int init_dirty_bitmap_migration(void) =20 /* unset migration flags here, to not roll back it */ QSIMPLEQ_FOREACH(dbms, &dirty_bitmap_mig_state.dbms_list, entry) { - bdrv_dirty_bitmap_set_migration(dbms->bitmap, true); + bdrv_dirty_bitmap_squelch_persistence(dbms->bitmap, true); } =20 if (QSIMPLEQ_EMPTY(&dirty_bitmap_mig_state.dbms_list)) { --=20 2.21.0 From nobody Mon May 13 06:36:32 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562015652; cv=none; d=zoho.com; s=zohoarc; b=WSDro7bHNJUipjmZiQTXGqfIvi8ixqBhL/WzYQ7SHx6GpChcfUhGqkZEat+qbN4sZmMRSsxq5H+T7Jp2gZ0C4GseSouwcz0jWzRwnrY3WoCrqHmHY+10Be1Jbu2n1OF23wYQHMUh6h6kmw7sOiMf9UlzHRfHwDJwUk+Nw54zHJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562015652; h=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:ARC-Authentication-Results; bh=GJbcuCWyGzKvWYyfvuYhYU3ZSDreMu3vlPcqYr5DOck=; b=UUTPYRoGRB0L418RIWthYPZVKcQdg4IKdSHYD057JEB5JxX3RgJMJ8Zj6VMAgJ8MLDR9OgQOVJa9C0kia/TAACv7Lobc7/sF7GduUcaa8R8CkeZ6BV6lJHg1ttSm+PANzp+zfUB5QggMhKSfEHSGc5h4MbyHyiArR9kX4QtIaP4= 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 1562015652202875.2066056692669; Mon, 1 Jul 2019 14:14:12 -0700 (PDT) Received: from localhost ([::1]:45208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi34N-0006sL-Mj for importer@patchew.org; Mon, 01 Jul 2019 16:38:35 -0400 Received: from [2001:470:142:3::10] (port=54346 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi2zB-0003wj-De for qemu-devel@nongnu.org; Mon, 01 Jul 2019 16:33:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hi2z1-0002Q5-MD for qemu-devel@nongnu.org; Mon, 01 Jul 2019 16:33:11 -0400 Received: from [209.132.183.28] (port=57596 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hi2yd-0002It-Jh; Mon, 01 Jul 2019 16:32:41 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F5C53087955; Mon, 1 Jul 2019 20:13:44 +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 29B037A4C3; Mon, 1 Jul 2019 20:13:42 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 1 Jul 2019 16:13:30 -0400 Message-Id: <20190701201330.29718-4-jsnow@redhat.com> In-Reply-To: <20190701201330.29718-1-jsnow@redhat.com> References: <20190701201330.29718-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 01 Jul 2019 20:13:52 +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 v2 3/3] iotests: test bitmap moving inside 254 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: Kevin Wolf , Fam Zheng , vsementsov@virtuozzo.com, Juan Quintela , Markus Armbruster , Max Reitz , Stefan Hajnoczi , John Snow , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Test persistent bitmap copying with and without removal of original bitmap. Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: John Snow --- tests/qemu-iotests/254 | 30 +++++++++++++- tests/qemu-iotests/254.out | 82 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254 index 8edba91c5d..9a57bccc26 100755 --- a/tests/qemu-iotests/254 +++ b/tests/qemu-iotests/254 @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Test external snapshot with bitmap copying. +# Test external snapshot with bitmap copying and moving. # # Copyright (c) 2019 Virtuozzo International GmbH. All rights reserved. # @@ -32,6 +32,10 @@ vm =3D iotests.VM().add_drive(disk, opts=3D'node-name=3D= base') vm.launch() =20 vm.qmp_log('block-dirty-bitmap-add', node=3D'drive0', name=3D'bitmap0') +vm.qmp_log('block-dirty-bitmap-add', node=3D'drive0', name=3D'bitmap1', + persistent=3DTrue) +vm.qmp_log('block-dirty-bitmap-add', node=3D'drive0', name=3D'bitmap2', + persistent=3DTrue) =20 vm.hmp_qemu_io('drive0', 'write 0 512K') =20 @@ -39,16 +43,38 @@ vm.qmp_log('transaction', indent=3D2, actions=3D[ {'type': 'blockdev-snapshot-sync', 'data': {'device': 'drive0', 'snapshot-file': top, 'snapshot-node-name': 'snap'}}, + + # copy non-persistent bitmap0 {'type': 'block-dirty-bitmap-add', 'data': {'node': 'snap', 'name': 'bitmap0'}}, {'type': 'block-dirty-bitmap-merge', 'data': {'node': 'snap', 'target': 'bitmap0', - 'bitmaps': [{'node': 'base', 'name': 'bitmap0'}]}} + 'bitmaps': [{'node': 'base', 'name': 'bitmap0'}]}}, + + # copy persistent bitmap1, original will be saved to base image + {'type': 'block-dirty-bitmap-add', + 'data': {'node': 'snap', 'name': 'bitmap1', 'persistent': True}}, + {'type': 'block-dirty-bitmap-merge', + 'data': {'node': 'snap', 'target': 'bitmap1', + 'bitmaps': [{'node': 'base', 'name': 'bitmap1'}]}}, + + # move persistent bitmap1, original will be removed and not saved + # to base image + {'type': 'block-dirty-bitmap-add', + 'data': {'node': 'snap', 'name': 'bitmap2', 'persistent': True}}, + {'type': 'block-dirty-bitmap-merge', + 'data': {'node': 'snap', 'target': 'bitmap2', + 'bitmaps': [{'node': 'base', 'name': 'bitmap2'}]}}, + {'type': 'block-dirty-bitmap-remove', + 'data': {'node': 'base', 'name': 'bitmap2'}} ], filters=3D[iotests.filter_qmp_testfiles]) =20 result =3D vm.qmp('query-block')['return'][0] log("query-block: device =3D {}, node-name =3D {}, dirty-bitmaps:".format( result['device'], result['inserted']['node-name'])) log(result['dirty-bitmaps'], indent=3D2) +log("\nbitmaps in backing image:") +log(result['inserted']['image']['backing-image']['format-specific'] \ + ['data']['bitmaps'], indent=3D2) =20 vm.shutdown() diff --git a/tests/qemu-iotests/254.out b/tests/qemu-iotests/254.out index d7394cf002..d185c0532f 100644 --- a/tests/qemu-iotests/254.out +++ b/tests/qemu-iotests/254.out @@ -1,5 +1,9 @@ {"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap0", "no= de": "drive0"}} {"return": {}} +{"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap1", "no= de": "drive0", "persistent": true}} +{"return": {}} +{"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap2", "no= de": "drive0", "persistent": true}} +{"return": {}} { "execute": "transaction", "arguments": { @@ -31,6 +35,55 @@ "target": "bitmap0" }, "type": "block-dirty-bitmap-merge" + }, + { + "data": { + "name": "bitmap1", + "node": "snap", + "persistent": true + }, + "type": "block-dirty-bitmap-add" + }, + { + "data": { + "bitmaps": [ + { + "name": "bitmap1", + "node": "base" + } + ], + "node": "snap", + "target": "bitmap1" + }, + "type": "block-dirty-bitmap-merge" + }, + { + "data": { + "name": "bitmap2", + "node": "snap", + "persistent": true + }, + "type": "block-dirty-bitmap-add" + }, + { + "data": { + "bitmaps": [ + { + "name": "bitmap2", + "node": "base" + } + ], + "node": "snap", + "target": "bitmap2" + }, + "type": "block-dirty-bitmap-merge" + }, + { + "data": { + "name": "bitmap2", + "node": "base" + }, + "type": "block-dirty-bitmap-remove" } ] } @@ -40,6 +93,24 @@ } query-block: device =3D drive0, node-name =3D snap, dirty-bitmaps: [ + { + "busy": false, + "count": 524288, + "granularity": 65536, + "name": "bitmap2", + "persistent": true, + "recording": true, + "status": "active" + }, + { + "busy": false, + "count": 524288, + "granularity": 65536, + "name": "bitmap1", + "persistent": true, + "recording": true, + "status": "active" + }, { "busy": false, "count": 524288, @@ -50,3 +121,14 @@ query-block: device =3D drive0, node-name =3D snap, dir= ty-bitmaps: "status": "active" } ] + +bitmaps in backing image: +[ + { + "flags": [ + "auto" + ], + "granularity": 65536, + "name": "bitmap1" + } +] --=20 2.21.0