blockdev: acquire aio_context for bitmap add/remove
v4 cover blockdev: acquire aio_context for bitmap add/remove
See patch for details.
V4: Embarrassingly, fix a missing semicolon;
V3: Add signed-off-by. My script went a bit haywire,
so this one's for posterity.
John Snow (1):
blockdev: acquire aio_context for bitmap add/remove
blockdev.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.2
PATCH v4 1/1 blockdev: acquire aio_context for bitmap add/remove
When bitmaps are persistent, they may incur a disk read or write when bitmaps are added or removed. For configurations like virtio-dataplane, failing to acquire this lock will abort QEMU when disk IO occurs.
We used to acquire aio_context as part of the bitmap lookup, so re-introduce the lock for just the cases that have an IO penalty. Commit 2119882c removed these locks, and I failed to notice this when we committed fd5ae4cc, so this has been broken since persistent bitmaps were introduced.
--- blockdev.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
blockdev.c +20 -6
@@ -2820,6 +2820,7 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, {BlockDriverState *bs;BdrvDirtyBitmap *bitmap; +AioContext *aio_context =NULL ;if (!name || name[0 ] =='\0' ) {error_setg (errp,"Bitmap name cannot be empty" );
@@ -2854,15 +2855,17 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, disabled = false; } -if (persistent && - !bdrv_can_store_new_dirty_bitmap (bs, name, granularity, errp)) - { -return ; +if (persistent) { + aio_context =bdrv_get_aio_context (bs); +aio_context_acquire (aio_context); +if (!bdrv_can_store_new_dirty_bitmap (bs, name, granularity, errp)) { + goto out; + } } bitmap =bdrv_create_dirty_bitmap (bs, granularity, name, errp);if (bitmap ==NULL ) { -return ; + goto out }if (disabled) {
@@ -2870,6 +2873,10 @@ void qmp_block_dirty_bitmap_add(const char *node, const char *name, }bdrv_dirty_bitmap_set_persistance (bitmap, persistent); + out: +if (aio_context) { +aio_context_release (aio_context); + } } void qmp_block_dirty_bitmap_remove(const char *node, const char *name,
@@ -2878,6 +2885,7 @@ void qmp_block_dirty_bitmap_remove(const char *node, const char *name,BlockDriverState *bs;BdrvDirtyBitmap *bitmap;Error *local_err =NULL ; +AioContext *aio_context =NULL ; bitmap =block_dirty_bitmap_lookup (node, name, &bs, errp);if (!bitmap || !bs) {
@@ -2892,14 +2900,20 @@ void qmp_block_dirty_bitmap_remove(const char *node, const char *name, }if (bdrv_dirty_bitmap_get_persistance (bitmap)) { + aio_context =bdrv_get_aio_context (bs); +aio_context_acquire (aio_context);bdrv_remove_persistent_dirty_bitmap (bs, name, &local_err);if (local_err !=NULL ) {error_propagate (errp, local_err); -return ; + goto out; } }bdrv_release_dirty_bitmap (bs, bitmap); + out: +if (aio_context) { +aio_context_release (aio_context); + } }/**
Signature · 1 line
2.17.2
Quoted 21 lines · John Snow
When bitmaps are persistent, they may incur a disk read or write when bitmaps are added or removed. For configurations like virtio-dataplane, failing to acquire this lock will abort QEMU when disk IO occurs.
We used to acquire
aio_contextas part of the bitmap lookup, so re-introduce the lock for just the cases that have an IO penalty. Commit2119882cremoved these locks, and I failed to notice this when we committedfd5ae4cc, so this has been broken since persistent bitmaps were introduced.Reported-By Aihua Liang <[email protected]>Signed-off-by John Snow <[email protected]>Reviewed-by Eric Blake <[email protected]>--- blockdev.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)bitmap = bdrv_create_dirty_bitmap(bs, granularity, name, errp); if (bitmap == NULL) {
blockdev.c void qmp_block_dirty_bitmap_add(const char *node, const char *name, · line 2869
Quoted 3 lines
blockdev.c +1
-1-return ; + goto out }
Your scripts are still going haywire. :(
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
John Snow
NAKQuoted 19 lines · Eric Blake
Quoted 17 lines · John Snow
When bitmaps are persistent, they may incur a disk read or write when bitmaps are added or removed. For configurations like virtio-dataplane, failing to acquire this lock will abort QEMU when disk IO occurs.
We used to acquire
aio_contextas part of the bitmap lookup, so re-introduce the lock for just the cases that have an IO penalty. Commit2119882cremoved these locks, and I failed to notice this when we committedfd5ae4cc, so this has been broken since persistent bitmaps were introduced.Reported-By Aihua Liang <[email protected]>Signed-off-by John Snow <[email protected]>Reviewed-by Eric Blake <[email protected]>--- blockdev.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
Quoted 9 lines
blockdev.c void qmp_block_dirty_bitmap_add(const char *node, const char *name, · line 2869
Quoted 6 lines
bitmap = bdrv_create_dirty_bitmap(bs, granularity, name, errp); if (bitmap == NULL) {blockdev.c +1
-1-return ; + goto out }Your scripts are still going haywire. :(
Sigh. I ran the full suite of build tests but that doesn't do one bit of good if I don't run stg refresh before sending it out.
I'm really not having a good run of it it here.
NACK,
--js
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 === TEST SCRIPT END ===
CC hw/core/stream.o
CC hw/core/ptimer.o/tmp/qemu-test/src/blockdev.c: In function 'qmp_block_dirty_bitmap_add':/tmp/qemu-test/src/blockdev.c:2868:17: error: expected ';' before '}' token
goto out
^
;The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]