mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-01 23:03:54 -06:00
Block layer patches
- Re-enable the graph lock - More fixes to coroutine_fn marking -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEE3D3rFZqa+V09dFb+fwmycsiPL9YFAmScQCQRHGt3b2xmQHJl ZGhhdC5jb20ACgkQfwmycsiPL9bNSA//WIzPT45rFhl2U9QgyOJu26ho6ahsgwgI Z3QM5kCDB1dAN9USRPxhGboLGo8CyY7eeSwSrR7RtwBGYrWrAoJfGp5gK/7d9s5Q o0AGgRPnJGhFkBhRRMytsDsewM6Kk4IRmk4HMK3cOH3rsSM8RHs6KmDSBKesllu0 QVGf3qW4u8LHyZyGM5OlPVUbtuDuK6/52FGhpXBp+x4oyNegOhjwO4mGOvTG+xIk Q5zwWZaPfjxaEDkvW8iahB6/D7Tpt64BmMf1Ydhxcd5eKEp932CiBI36aAlNKoRD Al5wztRx1GEh12ekN39jIi7Ypp3JX26keJcieKU0q656pT551UFRYjU0Rk08/Cca qv2oiQDu6bHgQ9zCQ1nMfa9+K2MyBwx0b5qfYkvs2RzgCTl8ImgBQANHfw8tz6Bq HUo1zsFBXCaK0boUB5iFwdf3rlx3t9UTEuDej/RaHqZjZD5xeG/smCcOlSfHaKUa wXfYxvm8ZfefJn1D6io1A+7M956uvIQNtmh13cU44clgFX9Y/bBNMg/5lMRsJKo8 xxjvqCAyxo/pPfUsVWx4pc8AXbfVa85gyoSiaLEYZnqP54sJ2lFccqykCsTy58Lo VDcoPnoSc+LNqBOvtzxXgQbEWFCXU6fe0+TZgVYUvExWFIAOImeDWg2GD1JVrwsX e9QrPhL3DXg= =ZQcP -----END PGP SIGNATURE----- Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging Block layer patches - Re-enable the graph lock - More fixes to coroutine_fn marking # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCAAvFiEE3D3rFZqa+V09dFb+fwmycsiPL9YFAmScQCQRHGt3b2xmQHJl # ZGhhdC5jb20ACgkQfwmycsiPL9bNSA//WIzPT45rFhl2U9QgyOJu26ho6ahsgwgI # Z3QM5kCDB1dAN9USRPxhGboLGo8CyY7eeSwSrR7RtwBGYrWrAoJfGp5gK/7d9s5Q # o0AGgRPnJGhFkBhRRMytsDsewM6Kk4IRmk4HMK3cOH3rsSM8RHs6KmDSBKesllu0 # QVGf3qW4u8LHyZyGM5OlPVUbtuDuK6/52FGhpXBp+x4oyNegOhjwO4mGOvTG+xIk # Q5zwWZaPfjxaEDkvW8iahB6/D7Tpt64BmMf1Ydhxcd5eKEp932CiBI36aAlNKoRD # Al5wztRx1GEh12ekN39jIi7Ypp3JX26keJcieKU0q656pT551UFRYjU0Rk08/Cca # qv2oiQDu6bHgQ9zCQ1nMfa9+K2MyBwx0b5qfYkvs2RzgCTl8ImgBQANHfw8tz6Bq # HUo1zsFBXCaK0boUB5iFwdf3rlx3t9UTEuDej/RaHqZjZD5xeG/smCcOlSfHaKUa # wXfYxvm8ZfefJn1D6io1A+7M956uvIQNtmh13cU44clgFX9Y/bBNMg/5lMRsJKo8 # xxjvqCAyxo/pPfUsVWx4pc8AXbfVa85gyoSiaLEYZnqP54sJ2lFccqykCsTy58Lo # VDcoPnoSc+LNqBOvtzxXgQbEWFCXU6fe0+TZgVYUvExWFIAOImeDWg2GD1JVrwsX # e9QrPhL3DXg= # =ZQcP # -----END PGP SIGNATURE----- # gpg: Signature made Wed 28 Jun 2023 04:13:56 PM CEST # gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6 # gpg: issuer "kwolf@redhat.com" # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full] * tag 'for-upstream' of https://repo.or.cz/qemu/kevin: (23 commits) block: use bdrv_co_debug_event in coroutine context block: use bdrv_co_getlength in coroutine context qcow2: mark more functions as coroutine_fns and GRAPH_RDLOCK vhdx: mark more functions as coroutine_fns and GRAPH_RDLOCK vmdk: mark more functions as coroutine_fns and GRAPH_RDLOCK dmg: mark more functions as coroutine_fns and GRAPH_RDLOCK cloop: mark more functions as coroutine_fns and GRAPH_RDLOCK block: mark another function as coroutine_fns and GRAPH_UNLOCKED bochs: mark more functions as coroutine_fns and GRAPH_RDLOCK vpc: mark more functions as coroutine_fns and GRAPH_RDLOCK qed: mark more functions as coroutine_fns and GRAPH_RDLOCK file-posix: remove incorrect coroutine_fn calls Revert "graph-lock: Disable locking for now" graph-lock: Unlock the AioContext while polling blockjob: Fix AioContext locking in block_job_add_bdrv() block: Fix AioContext locking in bdrv_open_backing_file() block: Fix AioContext locking in bdrv_open_inherit() block: Fix AioContext locking in bdrv_reopen_parse_file_or_backing() block: Fix AioContext locking in bdrv_attach_child_common() block: Fix AioContext locking in bdrv_open_child() ... Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
commit
0eb8f90ede
30 changed files with 574 additions and 340 deletions
85
tests/qemu-iotests/tests/iothreads-commit-active
Executable file
85
tests/qemu-iotests/tests/iothreads-commit-active
Executable file
|
|
@ -0,0 +1,85 @@
|
|||
#!/usr/bin/env python3
|
||||
# group: rw quick auto
|
||||
#
|
||||
# Copyright (C) 2023 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: Kevin Wolf <kwolf@redhat.com>
|
||||
|
||||
import asyncio
|
||||
import iotests
|
||||
|
||||
iotests.script_initialize(supported_fmts=['qcow2'],
|
||||
supported_platforms=['linux'])
|
||||
iotests.verify_virtio_scsi_pci_or_ccw()
|
||||
|
||||
with iotests.FilePath('disk0.img') as img_path, \
|
||||
iotests.FilePath('disk0-snap.img') as snap_path, \
|
||||
iotests.FilePath('mirror-src.img') as src_path, \
|
||||
iotests.FilePath('mirror-dst.img') as dst_path, \
|
||||
iotests.VM() as vm:
|
||||
|
||||
img_size = '10M'
|
||||
iotests.qemu_img_create('-f', iotests.imgfmt, img_path, img_size)
|
||||
iotests.qemu_img_create('-f', iotests.imgfmt, '-b', img_path,
|
||||
'-F', iotests.imgfmt, snap_path)
|
||||
iotests.qemu_img_create('-f', iotests.imgfmt, src_path, img_size)
|
||||
iotests.qemu_img_create('-f', iotests.imgfmt, dst_path, img_size)
|
||||
|
||||
iotests.qemu_io_log('-c', 'write 0 64k', img_path)
|
||||
iotests.qemu_io_log('-c', 'write 1M 64k', snap_path)
|
||||
iotests.qemu_io_log('-c', 'write 3M 64k', snap_path)
|
||||
|
||||
iotests.qemu_io_log('-c', f'write 0 {img_size}', src_path)
|
||||
|
||||
iotests.log('Launching VM...')
|
||||
vm.add_object('iothread,id=iothread0')
|
||||
vm.add_object('throttle-group,x-bps-write=1048576,id=tg0')
|
||||
vm.add_blockdev(f'file,node-name=disk0-file,filename={img_path}')
|
||||
vm.add_blockdev('qcow2,node-name=disk0-fmt,file=disk0-file')
|
||||
vm.add_drive(snap_path, 'backing=disk0-fmt,node-name=disk0',
|
||||
interface='none')
|
||||
vm.add_device('virtio-scsi,iothread=iothread0')
|
||||
vm.add_device('scsi-hd,drive=drive0')
|
||||
|
||||
vm.add_blockdev(f'file,filename={src_path},node-name=mirror-src-file')
|
||||
vm.add_blockdev('qcow2,file=mirror-src-file,node-name=mirror-src')
|
||||
vm.add_blockdev(f'file,filename={dst_path},node-name=mirror-dst-file')
|
||||
vm.add_blockdev('qcow2,file=mirror-dst-file,node-name=mirror-dst-fmt')
|
||||
vm.add_blockdev('throttle,throttle-group=tg0,file=mirror-dst-fmt,'
|
||||
'node-name=mirror-dst')
|
||||
vm.add_device('scsi-hd,drive=mirror-src')
|
||||
|
||||
vm.launch()
|
||||
|
||||
# The background I/O is created on unrelated nodes (so that they won't be
|
||||
# drained together with the other ones), but on the same iothread
|
||||
iotests.log('Creating some background I/O...')
|
||||
iotests.log(vm.qmp('blockdev-mirror', job_id='job0', sync='full',
|
||||
device='mirror-src', target='mirror-dst',
|
||||
auto_dismiss=False))
|
||||
|
||||
iotests.log('Starting active commit...')
|
||||
iotests.log(vm.qmp('block-commit', device='disk0', job_id='job1',
|
||||
auto_dismiss=False))
|
||||
|
||||
# Should succeed and not time out
|
||||
try:
|
||||
vm.run_job('job1', wait=5.0)
|
||||
vm.shutdown()
|
||||
except asyncio.TimeoutError:
|
||||
# VM may be stuck, kill it
|
||||
vm.kill()
|
||||
raise
|
||||
23
tests/qemu-iotests/tests/iothreads-commit-active.out
Normal file
23
tests/qemu-iotests/tests/iothreads-commit-active.out
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
wrote 65536/65536 bytes at offset 0
|
||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
|
||||
wrote 65536/65536 bytes at offset 1048576
|
||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
|
||||
wrote 65536/65536 bytes at offset 3145728
|
||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
|
||||
wrote 10485760/10485760 bytes at offset 0
|
||||
10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
|
||||
Launching VM...
|
||||
Creating some background I/O...
|
||||
{"return": {}}
|
||||
Starting active commit...
|
||||
{"return": {}}
|
||||
{"execute": "job-complete", "arguments": {"id": "job1"}}
|
||||
{"return": {}}
|
||||
{"data": {"device": "job1", "len": 131072, "offset": 131072, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_READY", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
||||
{"data": {"device": "job1", "len": 131072, "offset": 131072, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
|
||||
{"execute": "job-dismiss", "arguments": {"id": "job1"}}
|
||||
{"return": {}}
|
||||
|
|
@ -825,6 +825,7 @@ static void test_attach_second_node(void)
|
|||
BlockDriverState *bs, *filter;
|
||||
QDict *options;
|
||||
|
||||
aio_context_acquire(main_ctx);
|
||||
blk = blk_new(ctx, BLK_PERM_ALL, BLK_PERM_ALL);
|
||||
bs = bdrv_new_open_driver(&bdrv_test, "base", BDRV_O_RDWR, &error_abort);
|
||||
blk_insert_bs(blk, bs, &error_abort);
|
||||
|
|
@ -833,7 +834,6 @@ static void test_attach_second_node(void)
|
|||
qdict_put_str(options, "driver", "raw");
|
||||
qdict_put_str(options, "file", "base");
|
||||
|
||||
aio_context_acquire(main_ctx);
|
||||
filter = bdrv_open(NULL, NULL, options, BDRV_O_RDWR, &error_abort);
|
||||
aio_context_release(main_ctx);
|
||||
|
||||
|
|
@ -857,9 +857,11 @@ static void test_attach_preserve_blk_ctx(void)
|
|||
{
|
||||
IOThread *iothread = iothread_new();
|
||||
AioContext *ctx = iothread_get_aio_context(iothread);
|
||||
AioContext *main_ctx = qemu_get_aio_context();
|
||||
BlockBackend *blk;
|
||||
BlockDriverState *bs;
|
||||
|
||||
aio_context_acquire(main_ctx);
|
||||
blk = blk_new(ctx, BLK_PERM_ALL, BLK_PERM_ALL);
|
||||
bs = bdrv_new_open_driver(&bdrv_test, "base", BDRV_O_RDWR, &error_abort);
|
||||
bs->total_sectors = 65536 / BDRV_SECTOR_SIZE;
|
||||
|
|
@ -868,6 +870,7 @@ static void test_attach_preserve_blk_ctx(void)
|
|||
blk_insert_bs(blk, bs, &error_abort);
|
||||
g_assert(blk_get_aio_context(blk) == ctx);
|
||||
g_assert(bdrv_get_aio_context(bs) == ctx);
|
||||
aio_context_release(main_ctx);
|
||||
|
||||
/* Remove the node again */
|
||||
aio_context_acquire(ctx);
|
||||
|
|
@ -877,7 +880,9 @@ static void test_attach_preserve_blk_ctx(void)
|
|||
g_assert(bdrv_get_aio_context(bs) == qemu_get_aio_context());
|
||||
|
||||
/* Re-attach the node */
|
||||
aio_context_acquire(main_ctx);
|
||||
blk_insert_bs(blk, bs, &error_abort);
|
||||
aio_context_release(main_ctx);
|
||||
g_assert(blk_get_aio_context(blk) == ctx);
|
||||
g_assert(bdrv_get_aio_context(bs) == ctx);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue