Block layer patches
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJZOorTAAoJEH8JsnLIjy/W+MAP/iOH2GtgtUfH8CLxqWqZUJ5p rmlLLTrooBHUF09BUSCkwD5E0s1El9phvldt9t2l6RaxxSlMwZl1nB0ww9q+z2Aq NY5VBYUov28JnqFqRkOPiJHMo7oRkzgyGVn3RCbevwWudEK3DcSRT5UftDK5UPH3 HwxYY09uxpDcMkXajC1pRG/RJFrfsmbM3pXFYMsOgj8QT5nNdqebaqcYnuTKX9F4 5Hn5O0tRdZZWWvP1QXRAPszmihdh4GN4I1EEfAgjV8Y3TqBApZS4vdVOJXm07Vlx FB6FKEWvK8zMU/0kS8jH5v4A03lRtokESL9Io5K4mwuxiTfNjvb4ZlftGVgUzuFi X5Yn6pPYU8t+rvRNSHF/8UYxX6lcuGL2DlVn/a+47phmQrW46fd8srp1A1c+dtzS jjMvw1tJNLYGP29QWzhaROPVn3Uk4wPbZIU472HB6ZTSC76g+jvGzfLVspnZeUjY 96l3721vv8oa7ZtFvRNT9zTYxAoGXEcgFR7f+E9yVWdISZ0AKdONNIUV0w9AHKNc rDM4XdnG7ouiVaGeT3cdDNjjbb/v3+sR9yUzf9DUd41purmkrRPtGcetd8esf8Jr plIiBvf+mCRDACSYbIF3JKEHGYFasgs+X/OkhBVeeIBJUkl89mFpca5Qs4AF1d6v l7IW3y56umBa00qDgl/R =ey0C -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging Block layer patches # gpg: Signature made Fri 09 Jun 2017 12:47:31 BST # gpg: using RSA key 0x7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: block: fix external snapshot abort permission error block/qcow.c: Fix memory leak in qcow_create() qemu-iotests: Test automatic commit job cancel on hot unplug commit: Fix use after free in completion qemu-iotests: Block migration test migration/block: Clean up BBs in block_save_complete() migration: Inactivate images after .save_live_complete_precopy() block: Fix anonymous BBs in blk_root_inactivate() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
475df9d809
|
|
@ -168,7 +168,7 @@ static int blk_root_inactivate(BdrvChild *child)
|
|||
* this point because the VM is stopped) and unattached monitor-owned
|
||||
* BlockBackends. If there is still any other user like a block job, then
|
||||
* we simply can't inactivate the image. */
|
||||
if (!blk->dev && !blk->name[0]) {
|
||||
if (!blk->dev && !blk_name(blk)[0]) {
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -89,6 +89,10 @@ static void commit_complete(BlockJob *job, void *opaque)
|
|||
int ret = data->ret;
|
||||
bool remove_commit_top_bs = false;
|
||||
|
||||
/* Make sure overlay_bs and top stay around until bdrv_set_backing_hd() */
|
||||
bdrv_ref(top);
|
||||
bdrv_ref(overlay_bs);
|
||||
|
||||
/* Remove base node parent that still uses BLK_PERM_WRITE/RESIZE before
|
||||
* the normal backing chain can be restored. */
|
||||
blk_unref(s->base);
|
||||
|
|
@ -124,6 +128,9 @@ static void commit_complete(BlockJob *job, void *opaque)
|
|||
if (remove_commit_top_bs) {
|
||||
bdrv_set_backing_hd(overlay_bs, top, &error_abort);
|
||||
}
|
||||
|
||||
bdrv_unref(overlay_bs);
|
||||
bdrv_unref(top);
|
||||
}
|
||||
|
||||
static void coroutine_fn commit_run(void *opaque)
|
||||
|
|
|
|||
|
|
@ -852,6 +852,7 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp)
|
|||
header_size += backing_filename_len;
|
||||
} else {
|
||||
/* special backing file for vvfat */
|
||||
g_free(backing_file);
|
||||
backing_file = NULL;
|
||||
}
|
||||
header.cluster_bits = 9; /* 512 byte cluster to avoid copying
|
||||
|
|
|
|||
|
|
@ -1803,7 +1803,11 @@ static void external_snapshot_abort(BlkActionState *common)
|
|||
DO_UPCAST(ExternalSnapshotState, common, common);
|
||||
if (state->new_bs) {
|
||||
if (state->overlay_appended) {
|
||||
bdrv_ref(state->old_bs); /* we can't let bdrv_set_backind_hd()
|
||||
close state->old_bs; we need it */
|
||||
bdrv_set_backing_hd(state->new_bs, NULL, &error_abort);
|
||||
bdrv_replace_node(state->new_bs, state->old_bs, &error_abort);
|
||||
bdrv_unref(state->old_bs); /* bdrv_replace_node() ref'ed old_bs */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -674,16 +674,14 @@ static int64_t get_remaining_dirty(void)
|
|||
return dirty << BDRV_SECTOR_BITS;
|
||||
}
|
||||
|
||||
/* Called with iothread lock taken. */
|
||||
|
||||
static void block_migration_cleanup(void *opaque)
|
||||
|
||||
/* Called with iothread lock taken. */
|
||||
static void block_migration_cleanup_bmds(void)
|
||||
{
|
||||
BlkMigDevState *bmds;
|
||||
BlkMigBlock *blk;
|
||||
AioContext *ctx;
|
||||
|
||||
bdrv_drain_all();
|
||||
|
||||
unset_dirty_tracking();
|
||||
|
||||
while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) {
|
||||
|
|
@ -701,6 +699,16 @@ static void block_migration_cleanup(void *opaque)
|
|||
g_free(bmds->aio_bitmap);
|
||||
g_free(bmds);
|
||||
}
|
||||
}
|
||||
|
||||
/* Called with iothread lock taken. */
|
||||
static void block_migration_cleanup(void *opaque)
|
||||
{
|
||||
BlkMigBlock *blk;
|
||||
|
||||
bdrv_drain_all();
|
||||
|
||||
block_migration_cleanup_bmds();
|
||||
|
||||
blk_mig_lock();
|
||||
while ((blk = QSIMPLEQ_FIRST(&block_mig_state.blk_list)) != NULL) {
|
||||
|
|
@ -844,6 +852,10 @@ static int block_save_complete(QEMUFile *f, void *opaque)
|
|||
|
||||
qemu_put_be64(f, BLK_MIG_FLAG_EOS);
|
||||
|
||||
/* Make sure that our BlockBackends are gone, so that the block driver
|
||||
* nodes can be inactivated. */
|
||||
block_migration_cleanup_bmds();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1825,17 +1825,19 @@ static void migration_completion(MigrationState *s, int current_active_state,
|
|||
|
||||
if (!ret) {
|
||||
ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
|
||||
if (ret >= 0) {
|
||||
qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX);
|
||||
qemu_savevm_state_complete_precopy(s->to_dst_file, false);
|
||||
}
|
||||
/*
|
||||
* Don't mark the image with BDRV_O_INACTIVE flag if
|
||||
* we will go into COLO stage later.
|
||||
*/
|
||||
if (ret >= 0 && !migrate_colo_enabled()) {
|
||||
ret = bdrv_inactivate_all();
|
||||
}
|
||||
if (ret >= 0) {
|
||||
qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX);
|
||||
qemu_savevm_state_complete_precopy(s->to_dst_file, false);
|
||||
s->block_inactive = true;
|
||||
if (ret >= 0) {
|
||||
s->block_inactive = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
qemu_mutex_unlock_iothread();
|
||||
|
|
|
|||
|
|
@ -70,7 +70,9 @@ class ImageCommitTestCase(iotests.QMPTestCase):
|
|||
self.wait_for_complete()
|
||||
|
||||
class TestSingleDrive(ImageCommitTestCase):
|
||||
image_len = 1 * 1024 * 1024
|
||||
# Need some space after the copied data so that throttling is effective in
|
||||
# tests that use it rather than just completing the job immediately
|
||||
image_len = 2 * 1024 * 1024
|
||||
test_len = 1 * 1024 * 256
|
||||
|
||||
def setUp(self):
|
||||
|
|
@ -79,7 +81,9 @@ class TestSingleDrive(ImageCommitTestCase):
|
|||
qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % mid_img, test_img)
|
||||
qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img)
|
||||
qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288', mid_img)
|
||||
self.vm = iotests.VM().add_drive(test_img)
|
||||
self.vm = iotests.VM().add_drive(test_img, interface="none")
|
||||
self.vm.add_device("virtio-scsi-pci")
|
||||
self.vm.add_device("scsi-hd,id=scsi0,drive=drive0")
|
||||
self.vm.launch()
|
||||
|
||||
def tearDown(self):
|
||||
|
|
@ -131,6 +135,33 @@ class TestSingleDrive(ImageCommitTestCase):
|
|||
self.assert_qmp(result, 'error/class', 'GenericError')
|
||||
self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % mid_img)
|
||||
|
||||
# When the job is running on a BB that is automatically deleted on hot
|
||||
# unplug, the job is cancelled when the device disappears
|
||||
def test_hot_unplug(self):
|
||||
if self.image_len == 0:
|
||||
return
|
||||
|
||||
self.assert_no_active_block_jobs()
|
||||
result = self.vm.qmp('block-commit', device='drive0', top=mid_img,
|
||||
base=backing_img, speed=(self.image_len / 4))
|
||||
self.assert_qmp(result, 'return', {})
|
||||
result = self.vm.qmp('device_del', id='scsi0')
|
||||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
cancelled = False
|
||||
deleted = False
|
||||
while not cancelled or not deleted:
|
||||
for event in self.vm.get_qmp_events(wait=True):
|
||||
if event['event'] == 'DEVICE_DELETED':
|
||||
self.assert_qmp(event, 'data/device', 'scsi0')
|
||||
deleted = True
|
||||
elif event['event'] == 'BLOCK_JOB_CANCELLED':
|
||||
self.assert_qmp(event, 'data/device', 'drive0')
|
||||
cancelled = True
|
||||
else:
|
||||
self.fail("Unexpected event %s" % (event['event']))
|
||||
|
||||
self.assert_no_active_block_jobs()
|
||||
|
||||
class TestRelativePaths(ImageCommitTestCase):
|
||||
image_len = 1 * 1024 * 1024
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
.........................
|
||||
...........................
|
||||
----------------------------------------------------------------------
|
||||
Ran 25 tests
|
||||
Ran 27 tests
|
||||
|
||||
OK
|
||||
|
|
|
|||
|
|
@ -0,0 +1,140 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Test old-style block migration (migrate -b)
|
||||
#
|
||||
# Copyright (C) 2017 Red Hat, Inc.
|
||||
#
|
||||
# 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/>.
|
||||
#
|
||||
|
||||
# creator
|
||||
owner=kwolf@redhat.com
|
||||
|
||||
seq=`basename $0`
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here=`pwd`
|
||||
status=1 # failure is the default!
|
||||
|
||||
MIG_SOCKET="${TEST_DIR}/migrate"
|
||||
|
||||
_cleanup()
|
||||
{
|
||||
rm -f "${MIG_SOCKET}"
|
||||
rm -f "${TEST_IMG}.dest"
|
||||
_cleanup_test_img
|
||||
_cleanup_qemu
|
||||
}
|
||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
# get standard environment, filters and checks
|
||||
. ./common.rc
|
||||
. ./common.filter
|
||||
. ./common.qemu
|
||||
|
||||
_supported_fmt qcow2 raw qed dmg quorum
|
||||
_supported_proto file
|
||||
_supported_os Linux
|
||||
|
||||
size=64M
|
||||
_make_test_img $size
|
||||
TEST_IMG="${TEST_IMG}.dest" _make_test_img $size
|
||||
|
||||
echo
|
||||
echo === Starting VMs ===
|
||||
echo
|
||||
|
||||
qemu_comm_method="qmp"
|
||||
|
||||
_launch_qemu \
|
||||
-drive file="${TEST_IMG}",cache=$CACHEMODE,driver=$IMGFMT,id=disk
|
||||
src=$QEMU_HANDLE
|
||||
_send_qemu_cmd $src "{ 'execute': 'qmp_capabilities' }" 'return'
|
||||
|
||||
_launch_qemu \
|
||||
-drive file="${TEST_IMG}.dest",cache=$CACHEMODE,driver=$IMGFMT,id=disk \
|
||||
-incoming "unix:${MIG_SOCKET}"
|
||||
dest=$QEMU_HANDLE
|
||||
_send_qemu_cmd $dest "{ 'execute': 'qmp_capabilities' }" 'return'
|
||||
|
||||
echo
|
||||
echo === Write something on the source ===
|
||||
echo
|
||||
|
||||
_send_qemu_cmd $src \
|
||||
"{ 'execute': 'human-monitor-command',
|
||||
'arguments': { 'command-line':
|
||||
'qemu-io disk \"write -P 0x55 0 64k\"' } }" \
|
||||
'return'
|
||||
_send_qemu_cmd $src \
|
||||
"{ 'execute': 'human-monitor-command',
|
||||
'arguments': { 'command-line':
|
||||
'qemu-io disk \"read -P 0x55 0 64k\"' } }" \
|
||||
'return'
|
||||
|
||||
echo
|
||||
echo === Do block migration to destination ===
|
||||
echo
|
||||
|
||||
reply="$(_send_qemu_cmd $src \
|
||||
"{ 'execute': 'migrate',
|
||||
'arguments': { 'uri': 'unix:${MIG_SOCKET}', 'blk': true } }" \
|
||||
'return\|error')"
|
||||
echo "$reply"
|
||||
if echo "$reply" | grep "compiled without old-style" > /dev/null; then
|
||||
_notrun "migrate -b support not compiled in"
|
||||
fi
|
||||
|
||||
QEMU_COMM_TIMEOUT=0.1 qemu_cmd_repeat=50 silent=yes \
|
||||
_send_qemu_cmd $src "{ 'execute': 'query-migrate' }" '"status": "completed"'
|
||||
_send_qemu_cmd $src "{ 'execute': 'query-status' }" "return"
|
||||
|
||||
echo
|
||||
echo === Do some I/O on the destination ===
|
||||
echo
|
||||
|
||||
# It is important that we use the BlockBackend of the guest device here instead
|
||||
# of the node name, which would create a new BlockBackend and not test whether
|
||||
# the guest has the necessary permissions to access the image now
|
||||
silent=yes _send_qemu_cmd $dest "" "100 %"
|
||||
_send_qemu_cmd $dest "{ 'execute': 'query-status' }" "return"
|
||||
_send_qemu_cmd $dest \
|
||||
"{ 'execute': 'human-monitor-command',
|
||||
'arguments': { 'command-line':
|
||||
'qemu-io disk \"read -P 0x55 0 64k\"' } }" \
|
||||
'return'
|
||||
_send_qemu_cmd $dest \
|
||||
"{ 'execute': 'human-monitor-command',
|
||||
'arguments': { 'command-line':
|
||||
'qemu-io disk \"write -P 0x66 1M 64k\"' } }" \
|
||||
'return'
|
||||
|
||||
echo
|
||||
echo === Shut down and check image ===
|
||||
echo
|
||||
|
||||
_send_qemu_cmd $src '{"execute":"quit"}' 'return'
|
||||
_send_qemu_cmd $dest '{"execute":"quit"}' 'return'
|
||||
wait=1 _cleanup_qemu
|
||||
|
||||
_check_test_img
|
||||
TEST_IMG="${TEST_IMG}.dest" _check_test_img
|
||||
|
||||
$QEMU_IO -c 'write -P 0x66 1M 64k' "$TEST_IMG" | _filter_qemu_io
|
||||
$QEMU_IMG compare "$TEST_IMG.dest" "$TEST_IMG"
|
||||
|
||||
# success, all done
|
||||
echo "*** done"
|
||||
rm -f $seq.full
|
||||
status=0
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
QA output created by 183
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
||||
Formatting 'TEST_DIR/t.IMGFMT.dest', fmt=IMGFMT size=67108864
|
||||
|
||||
=== Starting VMs ===
|
||||
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
|
||||
=== Write something on the source ===
|
||||
|
||||
wrote 65536/65536 bytes at offset 0
|
||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
{"return": ""}
|
||||
read 65536/65536 bytes at offset 0
|
||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
{"return": ""}
|
||||
|
||||
=== Do block migration to destination ===
|
||||
|
||||
{"return": {}}
|
||||
{"return": {"status": "postmigrate", "singlestep": false, "running": false}}
|
||||
|
||||
=== Do some I/O on the destination ===
|
||||
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "RESUME"}
|
||||
{"return": {"status": "running", "singlestep": false, "running": true}}
|
||||
read 65536/65536 bytes at offset 0
|
||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
{"return": ""}
|
||||
wrote 65536/65536 bytes at offset 1048576
|
||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
{"return": ""}
|
||||
|
||||
=== Shut down and check image ===
|
||||
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
No errors were found on the image.
|
||||
No errors were found on the image.
|
||||
wrote 65536/65536 bytes at offset 1048576
|
||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
Images are identical.
|
||||
*** done
|
||||
|
|
@ -174,3 +174,4 @@
|
|||
179 rw auto quick
|
||||
181 rw auto migration
|
||||
182 rw auto quick
|
||||
183 rw auto migration
|
||||
|
|
|
|||
Loading…
Reference in New Issue