[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH RFC 12/16] blk: fix aio context loss on media change
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH RFC 12/16] blk: fix aio context loss on media change |
Date: |
Tue, 21 Mar 2017 11:16:31 +0800 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
If we have separate iothread for cdrom, we lose connection to it on
qmp_blockdev_change_medium, as aio_context is on bds which is dropped
and switched with new one.
As an example result, after such media change we have crash on
virtio_scsi_ctx_check: Assertion `blk_get_aio_context(d->conf.blk) == s->ctx'
failed.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
block/block-backend.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/block/block-backend.c b/block/block-backend.c
index 5d17404..ec8747f 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -65,6 +65,8 @@ struct BlockBackend {
bool allow_write_beyond_eof;
NotifierList remove_bs_notifiers, insert_bs_notifiers;
+
+ AioContext *aio_context;
};
typedef struct BlockBackendAIOCB {
@@ -559,6 +561,10 @@ int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs,
Error **errp)
}
bdrv_ref(bs);
+ if (blk->aio_context != NULL) {
+ bdrv_set_aio_context(bs, blk->aio_context);
+ }
+
notifier_list_notify(&blk->insert_bs_notifiers, blk);
if (blk->public.throttle_state) {
throttle_timers_attach_aio_context(
@@ -1619,6 +1625,7 @@ void blk_set_aio_context(BlockBackend *blk, AioContext
*new_context)
{
BlockDriverState *bs = blk_bs(blk);
+ blk->aio_context = new_context;
if (bs) {
if (blk->public.throttle_state) {
throttle_timers_detach_aio_context(&blk->public.throttle_timers);
--
2.9.3
- [Qemu-block] [PATCH RFC 02/16] block-backend: Add blk_request_perm, (continued)
- [Qemu-block] [PATCH RFC 02/16] block-backend: Add blk_request_perm, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 03/16] blockjob: Add BLK_PERM_AIO_CONTEXT_CHANGE shared perm on bs, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 04/16] block: Propagate BLK_PERM_AIO_CONTEXT_CHANGE down the graph, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 05/16] backup: Request BLK_PERM_AIO_CONTEXT_CHANGE on target, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 06/16] backup: Do initial aio context move of target via BB interface, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 07/16] mirror: Request aio context change permission on target, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 08/16] commit: Allow aio context change on s->base, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 09/16] mirror: Do initial aio context move of target via BB interface, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 10/16] virtio-scsi: Request BLK_PERM_AIO_CONTEXT_CHANGE for dataplane, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 11/16] virtio-blk: Request BLK_PERM_AIO_CONTEXT_CHANGE for dataplane, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 12/16] blk: fix aio context loss on media change,
Fam Zheng <=
- [Qemu-block] [PATCH RFC 13/16] nbd: Allow BLK_PERM_AIO_CONTEXT_CHANGE on BB, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 14/16] block: Add perm assertion on blk_set_aio_context, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 15/16] mirror: Lazily request aio context change permission on target, Fam Zheng, 2017/03/20
- [Qemu-block] [PATCH RFC 16/16] Revert "mirror: Request aio context change permission on target", Fam Zheng, 2017/03/20