[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 02/12] virtio-blk: Increase in_flight for request re
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH 02/12] virtio-blk: Increase in_flight for request restart BH |
Date: |
Mon, 18 Feb 2019 17:18:12 +0100 |
virtio_blk_dma_restart_bh() submits new requests, so in order to make
sure that these requests are not started inside a drained section of the
attached BlockBackend, we need to make sure that draining the
BlockBackend waits for the BH to be executed.
This BH is still questionable because its scheduled in the main thread
instead of the configured iothread. Leave a FIXME comment for this.
But with this fix, enabling the data plane at least waits for these
requests (in bdrv_set_aio_context()) instead of changing the AioContext
under their feet and making them run in the wrong thread, causing
crashes and failures (e.g. due to missing locking).
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/block/virtio-blk.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index cf7f47eaba..e11e6e45d0 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -675,6 +675,7 @@ static void virtio_blk_dma_restart_bh(void *opaque)
if (mrb.num_reqs) {
virtio_blk_submit_multireq(s->blk, &mrb);
}
+ blk_dec_in_flight(s->conf.conf.blk);
aio_context_release(blk_get_aio_context(s->conf.conf.blk));
}
@@ -688,8 +689,11 @@ static void virtio_blk_dma_restart_cb(void *opaque, int
running,
}
if (!s->bh) {
+ /* FIXME The data plane is not started yet, so these requests are
+ * processed in the main thread. */
s->bh = aio_bh_new(blk_get_aio_context(s->conf.conf.blk),
virtio_blk_dma_restart_bh, s);
+ blk_inc_in_flight(s->conf.conf.blk);
qemu_bh_schedule(s->bh);
}
}
--
2.20.1
- [Qemu-block] [PATCH 00/12] block: bdrv_set_aio_context() related fixes, Kevin Wolf, 2019/02/18
- [Qemu-block] [PATCH 01/12] block-backend: Make blk_inc/dec_in_flight public, Kevin Wolf, 2019/02/18
- [Qemu-block] [PATCH 02/12] virtio-blk: Increase in_flight for request restart BH,
Kevin Wolf <=
- [Qemu-block] [PATCH 05/12] nbd: Move nbd_read_eof() to nbd/client.c, Kevin Wolf, 2019/02/18
- [Qemu-block] [PATCH 04/12] io: Make qio_channel_yield() interruptible, Kevin Wolf, 2019/02/18
- [Qemu-block] [PATCH 10/12] test-bdrv-drain: AioContext switch in drained section, Kevin Wolf, 2019/02/18
- [Qemu-block] [PATCH 03/12] nbd: Restrict connection_co reentrance, Kevin Wolf, 2019/02/18