blockdev: acquire aio_context for bitmap add/remove
PATCH 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.
--- blockdev.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
blockdev.c +19 -5
@@ -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,10 +2855,12 @@ 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);
@@ -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
add Paolo
Quoted 10 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.Reported-By Aihua Liang <[email protected]>Signed-off-by John Snow <[email protected]>
Signature · 2 lines
Best regards, Vladimir
Quoted 75 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.Reported-By Aihua Liang <[email protected]>Signed-off-by John Snow <[email protected]>--- blockdev.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)blockdev.c +15
-5@@ -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,10 +2855,12 @@ 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);@@ -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; }
blockdev.c void qmp_block_dirty_bitmap_remove(const char *node, const char *name, · line 2919
Quoted 10 lines
blockdev.c +4
-0}bdrv_release_dirty_bitmap (bs, bitmap); + out: +if (aio_context) { +aio_context_release (aio_context); + } }/**
If this looks noncontroversial to everyone (Paolo said he agreed with Kevin's advice on the general approach here) I'm keen to merge it this week.
May I take it through my tree, or should I be patient and wait for you, Kevin?
Quoted 43 lines · Eric Blake
Quoted 42 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.Reported-By Aihua Liang <[email protected]>Signed-off-by John Snow <[email protected]>--- blockdev.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)blockdev.c +7
-4@@ -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,10 +2855,12 @@ 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; + } }
Quoted 6 lines
blockdev.c void qmp_block_dirty_bitmap_add(const char *node, const char *name, · line 2866
Quoted 1 line
blockdev.c +0
-0bitmap =bdrv_create_dirty_bitmap (bs, granularity, name, errp);if (bitmap == NULL) { return; }Oops - this early return fails to release the aio context.
Good spot, thanks! This would be awful to diagnose later.
Quoted 33 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.Reported-By Aihua Liang <[email protected]>Signed-off-by John Snow <[email protected]>--- blockdev.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)blockdev.c +1
-3@@ -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,10 +2855,12 @@ 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)) - {
blockdev.c void qmp_block_dirty_bitmap_add(const char *node, const char *name, · line 2866
Quoted 10 lines
blockdev.c +6
-1-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;
}Oops - this early return fails to release the aio context.
Quoted 42 lines
blockdev.c +12
-1@@ -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 · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org