From nobody Wed Nov 12 21:53:33 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1574686443; cv=none; d=zohomail.com; s=zohoarc; b=hEsCoNVBi4SKC+j5/8TdoHQzEzNyG1aDotxbXdbFrl5wS5U9rfI2pOvZZY5Hv3WAjTYwZ6sarELn/U86IWPXs9iWs42LEMMu0b9DXA57ij6LWeINLs281NCkszLpzDIfoXo88IGPkgAhSsTDT9F9lCC1+k+5aV+9hCkLC7yBqso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574686443; 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; bh=B9UDqdfkce3YTR5Vit4NS7V+SXQShgkM8qdKPGY/enw=; b=JgNAm+luGjoivL1SnqC3q5VR8OIUqeIGEfzd1sIkVEk/FJZHRmahAAsJkw9ja1F5evyfH645bmGLKmTgkRc4J8sxx0YYCsbYaQjeymmOGkvkZqhpP/6EgfxDqjfwlE0CZeoA5PLvH/EPQV+WZu2bBk2dSwzsYdwS5EzsBQKmH3w= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1574686443541256.63609417748194; Mon, 25 Nov 2019 04:54:03 -0800 (PST) Received: from localhost ([::1]:43278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZDsP-0007KX-Dz for importer@patchew.org; Mon, 25 Nov 2019 07:54:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36883) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZDr6-00068f-Rz for qemu-devel@nongnu.org; Mon, 25 Nov 2019 07:52:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZDr5-0008TU-PZ for qemu-devel@nongnu.org; Mon, 25 Nov 2019 07:52:40 -0500 Received: from relay.sw.ru ([185.231.240.75]:42312) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZDr3-0008Ox-3w; Mon, 25 Nov 2019 07:52:37 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1iZDqx-0007wx-AU; Mon, 25 Nov 2019 15:52:31 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 1/2] block/qcow2-bitmap: fix bitmap migration Date: Mon, 25 Nov 2019 15:52:28 +0300 Message-Id: <20191125125229.13531-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191125125229.13531-1-vsementsov@virtuozzo.com> References: <20191125125229.13531-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-stable@nongnu.org, qemu-devel@nongnu.org, mreitz@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Fix bitmap migration with dirty-bitmaps capability enabled and shared storage. We should ignore IN_USE bitmaps in the image on target, when migrating bitmaps through migration channel, see new comment below. Fixes: 74da6b943565c451 Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/qcow2-bitmap.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 809bbc5d20..8abaf632fc 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -988,7 +988,26 @@ bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Er= ror **errp) } =20 QSIMPLEQ_FOREACH(bm, bm_list, entry) { - BdrvDirtyBitmap *bitmap =3D load_bitmap(bs, bm, errp); + BdrvDirtyBitmap *bitmap; + + if ((bm->flags & BME_FLAG_IN_USE) && + bdrv_find_dirty_bitmap(bs, bm->name)) + { + /* + * We already have corresponding BdrvDirtyBitmap, and bitmap i= n the + * image is marked IN_USE. Firstly, this state is valid, no re= ason + * to consider existing BdrvDirtyBitmap to be bad. Secondly it= 's + * absolutely possible, when we do migration with shared stora= ge + * with dirty-bitmaps capability enabled: if the bitmap was lo= aded + * from this storage before migration start, the storage will + * of-course contain IN_USE outdated version of the bitmap, an= d we + * should not load it on migration target, as we already have = this + * bitmap, being migrated. + */ + continue; + } + + bitmap =3D load_bitmap(bs, bm, errp); if (bitmap =3D=3D NULL) { goto fail; } --=20 2.21.0 From nobody Wed Nov 12 21:53:33 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1574686516; cv=none; d=zohomail.com; s=zohoarc; b=dX9KFb+WA60jRJUOc2aEYiiZ6C8IZE0JiINEwvfIJtFGO9n8a9Izo9+BVCtqr35QJbL/IExJFnrs2ebZ5hd+hgmeIxfr2UvJiq+IUgj17W60WYX6WZI25p2Fce3++TEFMu8fANtxXIyWuxLOUs8iDHLMXTfLegpkidbP4t7qjkQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574686516; 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; bh=WbeyyqVANjjQppHHZFMa/gM2UaiPkBccC55EfX3hr8M=; b=l7lDOu91UvkohAaNxQD2oZ8+bxNreD9+zqUP2wAtPZSDNi1ftlHHZ1uVhz8he0T1eUyJtA6DOyL8kPGp8XAMW6HEkXXLcijUokKEe0BKZsBJGTivaX0xBtFIpVPc+mbGO2OHxwMmU2jcRLjDz5gOcq+HS93ymL7MQiBOkGKARh8= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1574686516156382.52327798281726; Mon, 25 Nov 2019 04:55:16 -0800 (PST) Received: from localhost ([::1]:43292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZDta-0000R6-VZ for importer@patchew.org; Mon, 25 Nov 2019 07:55:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36886) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZDr7-00068s-3w for qemu-devel@nongnu.org; Mon, 25 Nov 2019 07:52:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZDr5-0008Td-Vy for qemu-devel@nongnu.org; Mon, 25 Nov 2019 07:52:41 -0500 Received: from relay.sw.ru ([185.231.240.75]:42310) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZDr3-0008P0-46; Mon, 25 Nov 2019 07:52:37 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1iZDqx-0007wx-IQ; Mon, 25 Nov 2019 15:52:31 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 2/2] iotests: add new test cases to bitmap migration Date: Mon, 25 Nov 2019 15:52:29 +0300 Message-Id: <20191125125229.13531-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191125125229.13531-1-vsementsov@virtuozzo.com> References: <20191125125229.13531-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-stable@nongnu.org, qemu-devel@nongnu.org, mreitz@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add optional pre-shutdown: shutdown/launch vm before migration. This leads to storing persistent bitmap to the storage, which breaks migration with dirty-bitmaps capability enabled and shared storage until fixed by previous commit. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/169 | 22 +++++++++++++++------- tests/qemu-iotests/169.out | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169 index 8c204caf20..9656a7f620 100755 --- a/tests/qemu-iotests/169 +++ b/tests/qemu-iotests/169 @@ -134,7 +134,7 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): self.check_bitmap(self.vm_a, sha256 if persistent else False) =20 def do_test_migration(self, persistent, migrate_bitmaps, online, - shared_storage): + shared_storage, pre_shutdown): granularity =3D 512 =20 # regions =3D ((start, count), ...) @@ -142,15 +142,13 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): (0xf0000, 0x10000), (0xa0201, 0x1000)) =20 - should_migrate =3D migrate_bitmaps or persistent and shared_storage + should_migrate =3D \ + (migrate_bitmaps and (persistent or not pre_shutdown)) or \ + (persistent and shared_storage) mig_caps =3D [{'capability': 'events', 'state': True}] if migrate_bitmaps: mig_caps.append({'capability': 'dirty-bitmaps', 'state': True}) =20 - result =3D self.vm_a.qmp('migrate-set-capabilities', - capabilities=3Dmig_caps) - self.assert_qmp(result, 'return', {}) - self.vm_b.add_incoming(incoming_cmd if online else "defer") self.vm_b.add_drive(disk_a if shared_storage else disk_b) =20 @@ -166,6 +164,14 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): self.vm_a.hmp_qemu_io('drive0', 'write %d %d' % r) sha256 =3D self.get_bitmap_hash(self.vm_a) =20 + if pre_shutdown: + self.vm_a.shutdown() + self.vm_a.launch() + + result =3D self.vm_a.qmp('migrate-set-capabilities', + capabilities=3Dmig_caps) + self.assert_qmp(result, 'return', {}) + result =3D self.vm_a.qmp('migrate', uri=3Dmig_cmd) while True: event =3D self.vm_a.event_wait('MIGRATION') @@ -210,11 +216,13 @@ def inject_test_case(klass, name, method, *args, **kw= args): mc =3D operator.methodcaller(method, *args, **kwargs) setattr(klass, 'test_' + method + name, lambda self: mc(self)) =20 -for cmb in list(itertools.product((True, False), repeat=3D4)): +for cmb in list(itertools.product((True, False), repeat=3D5)): name =3D ('_' if cmb[0] else '_not_') + 'persistent_' name +=3D ('_' if cmb[1] else '_not_') + 'migbitmap_' name +=3D '_online' if cmb[2] else '_offline' name +=3D '_shared' if cmb[3] else '_nonshared' + if (cmb[4]): + name +=3D '__pre_shutdown' =20 inject_test_case(TestDirtyBitmapMigration, name, 'do_test_migration', *list(cmb)) diff --git a/tests/qemu-iotests/169.out b/tests/qemu-iotests/169.out index 3a89159833..5c26d15c0d 100644 --- a/tests/qemu-iotests/169.out +++ b/tests/qemu-iotests/169.out @@ -1,5 +1,5 @@ -.................... +.................................... ---------------------------------------------------------------------- -Ran 20 tests +Ran 36 tests =20 OK --=20 2.21.0