aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorEmanuele Giuseppe Esposito <eesposit@redhat.com>2023-02-03 16:21:45 +0100
committerKevin Wolf <kwolf@redhat.com>2023-02-23 19:49:10 +0100
commitc16b8bd4e5b423dac556cc37a81efeea4bba9cfe (patch)
tree20bb11989c5149b61a29d13ba220348b88ec063f /block
parent26c518ab1e2159fd4b8f6819af2bdba35e6416f5 (diff)
downloadqemu-c16b8bd4e5b423dac556cc37a81efeea4bba9cfe.zip
qemu-c16b8bd4e5b423dac556cc37a81efeea4bba9cfe.tar.gz
qemu-c16b8bd4e5b423dac556cc37a81efeea4bba9cfe.tar.bz2
block/qed: add missing graph rdlock in qed_need_check_timer_entry
This function is called in two different places: - timer callback, which does not take the graph rdlock. - bdrv_qed_drain_begin(), which is .bdrv_drain_begin() callback documented as function that does not take the lock. Since it calls recursive functions that traverse the graph, we need to protect them with the graph rdlock. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20230203152202.49054-7-kwolf@redhat.com> Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/qed.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/block/qed.c b/block/qed.c
index 175a46c..7690d02 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -282,11 +282,12 @@ static void coroutine_fn qed_unplug_allocating_write_reqs(BDRVQEDState *s)
qemu_co_mutex_unlock(&s->table_lock);
}
-static void coroutine_fn qed_need_check_timer(BDRVQEDState *s)
+static void coroutine_fn GRAPH_RDLOCK qed_need_check_timer(BDRVQEDState *s)
{
int ret;
trace_qed_need_check_timer_cb(s);
+ assert_bdrv_graph_readable();
if (!qed_plug_allocating_write_reqs(s)) {
return;
@@ -312,6 +313,7 @@ static void coroutine_fn qed_need_check_timer(BDRVQEDState *s)
static void coroutine_fn qed_need_check_timer_entry(void *opaque)
{
BDRVQEDState *s = opaque;
+ GRAPH_RDLOCK_GUARD();
qed_need_check_timer(opaque);
bdrv_dec_in_flight(s->bs);