blockdev: acquire aio_context for bitmap add/remove
PATCH v2 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 | 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 6 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.
It would be nice to call out which commit id dropped the aio_context acquisition during bitmap lookup (making it easier to analyze how long this has broken, and which downstream builds need the backport.
Quoted 6 lines
Reported-By Aihua Liang <[email protected]>--- blockdev.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Quoted 5 lines · Eric Blake
Quoted 4 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.
Quoted 7 lines
Quoted 2 lines
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.It would be nice to call out which commit id dropped the
aio_contextacquisition during bitmap lookup (making it easier to analyze how long this has broken, and which downstream builds need the backport.
OK, I will amend this.
Looks like:
commit 2119882c7eb7e2c612b24fc0c8d86f5887d6f1c3
Author: Paolo Bonzini <[email protected]> Date: Mon Jun 5 14:39:03 2017 +0200
since 2.10.
Quoted 9 lines
Quoted 6 lines
Reported-By Aihua Liang <[email protected]>--- blockdev.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)Reviewed-by Eric Blake <[email protected]>
Quoted 18 lines · John Snow
Quoted 5 lines · Eric Blake
Quoted 4 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.
Quoted 7 lines
Quoted 2 lines
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.It would be nice to call out which commit id dropped the
aio_contextacquisition during bitmap lookup (making it easier to analyze how long this has broken, and which downstream builds need the backport.OK, I will amend this.
Quoted 7 lines
Looks like:
commit
2119882c7eb7e2c612b24fc0c8d86f5887d6f1c3Author: Paolo Bonzini <[email protected]> Date: Mon Jun 5 14:39:03 2017 +0200since 2.10.
Hmm. block-dirty-bitmap-add's "persistent":true parameter was also added in 2.10 in commit fd5ae4cc. In fact, 2119882c was made at a time when there were not persistent bitmaps; so I guess that this means we have always been broken since fd5ae4cc.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [Qemu-devel] [PATCH v2] blockdev: acquire aio_context for bitmap add/remove
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 From https://github.com/patchew-project/qemu
* [new tag] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'b3b11e3e6f blockdev: acquire aio_context for bitmap add/remove
=== OUTPUT BEGIN ===
ERROR: Missing Signed-off-by: line(s)
total: 1 errors, 0 warnings, 67 lines checked
Commit b3b11e3e6f40 (blockdev: acquire aio_context for bitmap add/remove) has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
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 ui/input-keymap.o
CC ui/kbd-state.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]