OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: Factor out bdrv_drain_all_begin_nopoll() 

Provide a separate function that just quiesces the users of a node to
prevent new requests from coming in, but without waiting for the already
in-flight I/O to complete.

This function can be used in contexts where polling is not allowed.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221207131838.239125-2-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2022-12-07 14:18:21 +01:00
parent 0508d0be4b
commit da0bd74434
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
block/io.c
View File

@ -466,16 +466,11 @@ static bool bdrv_drain_all_poll(void)
* NOTE: no new block jobs or BlockDriverStates can be created between * NOTE: no new block jobs or BlockDriverStates can be created between
* the bdrv_drain_all_begin() and bdrv_drain_all_end() calls. * the bdrv_drain_all_begin() and bdrv_drain_all_end() calls.
*/ */
void bdrv_drain_all_begin(void) void bdrv_drain_all_begin_nopoll(void)
{ {
BlockDriverState *bs = NULL; BlockDriverState *bs = NULL;
GLOBAL_STATE_CODE(); GLOBAL_STATE_CODE();
if (qemu_in_coroutine()) {
bdrv_co_yield_to_drain(NULL, true, NULL, true);
return;
}
/* /*
* bdrv queue is managed by record/replay, * bdrv queue is managed by record/replay,
* waiting for finishing the I/O requests may * waiting for finishing the I/O requests may
@ -500,6 +495,18 @@ void bdrv_drain_all_begin(void)
bdrv_do_drained_begin(bs, NULL, false); bdrv_do_drained_begin(bs, NULL, false);
aio_context_release(aio_context); aio_context_release(aio_context);
} }
}
void bdrv_drain_all_begin(void)
{
BlockDriverState *bs = NULL;
if (qemu_in_coroutine()) {
bdrv_co_yield_to_drain(NULL, true, NULL, true);
return;
}
bdrv_drain_all_begin_nopoll();
/* Now poll the in-flight requests */ /* Now poll the in-flight requests */
AIO_WAIT_WHILE(NULL, bdrv_drain_all_poll()); AIO_WAIT_WHILE(NULL, bdrv_drain_all_poll());

1
include/block/block-global-state.h
View File

@ -152,6 +152,7 @@ int bdrv_inactivate_all(void);
int bdrv_flush_all(void); int bdrv_flush_all(void);
void bdrv_close_all(void); void bdrv_close_all(void);
void bdrv_drain_all_begin(void); void bdrv_drain_all_begin(void);
void bdrv_drain_all_begin_nopoll(void);
void bdrv_drain_all_end(void); void bdrv_drain_all_end(void);
void bdrv_drain_all(void); void bdrv_drain_all(void);