a4acc2776c
- Include upstream patches targeted for the next stable release (bug fixes only) audio-oss-fix-buffer-pos-calculation.patch blkdebug-Allow-taking-unsharing-permissi.patch block-Add-bdrv_qapi_perm_to_blk_perm.patch block-backup-top-fix-failure-path.patch block-block-copy-fix-progress-calculatio.patch block-fix-crash-on-zero-length-unaligned.patch block-fix-memleaks-in-bdrv_refresh_filen.patch block-Fix-VM-size-field-width-in-snapsho.patch block-nbd-extract-the-common-cleanup-cod.patch block-nbd-fix-memory-leak-in-nbd_open.patch block-qcow2-threads-fix-qcow2_decompress.patch hw-arm-cubieboard-use-ARM-Cortex-A8-as-t.patch hw-intc-arm_gicv3_kvm-Stop-wrongly-progr.patch iotests-add-test-for-backup-top-failure-.patch iotests-Fix-nonportable-use-of-od-endian.patch job-refactor-progress-to-separate-object.patch target-arm-Correct-definition-of-PMCRDP.patch target-arm-fix-TCG-leak-for-fcvt-half-do.patch tpm-ppi-page-align-PPI-RAM.patch vhost-user-blk-delete-virtioqueues-in-un.patch virtio-add-ability-to-delete-vq-through-.patch virtio-crypto-do-delete-ctrl_vq-in-virti.patch virtio-pmem-do-delete-rq_vq-in-virtio_pm.patch - Add Obsoletes directive for qemu-audio-sdl and qemu-ui-sdl since for a qemu package upgrade from SLE12-SP5, support for SDL is dropped OBS-URL: https://build.opensuse.org/request/show/784401 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=534
141 lines
6.0 KiB
Diff
141 lines
6.0 KiB
Diff
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Date: Tue, 21 Jan 2020 17:28:02 +0300
|
|
Subject: iotests: add test for backup-top failure on permission activation
|
|
|
|
Git-commit: a541fcc27c98b96da187c7d4573f3270f3ddd283
|
|
|
|
This test checks that bug is really fixed by previous commit.
|
|
|
|
Cc: qemu-stable@nongnu.org # v4.2.0
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Message-id: 20200121142802.21467-3-vsementsov@virtuozzo.com
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
tests/qemu-iotests/283 | 92 ++++++++++++++++++++++++++++++++++++++
|
|
tests/qemu-iotests/283.out | 8 ++++
|
|
tests/qemu-iotests/group | 1 +
|
|
3 files changed, 101 insertions(+)
|
|
|
|
diff --git a/tests/qemu-iotests/283 b/tests/qemu-iotests/283
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..293e557bd95f0553624fba89cd555614ff4a8c1b
|
|
--- /dev/null
|
|
+++ b/tests/qemu-iotests/283
|
|
@@ -0,0 +1,92 @@
|
|
+#!/usr/bin/env python
|
|
+#
|
|
+# Test for backup-top filter permission activation failure
|
|
+#
|
|
+# Copyright (c) 2019 Virtuozzo International GmbH.
|
|
+#
|
|
+# This program is free software; you can redistribute it and/or modify
|
|
+# it under the terms of the GNU General Public License as published by
|
|
+# the Free Software Foundation; either version 2 of the License, or
|
|
+# (at your option) any later version.
|
|
+#
|
|
+# This program is distributed in the hope that it will be useful,
|
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+# GNU General Public License for more details.
|
|
+#
|
|
+# You should have received a copy of the GNU General Public License
|
|
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
+#
|
|
+
|
|
+import iotests
|
|
+
|
|
+# The test is unrelated to formats, restrict it to qcow2 to avoid extra runs
|
|
+iotests.verify_image_format(supported_fmts=['qcow2'])
|
|
+
|
|
+size = 1024 * 1024
|
|
+
|
|
+""" Test description
|
|
+
|
|
+When performing a backup, all writes on the source subtree must go through the
|
|
+backup-top filter so it can copy all data to the target before it is changed.
|
|
+backup-top filter is appended above source node, to achieve this thing, so all
|
|
+parents of source node are handled. A configuration with side parents of source
|
|
+sub-tree with write permission is unsupported (we'd have append several
|
|
+backup-top filter like nodes to handle such parents). The test create an
|
|
+example of such configuration and checks that a backup is then not allowed
|
|
+(blockdev-backup command should fail).
|
|
+
|
|
+The configuration:
|
|
+
|
|
+ ┌────────┐ target ┌─────────────┐
|
|
+ │ target │ ◀─────── │ backup_top │
|
|
+ └────────┘ └─────────────┘
|
|
+ │
|
|
+ │ backing
|
|
+ ▼
|
|
+ ┌─────────────┐
|
|
+ │ source │
|
|
+ └─────────────┘
|
|
+ │
|
|
+ │ file
|
|
+ ▼
|
|
+ ┌─────────────┐ write perm ┌───────┐
|
|
+ │ base │ ◀──────────── │ other │
|
|
+ └─────────────┘ └───────┘
|
|
+
|
|
+On activation (see .active field of backup-top state in block/backup-top.c),
|
|
+backup-top is going to unshare write permission on its source child. Write
|
|
+unsharing will be propagated to the "source->base" link and will conflict with
|
|
+other node write permission. So permission update will fail and backup job will
|
|
+not be started.
|
|
+
|
|
+Note, that the only thing which prevents backup of running on such
|
|
+configuration is default permission propagation scheme. It may be altered by
|
|
+different block drivers, so backup will run in invalid configuration. But
|
|
+something is better than nothing. Also, before the previous commit (commit
|
|
+preceding this test creation), starting backup on such configuration led to
|
|
+crash, so current "something" is a lot better, and this test actual goal is
|
|
+to check that crash is fixed :)
|
|
+"""
|
|
+
|
|
+vm = iotests.VM()
|
|
+vm.launch()
|
|
+
|
|
+vm.qmp_log('blockdev-add', **{'node-name': 'target', 'driver': 'null-co'})
|
|
+
|
|
+vm.qmp_log('blockdev-add', **{
|
|
+ 'node-name': 'source',
|
|
+ 'driver': 'blkdebug',
|
|
+ 'image': {'node-name': 'base', 'driver': 'null-co', 'size': size}
|
|
+})
|
|
+
|
|
+vm.qmp_log('blockdev-add', **{
|
|
+ 'node-name': 'other',
|
|
+ 'driver': 'blkdebug',
|
|
+ 'image': 'base',
|
|
+ 'take-child-perms': ['write']
|
|
+})
|
|
+
|
|
+vm.qmp_log('blockdev-backup', sync='full', device='source', target='target')
|
|
+
|
|
+vm.shutdown()
|
|
diff --git a/tests/qemu-iotests/283.out b/tests/qemu-iotests/283.out
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..daaf5828c18ee463671ec916989846f94c9f4b31
|
|
--- /dev/null
|
|
+++ b/tests/qemu-iotests/283.out
|
|
@@ -0,0 +1,8 @@
|
|
+{"execute": "blockdev-add", "arguments": {"driver": "null-co", "node-name": "target"}}
|
|
+{"return": {}}
|
|
+{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", "image": {"driver": "null-co", "node-name": "base", "size": 1048576}, "node-name": "source"}}
|
|
+{"return": {}}
|
|
+{"execute": "blockdev-add", "arguments": {"driver": "blkdebug", "image": "base", "node-name": "other", "take-child-perms": ["write"]}}
|
|
+{"return": {}}
|
|
+{"execute": "blockdev-backup", "arguments": {"device": "source", "sync": "full", "target": "target"}}
|
|
+{"error": {"class": "GenericError", "desc": "Cannot set permissions for backup-top filter: Conflicts with use by other as 'image', which uses 'write' on base"}}
|
|
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
|
|
index 6b10a6a762143ec0d079b7fd6df2..1c1b69f0581c9a0043376b440600 100644
|
|
--- a/tests/qemu-iotests/group
|
|
+++ b/tests/qemu-iotests/group
|
|
@@ -286,3 +286,4 @@
|
|
272 rw
|
|
273 backing quick
|
|
277 rw quick
|
|
+283 auto quick
|