commit b9b10c35e5c8bdb800601b142c44a4bd2da5a6d2
author Kevin Wolf <kwolf@redhat.com> Fri Feb 03 16:21:50 2023 +0100
committer Kevin Wolf <kwolf@redhat.com> Thu Feb 23 19:49:17 2023 +0100
tree d0f692507ec8ea696ecea07c1aae59a839568795
parent 7b1fb72e2c1b9fbca17c13b753aee25f445cad24

block: Mark public read/write functions GRAPH_RDLOCK

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_co_pread*/pwrite*() need to hold a reader lock for the graph.

For some places, we know that they will hold the lock, but we don't have
the GRAPH_RDLOCK annotations yet. In this case, add assume_graph_lock()
with a FIXME comment. These places will be removed once everything is
properly annotated.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230203152202.49054-12-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

block/qed.h

diff --git a/block/qed.h b/block/qed.h
index e48f7c2..988654c 100644
--- a/block/qed.h
+++ b/block/qed.h
@@ -200,7 +200,7 @@
 /**
  * Table I/O functions
  */
-int coroutine_fn qed_read_l1_table_sync(BDRVQEDState *s);
+int coroutine_fn GRAPH_RDLOCK qed_read_l1_table_sync(BDRVQEDState *s);
 
 int coroutine_fn GRAPH_RDLOCK
 qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n);
@@ -208,10 +208,11 @@
 int coroutine_fn GRAPH_RDLOCK
 qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index, unsigned int n);
 
-int coroutine_fn qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
-                                        uint64_t offset);
-int coroutine_fn qed_read_l2_table(BDRVQEDState *s, QEDRequest *request,
-                                   uint64_t offset);
+int coroutine_fn GRAPH_RDLOCK
+qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request, uint64_t offset);
+
+int coroutine_fn GRAPH_RDLOCK
+qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset);
 
 int coroutine_fn GRAPH_RDLOCK
 qed_write_l2_table(BDRVQEDState *s, QEDRequest *request, unsigned int index,
@@ -224,9 +225,9 @@
 /**
  * Cluster functions
  */
-int coroutine_fn qed_find_cluster(BDRVQEDState *s, QEDRequest *request,
-                                  uint64_t pos, size_t *len,
-                                  uint64_t *img_offset);
+int coroutine_fn GRAPH_RDLOCK
+qed_find_cluster(BDRVQEDState *s, QEDRequest *request, uint64_t pos,
+                 size_t *len, uint64_t *img_offset);
 
 /**
  * Consistency check
@@ -234,7 +235,6 @@
 int coroutine_fn GRAPH_RDLOCK
 qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix);
 
-
 QEDTable *qed_alloc_table(BDRVQEDState *s);
 
 /**