ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Add assertion for bdrv_graph_wrlock() 

bdrv_graph_wrlock() can't run in a coroutine (because it polls) and
requires holding the BQL. We already have GLOBAL_STATE_CODE() to assert
the latter. Assert the former as well and add a no_coroutine_fn marker.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-23-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2023-09-29 16:51:57 +02:00
parent 680e0cc40c
commit e6e964b8b0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/graph-lock.c
View File

@ -106,12 +106,13 @@ static uint32_t reader_count(void)
return rd; return rd;
} }
void bdrv_graph_wrlock(BlockDriverState *bs) void no_coroutine_fn bdrv_graph_wrlock(BlockDriverState *bs)
{ {
AioContext *ctx = NULL; AioContext *ctx = NULL;
GLOBAL_STATE_CODE(); GLOBAL_STATE_CODE();
assert(!qatomic_read(&has_writer)); assert(!qatomic_read(&has_writer));
assert(!qemu_in_coroutine());
/* /*
* Release only non-mainloop AioContext. The mainloop often relies on the * Release only non-mainloop AioContext. The mainloop often relies on the

3
include/block/graph-lock.h
View File

@ -116,7 +116,8 @@ void unregister_aiocontext(AioContext *ctx);
* This function polls. Callers must not hold the lock of any AioContext other * This function polls. Callers must not hold the lock of any AioContext other
* than the current one and the one of @bs. * than the current one and the one of @bs.
*/ */
void bdrv_graph_wrlock(BlockDriverState *bs) TSA_ACQUIRE(graph_lock) TSA_NO_TSA; void no_coroutine_fn TSA_ACQUIRE(graph_lock) TSA_NO_TSA
bdrv_graph_wrlock(BlockDriverState *bs);
/* /*
* bdrv_graph_wrunlock: * bdrv_graph_wrunlock: