| Message ID | 20200909151149.490589-13-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | monitor: Optionally run handlers in coroutines | expand |
On Wed, Sep 09, 2020 at 05:11:48PM +0200, Kevin Wolf wrote: > Add a function to move the current coroutine to the AioContext of a > given BlockDriverState. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > include/block/block.h | 6 ++++++ > block.c | 10 ++++++++++ > 2 files changed, 16 insertions(+) > > diff --git a/include/block/block.h b/include/block/block.h > index 981ab5b314..80ab322f11 100644 > --- a/include/block/block.h > +++ b/include/block/block.h > @@ -626,6 +626,12 @@ bool bdrv_debug_is_suspended(BlockDriverState *bs, const char *tag); > */ > AioContext *bdrv_get_aio_context(BlockDriverState *bs); > > +/** > + * Move the current coroutine to the AioContext of @bs and return the old > + * AioContext of the coroutine. > + */ > +AioContext *coroutine_fn bdrv_co_move_to_aio_context(BlockDriverState *bs); I'm not sure this function handles all cases: 1. Being called without the BQL (i.e. from an IOThread). 2. Being called while a device stops using its IOThread. The races that come to mind are fetching the AioContext for bs and then scheduling a BH. The BH is executed later on by the event loop. There might be cases where the AioContext for bs is updated before the BH runs. I didn't investigate these cases but wanted to mention them in case you want to add doc comments about when this function can be used or if you'd like to verify them yourself. Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/include/block/block.h b/include/block/block.h index 981ab5b314..80ab322f11 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -626,6 +626,12 @@ bool bdrv_debug_is_suspended(BlockDriverState *bs, const char *tag); */ AioContext *bdrv_get_aio_context(BlockDriverState *bs); +/** + * Move the current coroutine to the AioContext of @bs and return the old + * AioContext of the coroutine. + */ +AioContext *coroutine_fn bdrv_co_move_to_aio_context(BlockDriverState *bs); + /** * Transfer control to @co in the aio context of @bs */ diff --git a/block.c b/block.c index 9538af4884..81403e00d1 100644 --- a/block.c +++ b/block.c @@ -6372,6 +6372,16 @@ AioContext *bdrv_get_aio_context(BlockDriverState *bs) return bs ? bs->aio_context : qemu_get_aio_context(); } +AioContext *coroutine_fn bdrv_co_move_to_aio_context(BlockDriverState *bs) +{ + Coroutine *self = qemu_coroutine_self(); + AioContext *old_ctx = qemu_coroutine_get_aio_context(self); + AioContext *new_ctx = bdrv_get_aio_context(bs); + + aio_co_reschedule_self(new_ctx); + return old_ctx; +} + void bdrv_coroutine_enter(BlockDriverState *bs, Coroutine *co) { aio_co_enter(bdrv_get_aio_context(bs), co);
Add a function to move the current coroutine to the AioContext of a given BlockDriverState. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- include/block/block.h | 6 ++++++ block.c | 10 ++++++++++ 2 files changed, 16 insertions(+)