From patchwork Mon Dec 1 20:30:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 416563 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 87FD514019D for ; Tue, 2 Dec 2014 07:34:43 +1100 (AEDT) Received: from localhost ([::1]:33775 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvXg9-00084g-NM for incoming@patchwork.ozlabs.org; Mon, 01 Dec 2014 15:34:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvXce-0001l9-8h for qemu-devel@nongnu.org; Mon, 01 Dec 2014 15:31:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XvXcW-0007yW-Ct for qemu-devel@nongnu.org; Mon, 01 Dec 2014 15:31:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvXcW-0007yE-3W for qemu-devel@nongnu.org; Mon, 01 Dec 2014 15:30:56 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sB1KUtuA015565 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 1 Dec 2014 15:30:55 -0500 Received: from dhcp-17-12.bos.redhat.com ([10.18.17.94]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sB1KUjBe027821; Mon, 1 Dec 2014 15:30:54 -0500 From: John Snow To: qemu-devel@nongnu.org Date: Mon, 1 Dec 2014 15:30:14 -0500 Message-Id: <1417465816-19345-9-git-send-email-jsnow@redhat.com> In-Reply-To: <1417465816-19345-1-git-send-email-jsnow@redhat.com> References: <1417465816-19345-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, Fam Zheng , John Snow , armbru@redhat.com, mreitz@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v9 08/10] qapi: Add transaction support to block-dirty-bitmap-{add, enable, disable} X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Fam Zheng This adds three qmp commands to transactions. Users can stop a dirty bitmap, start backup of it, and start another dirty bitmap atomically, so that the dirty bitmap is tracked incrementally and we don't miss any write. Signed-off-by: Fam Zheng Signed-off-by: John Snow Reviewed-by: Max Reitz --- blockdev.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 5 +++- 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index 3ab3404..da03025 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1596,6 +1596,76 @@ static void drive_backup_clean(BlkTransactionState *common) } } +static void block_dirty_bitmap_add_prepare(BlkTransactionState *common, + Error **errp) +{ + BlockDirtyBitmapAdd *action; + + action = common->action->block_dirty_bitmap_add; + qmp_block_dirty_bitmap_add(action->device, action->name, + action->has_granularity, action->granularity, + errp); +} + +static void block_dirty_bitmap_add_abort(BlkTransactionState *common) +{ + BlockDirtyBitmapAdd *action; + BdrvDirtyBitmap *bm; + BlockDriverState *bs; + + action = common->action->block_dirty_bitmap_add; + bs = bdrv_lookup_bs(action->device, NULL, NULL); + if (bs) { + bm = bdrv_find_dirty_bitmap(bs, action->name); + if (bm) { + bdrv_release_dirty_bitmap(bs, bm); + } + } +} + +typedef struct BlockDirtyBitmapState { + BlkTransactionState common; + BdrvDirtyBitmap *bitmap; +} BlockDirtyBitmapState; + +/** + * Enable and Disable re-uses the same preparation. + */ +static void block_dirty_bitmap_en_toggle_prepare(BlkTransactionState *common, + Error **errp) +{ + BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState, + common, common); + BlockDirtyBitmap *action; + + /* We may be used by either enable or disable; + * We use the "enable" member of the union here, + * but "disable" should be functionally equivalent: */ + action = common->action->block_dirty_bitmap_enable; + assert(action == common->action->block_dirty_bitmap_disable); + + state->bitmap = block_dirty_bitmap_lookup(action->device, + action->name, + errp); + if (!state->bitmap) { + return; + } +} + +static void block_dirty_bitmap_enable_commit(BlkTransactionState *common) +{ + BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState, + common, common); + bdrv_enable_dirty_bitmap(state->bitmap); +} + +static void block_dirty_bitmap_disable_commit(BlkTransactionState *common) +{ + BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState, + common, common); + bdrv_disable_dirty_bitmap(state->bitmap); +} + static void abort_prepare(BlkTransactionState *common, Error **errp) { error_setg(errp, "Transaction aborted using Abort action"); @@ -1630,6 +1700,21 @@ static const BdrvActionOps actions[] = { .abort = internal_snapshot_abort, .clean = internal_snapshot_clean, }, + [TRANSACTION_ACTION_KIND_BLOCK_DIRTY_BITMAP_ADD] = { + .instance_size = sizeof(BlkTransactionState), + .prepare = block_dirty_bitmap_add_prepare, + .abort = block_dirty_bitmap_add_abort, + }, + [TRANSACTION_ACTION_KIND_BLOCK_DIRTY_BITMAP_ENABLE] = { + .instance_size = sizeof(BlockDirtyBitmapState), + .prepare = block_dirty_bitmap_en_toggle_prepare, + .commit = block_dirty_bitmap_enable_commit, + }, + [TRANSACTION_ACTION_KIND_BLOCK_DIRTY_BITMAP_DISABLE] = { + .instance_size = sizeof(BlockDirtyBitmapState), + .prepare = block_dirty_bitmap_en_toggle_prepare, + .commit = block_dirty_bitmap_disable_commit, + }, }; /* diff --git a/qapi-schema.json b/qapi-schema.json index 9ffdcf8..793031b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1260,7 +1260,10 @@ 'blockdev-snapshot-sync': 'BlockdevSnapshot', 'drive-backup': 'DriveBackup', 'abort': 'Abort', - 'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal' + 'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal', + 'block-dirty-bitmap-add': 'BlockDirtyBitmapAdd', + 'block-dirty-bitmap-enable': 'BlockDirtyBitmap', + 'block-dirty-bitmap-disable': 'BlockDirtyBitmap' } } ##