| Message ID | 20191128104129.250206-1-slp@redhat.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | blockdev: avoid acquiring AioContext lock twice at do_drive_backup and do_blockdev_backup | expand |
Am 28.11.2019 um 11:41 hat Sergio Lopez geschrieben: > do_drive_backup() acquires the AioContext lock of the corresponding > BlockDriverState. This is not a problem when it's called from > qmp_drive_backup(), but drive_backup_prepare() also acquires the lock > before calling it. The same things happens with do_blockdev_backup() > and blockdev_backup_prepare(). > > This patch series merges do_drive_backup() with drive_backup_prepare() > and do_blockdev_backup() with blockdev_backup_prepare(), and ensures > they're only getting called from a transaction context. This way, > there's a single code path for both transaction requests and qmp > commands, as suggested by Kevin Wolf. > > We also take this opportunity to ensure we're honoring the context > acquisition semantics required by bdrv_try_set_aio_context, as > suggested by Max Reitz. I think there is a small problem with the error paths in patch 4, but for patches 1 to 3 you can add: Reviewed-by: Kevin Wolf <kwolf@redhat.com>
do_drive_backup() acquires the AioContext lock of the corresponding BlockDriverState. This is not a problem when it's called from qmp_drive_backup(), but drive_backup_prepare() also acquires the lock before calling it. The same things happens with do_blockdev_backup() and blockdev_backup_prepare(). This patch series merges do_drive_backup() with drive_backup_prepare() and do_blockdev_backup() with blockdev_backup_prepare(), and ensures they're only getting called from a transaction context. This way, there's a single code path for both transaction requests and qmp commands, as suggested by Kevin Wolf. We also take this opportunity to ensure we're honoring the context acquisition semantics required by bdrv_try_set_aio_context, as suggested by Max Reitz. --- Changelog: v5: - Include fix for iotest 141 in patch 2. (thanks Max Reitz) - Also fix iotest 185 and 219 in patch 2. (thanks Max Reitz) - Move error block after context acquisition/release, to we can use goto to bail out and release resources. (thanks Max Reitz) - Properly release old_context in qmp_blockdev_mirror. (thanks Max Reitz) v4: - Unify patches 1-4 and 5-7 to avoid producing broken interim states. (thanks Max Reitz) - Include a fix for iotest 141. (thanks Kevin Wolf) v3: - Rework the whole patch series to fix the issue by consolidating all operations in the transaction model. (thanks Kevin Wolf) v2: - Honor bdrv_try_set_aio_context() context acquisition requirements (thanks Max Reitz). - Release the context at drive_backup_prepare() instead of avoiding re-acquiring it at do_drive_baclup(). (thanks Max Reitz) - Convert a single patch into a two-patch series. --- Sergio Lopez (4): blockdev: fix coding style issues in drive_backup_prepare blockdev: unify qmp_drive_backup and drive-backup transaction paths blockdev: unify qmp_blockdev_backup and blockdev-backup transaction paths blockdev: honor bdrv_try_set_aio_context() context requirements blockdev.c | 354 ++++++++++++++++++------------------- tests/qemu-iotests/141.out | 2 + tests/qemu-iotests/185.out | 2 + tests/qemu-iotests/219 | 7 +- tests/qemu-iotests/219.out | 8 + 5 files changed, 192 insertions(+), 181 deletions(-)