diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2023-09-29 16:51:57 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-10-12 16:31:33 +0200 |
| commit | e6e964b8b021446c8d3d1f91c0208f653e9ec92c (patch) | |
| tree | b9c929a6359b628c374bb7e71bd9b8b1517e16b5 | |
| parent | 680e0cc40c5830ebcbfa0bce99bf932e1a4cf6c6 (diff) | |
| download | qemu-e6e964b8b021446c8d3d1f91c0208f653e9ec92c.zip qemu-e6e964b8b021446c8d3d1f91c0208f653e9ec92c.tar.gz qemu-e6e964b8b021446c8d3d1f91c0208f653e9ec92c.tar.bz2 | |
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>
| -rw-r--r-- | block/graph-lock.c | 3 | ||||
| -rw-r--r-- | include/block/graph-lock.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/block/graph-lock.c b/block/graph-lock.c index 58a7990..e5525ee 100644 --- a/block/graph-lock.c +++ b/block/graph-lock.c @@ -106,12 +106,13 @@ static uint32_t reader_count(void) return rd; } -void bdrv_graph_wrlock(BlockDriverState *bs) +void no_coroutine_fn bdrv_graph_wrlock(BlockDriverState *bs) { AioContext *ctx = NULL; GLOBAL_STATE_CODE(); assert(!qatomic_read(&has_writer)); + assert(!qemu_in_coroutine()); /* * Release only non-mainloop AioContext. The mainloop often relies on the diff --git a/include/block/graph-lock.h b/include/block/graph-lock.h index 7e04f98..6f1cd12 100644 --- a/include/block/graph-lock.h +++ b/include/block/graph-lock.h @@ -116,7 +116,8 @@ void unregister_aiocontext(AioContext *ctx); * This function polls. Callers must not hold the lock of any AioContext other * 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: |