From nobody Mon Feb 9 21:23:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613151435; cv=none; d=zohomail.com; s=zohoarc; b=EZoSJocKod+Szy337pbQM2vKZ4ki8oD/K3oX3S0lTyFxzh8VfSWPvY/dTtR+mb/4XtZtLaZcrdcp5sU5vkPqY1UN5R77GZ8/sxgfOi7A3Q0kmFk7wurqvmfyjeYf5H4clTktOVVNS0wIySFKEPcRM7vDUfPHJykFSkpvlQO/fBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613151435; 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=yPBtbkYzBVGUiNvomTzlUjJ6P/WKBXin0NxArowiHXY=; b=gmGqpwoFjx+fj0bTlR2qQBuFi0r8ZVAuYzG9qv8TalOjln3xJA7BHrRsssEhHyfMmf8a+K90fLcZ8UqX2005vg3ebFH95uTqWHtUNCPWb65KZ6yD/D6aFWgionD0vk/rXafz0TFYv20m9iEkWFW8Y0yb6vPcLswWi7GLDcF+EQw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; 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 1613151435212426.75314924355246; Fri, 12 Feb 2021 09:37:15 -0800 (PST) Received: from localhost ([::1]:59828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAcNW-0001Da-Fs for importer@patchew.org; Fri, 12 Feb 2021 12:37:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAcL3-0007Uf-J3 for qemu-devel@nongnu.org; Fri, 12 Feb 2021 12:34:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33792) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lAcKy-0005lI-GM for qemu-devel@nongnu.org; Fri, 12 Feb 2021 12:34:41 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-500-W6-JZt4GP_qiYS9WLQVCnQ-1; Fri, 12 Feb 2021 12:34:33 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3461DC282; Fri, 12 Feb 2021 17:34:32 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id E960D5C23D; Fri, 12 Feb 2021 17:34:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613151275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yPBtbkYzBVGUiNvomTzlUjJ6P/WKBXin0NxArowiHXY=; b=Vi0DBoW8atCoothSGm0RTb6ZxcCi/lfej8w4utjwEhrun8GyBmz0s/wq8cQjFoc8hiVToZ FH0cwTR5LKTtAjLCISCXgksLl3lLkqS3RAmWllMfyMkidji/eyVwm9EHLqPAt0Ihh0Uh6b c9sR/zUc2o2yjfAmw/lGC/VvqcEYt5c= X-MC-Unique: W6-JZt4GP_qiYS9WLQVCnQ-1 From: Peter Krempa To: qemu-devel@nongnu.org Subject: [PATCH v3 2/3] migration: dirty-bitmap: Allow control of bitmap persistence Date: Fri, 12 Feb 2021 18:34:24 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pkrempa@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=pkrempa@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.569, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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: Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Bitmap's source persistence is transported over the migration stream and the destination mirrors it. In some cases the destination might want to persist bitmaps which are not persistent on the source (e.g. the result of merge of bitmaps from a number of layers on the source when migrating into a squashed image) but currently it would need to create another set of persistent bitmaps and merge them. This patch adds a 'transform' property to the alias map which allows to override the persistence of migrated bitmaps both on the source and destination sides. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- migration/block-dirty-bitmap.c | 30 +++++++++++++++++++++++++++--- qapi/migration.json | 19 ++++++++++++++++++- 2 files changed, 45 insertions(+), 4 deletions(-) v3: - adapted to full passtrhough of BitmapMigrationBitmapAlias into the map hash table (Vladimir) - schema and commit message language fixes (Eric) v2: - grammar fixes (Eric) - added 'transform' object to group other possible transformations (Vladim= ir) - transformation can also be used on source (Vladimir) - put bmap_inner directly into DBMLoadState for deduplication (Vladimir) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 0244f9bb1d..80781de5d8 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -150,6 +150,7 @@ typedef struct DBMLoadState { BdrvDirtyBitmap *bitmap; bool before_vm_start_handled; /* set in dirty_bitmap_mig_before_vm_sta= rt */ + BitmapMigrationBitmapAlias *bmap_inner; /* * cancelled @@ -528,6 +529,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDr= iverState *bs, } FOR_EACH_DIRTY_BITMAP(bs, bitmap) { + BitmapMigrationBitmapAliasTransform *bitmap_transform =3D NULL; bitmap_name =3D bdrv_dirty_bitmap_name(bitmap); if (!bitmap_name) { continue; @@ -548,6 +550,9 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDr= iverState *bs, } bitmap_alias =3D bmap_inner->alias; + if (bmap_inner->has_transform) { + bitmap_transform =3D bmap_inner->transform; + } } else { if (strlen(bitmap_name) > UINT8_MAX) { error_report("Cannot migrate bitmap '%s' on node '%s': " @@ -573,8 +578,15 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockD= riverState *bs, if (bdrv_dirty_bitmap_enabled(bitmap)) { dbms->flags |=3D DIRTY_BITMAP_MIG_START_FLAG_ENABLED; } - if (bdrv_dirty_bitmap_get_persistence(bitmap)) { - dbms->flags |=3D DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT; + if (bitmap_transform && + bitmap_transform->has_persistent) { + if (bitmap_transform->persistent) { + dbms->flags |=3D DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT; + } + } else { + if (bdrv_dirty_bitmap_get_persistence(bitmap)) { + dbms->flags |=3D DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT; + } } QSIMPLEQ_INSERT_TAIL(&s->dbms_list, dbms, entry); @@ -782,6 +794,7 @@ static int dirty_bitmap_load_start(QEMUFile *f, DBMLoad= State *s) uint32_t granularity =3D qemu_get_be32(f); uint8_t flags =3D qemu_get_byte(f); LoadBitmapState *b; + bool persistent; if (s->cancelled) { return 0; @@ -806,7 +819,16 @@ static int dirty_bitmap_load_start(QEMUFile *f, DBMLoa= dState *s) return -EINVAL; } - if (flags & DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT) { + if (s->bmap_inner && + s->bmap_inner->has_transform && + s->bmap_inner->transform && + s->bmap_inner->transform->has_persistent) { + persistent =3D s->bmap_inner->transform->persistent; + } else { + persistent =3D flags & DIRTY_BITMAP_MIG_START_FLAG_PERSISTENT; + } + + if (persistent) { bdrv_dirty_bitmap_set_persistence(s->bitmap, true); } @@ -1090,6 +1112,8 @@ static int dirty_bitmap_load_header(QEMUFile *f, DBML= oadState *s, } else { bitmap_name =3D bmap_inner->name; } + + s->bmap_inner =3D bmap_inner; } if (!s->cancelled) { diff --git a/qapi/migration.json b/qapi/migration.json index ce14d78071..8a85a6d041 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -536,6 +536,19 @@ 'data': [ 'none', 'zlib', { 'name': 'zstd', 'if': 'defined(CONFIG_ZSTD)' } ] } +## +# @BitmapMigrationBitmapAliasTransform: +# +# @persistent: If present, the bitmap will be made persistent +# or transient depending on this parameter. +# +# Since: 6.0 +## +{ 'struct': 'BitmapMigrationBitmapAliasTransform', + 'data': { + '*persistent': 'bool' + } } + ## # @BitmapMigrationBitmapAlias: # @@ -544,12 +557,16 @@ # @alias: An alias name for migration (for example the bitmap name on # the opposite site). # +# @transform: Allows to modify properties of the migrated bitmap. +# (since 6.0) +# # Since: 5.2 ## { 'struct': 'BitmapMigrationBitmapAlias', 'data': { 'name': 'str', - 'alias': 'str' + 'alias': 'str', + '*transform': 'BitmapMigrationBitmapAliasTransform' } } ## --=20 2.29.2