Series comparison

-[PULL 0/3] Block layer patches
+[PULL 00/26] Block layer patches
-The following changes since commit 0a301624c2f4ced3331ffd5bce85b4274fe132af:
+The following changes since commit a51e5124a655b3dad80b36b18547cb1eca2c5eb2:
-  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20220208' into staging (2022-02-08 11:40:08 +0000)
+  Merge tag 'pull-omnibus-111023-1' of https://gitlab.com/stsquad/qemu into staging (2023-10-11 09:43:10 -0400)
 are available in the Git repository at:
-  https://gitlab.com/kmwolf/qemu.git tags/for-upstream
+  https://repo.or.cz/qemu/kevin.git tags/for-upstream
-for you to fetch changes up to fdb8541b2e4f6ff60f435fbb5a5e1df20c275a86:
+for you to fetch changes up to e6e964b8b021446c8d3d1f91c0208f653e9ec92c:
-  hw/block/fdc-isa: Respect QOM properties when building AML (2022-02-11 17:37:26 +0100)
+  block: Add assertion for bdrv_graph_wrlock() (2023-10-12 16:31:33 +0200)
 ----------------------------------------------------------------
 Block layer patches
-- Fix crash in blockdev-reopen with iothreads
+- Clean up coroutine versions of bdrv_{is_allocated,block_status}*
-- fdc-isa: Respect QOM properties when building AML
+- Graph locking part 5 (protect children/parent links)
 ----------------------------------------------------------------
-Bernhard Beschow (1):
+Emanuele Giuseppe Esposito (1):
-      hw/block/fdc-isa: Respect QOM properties when building AML
+      block: Mark drain related functions GRAPH_RDLOCK
-Kevin Wolf (2):
+Kevin Wolf (21):
-      block: Lock AioContext for drain_end in blockdev-reopen
+      test-bdrv-drain: Don't call bdrv_graph_wrlock() in coroutine context
-      iotests: Test blockdev-reopen with iothreads and throttling
+      block-coroutine-wrapper: Add no_co_wrapper_bdrv_rdlock functions
       block: Take graph rdlock in bdrv_inactivate_all()
       block: Mark bdrv_first_blk() and bdrv_is_root_node() GRAPH_RDLOCK
       block: Mark bdrv_parent_cb_resize() and callers GRAPH_RDLOCK
       block: Mark bdrv_snapshot_fallback() and callers GRAPH_RDLOCK
       block: Take graph rdlock in parts of reopen
       block: Mark bdrv_get_xdbg_block_graph() and callers GRAPH_RDLOCK
       block: Mark bdrv_refresh_filename() and callers GRAPH_RDLOCK
       block: Mark bdrv_primary_child() and callers GRAPH_RDLOCK
       block: Mark bdrv_get_parent_name() and callers GRAPH_RDLOCK
       block: Mark bdrv_amend_options() and callers GRAPH_RDLOCK
       qcow2: Mark qcow2_signal_corruption() and callers GRAPH_RDLOCK
       qcow2: Mark qcow2_inactivate() and callers GRAPH_RDLOCK
       qcow2: Mark check_constraints_on_bitmap() GRAPH_RDLOCK
       block: Mark bdrv_op_is_blocked() and callers GRAPH_RDLOCK
       block: Mark bdrv_apply_auto_read_only() and callers GRAPH_RDLOCK
       block: Mark bdrv_get_specific_info() and callers GRAPH_RDLOCK
       block: Protect bs->parents with graph_lock
       block: Protect bs->children with graph_lock
       block: Add assertion for bdrv_graph_wrlock()
- blockdev.c                 | 11 ++++++++++-
+Paolo Bonzini (4):
- hw/block/fdc-isa.c         | 11 +++++++----
+      block: rename the bdrv_co_block_status static function
- tests/qemu-iotests/245     | 36 +++++++++++++++++++++++++++++++++---
+      block: complete public block status API
- tests/qemu-iotests/245.out |  4 ++--
+      block: switch to co_wrapper for bdrv_is_allocated_*
-files changed, 52 insertions(+), 10 deletions(-)
+      block: convert more bdrv_is_allocated* and bdrv_block_status* calls to coroutine versions
+ block/qcow2.h                               | 187 ++++++++++++++++------------
  block/vhdx.h                                |   5 +-
  include/block/block-common.h                |   7 +-
  include/block/block-global-state.h          |  34 ++---
  include/block/block-io.h                    |  71 +++++++----
  include/block/block_int-common.h            |  69 +++++-----
  include/block/block_int-io.h                |   7 +-
  include/block/graph-lock.h                  |   3 +-
  include/block/qapi.h                        |  23 ++--
  include/block/snapshot.h                    |  24 ++--
  include/sysemu/block-backend-global-state.h |   4 +-
  block.c                                     | 120 ++++++++++++------
  block/backup.c                              |   1 +
  block/block-backend.c                       |   9 +-
  block/bochs.c                               |   2 +
  block/cloop.c                               |   2 +
  block/commit.c                              |   1 +
  block/copy-before-write.c                   |   2 +-
  block/copy-on-read.c                        |   8 +-
  block/crypto.c                              |   4 +-
  block/curl.c                                |   2 +
  block/dmg.c                                 |   2 +
  block/export/export.c                       |   4 +
  block/gluster.c                             |   2 +
  block/graph-lock.c                          |   3 +-
  block/io.c                                  | 143 ++++++++++-----------
  block/iscsi.c                               |   2 +
  block/mirror.c                              |  10 +-
  block/monitor/block-hmp-cmds.c              |   5 +
  block/nbd.c                                 |   3 +-
  block/nfs.c                                 |   2 +-
  block/parallels.c                           |   3 +
  block/qapi-sysemu.c                         |  11 +-
  block/qapi.c                                |  11 +-
  block/qcow.c                                |   3 +
  block/qcow2-bitmap.c                        |  38 +++---
  block/qcow2-cache.c                         |  11 +-
  block/qcow2-cluster.c                       |  62 ++++-----
  block/qcow2-refcount.c                      |  80 ++++++------
  block/qcow2.c                               |  77 +++++++-----
  block/quorum.c                              |   4 +-
  block/raw-format.c                          |   2 +
  block/rbd.c                                 |   4 +
  block/replication.c                         |  29 +++--
  block/snapshot.c                            |  54 ++++++--
  block/stream.c                              |   8 +-
  block/vdi.c                                 |   3 +
  block/vhdx.c                                |   4 +
  block/vmdk.c                                |  53 +++++---
  block/vpc.c                                 |   3 +
  block/vvfat.c                               |  20 +--
  blockdev.c                                  |  44 +++++++
  blockjob.c                                  |   1 +
  migration/block.c                           |   2 +
  migration/migration-hmp-cmds.c              |   2 +
  qemu-img.c                                  |  16 +++
  qemu-io-cmds.c                              |   3 +
  tests/unit/test-bdrv-drain.c                |  15 ++-
  tests/unit/test-block-iothread.c            |   8 ++
  scripts/block-coroutine-wrapper.py          |  10 +-
 files changed, 843 insertions(+), 499 deletions(-)

-New patch
+[PULL 01/26] block: rename the bdrv_co_block_status static function
+From: Paolo Bonzini <pbonzini@redhat.com>
+bdrv_block_status exists as a wrapper for bdrv_block_status_above, but
+the name of the (hypothetical) coroutine version, bdrv_co_block_status,
+is squatted by a random static function.  Rename it to
+bdrv_co_do_block_status.
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Message-ID: <20230904100306.156197-2-pbonzini@redhat.com>
+Reviewed-by: Kevin Wolf <kwolf@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block/io.c | 21 +++++++++++----------
+file changed, 11 insertions(+), 10 deletions(-)
+diff --git a/block/io.c b/block/io.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/io.c
++++ b/block/io.c
+@@ -XXX,XX +XXX,XX @@ int bdrv_flush_all(void)
+  * set to the host mapping and BDS corresponding to the guest offset.
+  */
+ static int coroutine_fn GRAPH_RDLOCK
+-bdrv_co_block_status(BlockDriverState *bs, bool want_zero,
+-                     int64_t offset, int64_t bytes,
+-                     int64_t *pnum, int64_t *map, BlockDriverState **file)
++bdrv_co_do_block_status(BlockDriverState *bs, bool want_zero,
++                        int64_t offset, int64_t bytes,
++                        int64_t *pnum, int64_t *map, BlockDriverState **file)
+ {
+     int64_t total_size;
+     int64_t n; /* bytes */
+@@ -XXX,XX +XXX,XX @@ bdrv_co_block_status(BlockDriverState *bs, bool want_zero,
+     if (ret & BDRV_BLOCK_RAW) {
+         assert(ret & BDRV_BLOCK_OFFSET_VALID && local_file);
+-        ret = bdrv_co_block_status(local_file, want_zero, local_map,
+-                                   *pnum, pnum, &local_map, &local_file);
++        ret = bdrv_co_do_block_status(local_file, want_zero, local_map,
++                                      *pnum, pnum, &local_map, &local_file);
+         goto out;
+     }
+@@ -XXX,XX +XXX,XX @@ bdrv_co_block_status(BlockDriverState *bs, bool want_zero,
+         int64_t file_pnum;
+         int ret2;
+-        ret2 = bdrv_co_block_status(local_file, want_zero, local_map,
+-                                    *pnum, &file_pnum, NULL, NULL);
++        ret2 = bdrv_co_do_block_status(local_file, want_zero, local_map,
++                                       *pnum, &file_pnum, NULL, NULL);
+         if (ret2 >= 0) {
+             /* Ignore errors.  This is just providing extra information, it
+              * is useful but not necessary.
+@@ -XXX,XX +XXX,XX @@ bdrv_co_common_block_status_above(BlockDriverState *bs,
+         return 0;
+     }
+-    ret = bdrv_co_block_status(bs, want_zero, offset, bytes, pnum, map, file);
++    ret = bdrv_co_do_block_status(bs, want_zero, offset, bytes, pnum,
++                                  map, file);
+     ++*depth;
+     if (ret < 0 || *pnum == 0 || ret & BDRV_BLOCK_ALLOCATED || bs == base) {
+         return ret;
+@@ -XXX,XX +XXX,XX @@ bdrv_co_common_block_status_above(BlockDriverState *bs,
+     for (p = bdrv_filter_or_cow_bs(bs); include_base || p != base;
+          p = bdrv_filter_or_cow_bs(p))
+     {
+-        ret = bdrv_co_block_status(p, want_zero, offset, bytes, pnum, map,
+-                                   file);
++        ret = bdrv_co_do_block_status(p, want_zero, offset, bytes, pnum,
++                                      map, file);
+         ++*depth;
+         if (ret < 0) {
+             return ret;
+--
+.41.0

-New patch
+[PULL 02/26] block: complete public block status API
+From: Paolo Bonzini <pbonzini@redhat.com>
+Include both coroutine and non-coroutine versions, the latter being
+co_wrapper_mixed_bdrv_rdlock of the former.
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Message-ID: <20230904100306.156197-3-pbonzini@redhat.com>
+Reviewed-by: Kevin Wolf <kwolf@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block-io.h | 17 +++++++++++------
+ block/io.c               | 18 +++++-------------
+files changed, 16 insertions(+), 19 deletions(-)
+diff --git a/include/block/block-io.h b/include/block/block-io.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-io.h
++++ b/include/block/block-io.h
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn GRAPH_RDLOCK bdrv_co_zone_append(BlockDriverState *bs,
+                                                   BdrvRequestFlags flags);
+ bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs);
+-int bdrv_block_status(BlockDriverState *bs, int64_t offset,
+-                      int64_t bytes, int64_t *pnum, int64_t *map,
+-                      BlockDriverState **file);
++
++int coroutine_fn GRAPH_RDLOCK
++bdrv_co_block_status(BlockDriverState *bs, int64_t offset, int64_t bytes,
++                     int64_t *pnum, int64_t *map, BlockDriverState **file);
++int co_wrapper_mixed_bdrv_rdlock
++bdrv_block_status(BlockDriverState *bs, int64_t offset, int64_t bytes,
++                  int64_t *pnum, int64_t *map, BlockDriverState **file);
+ int coroutine_fn GRAPH_RDLOCK
+ bdrv_co_block_status_above(BlockDriverState *bs, BlockDriverState *base,
+                            int64_t offset, int64_t bytes, int64_t *pnum,
+                            int64_t *map, BlockDriverState **file);
+-int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
+-                            int64_t offset, int64_t bytes, int64_t *pnum,
+-                            int64_t *map, BlockDriverState **file);
++int co_wrapper_mixed_bdrv_rdlock
++bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
++                        int64_t offset, int64_t bytes, int64_t *pnum,
++                        int64_t *map, BlockDriverState **file);
+ int coroutine_fn GRAPH_RDLOCK
+ bdrv_co_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
+diff --git a/block/io.c b/block/io.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/io.c
++++ b/block/io.c
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,
+                                              bytes, pnum, map, file, NULL);
+ }
+-int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
+-                            int64_t offset, int64_t bytes, int64_t *pnum,
+-                            int64_t *map, BlockDriverState **file)
++int coroutine_fn bdrv_co_block_status(BlockDriverState *bs, int64_t offset,
++                                      int64_t bytes, int64_t *pnum,
++                                      int64_t *map, BlockDriverState **file)
+ {
+     IO_CODE();
+-    return bdrv_common_block_status_above(bs, base, false, true, offset, bytes,
+-                                          pnum, map, file, NULL);
+-}
+-
+-int bdrv_block_status(BlockDriverState *bs, int64_t offset, int64_t bytes,
+-                      int64_t *pnum, int64_t *map, BlockDriverState **file)
+-{
+-    IO_CODE();
+-    return bdrv_block_status_above(bs, bdrv_filter_or_cow_bs(bs),
+-                                   offset, bytes, pnum, map, file);
++    return bdrv_co_block_status_above(bs, bdrv_filter_or_cow_bs(bs),
++                                      offset, bytes, pnum, map, file);
+ }
+ /*
+--
+.41.0

-New patch
+[PULL 03/26] block: switch to co_wrapper for bdrv_is_allocated_*
+From: Paolo Bonzini <pbonzini@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Message-ID: <20230904100306.156197-4-pbonzini@redhat.com>
+Reviewed-by: Kevin Wolf <kwolf@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block-io.h | 12 +++++----
+ block/io.c               | 53 ++++++----------------------------------
+files changed, 14 insertions(+), 51 deletions(-)
+diff --git a/include/block/block-io.h b/include/block/block-io.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-io.h
++++ b/include/block/block-io.h
+@@ -XXX,XX +XXX,XX @@ bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
+ int coroutine_fn GRAPH_RDLOCK
+ bdrv_co_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
+                      int64_t *pnum);
+-int bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
+-                      int64_t *pnum);
++int co_wrapper_mixed_bdrv_rdlock
++bdrv_is_allocated(BlockDriverState *bs, int64_t offset,
++                  int64_t bytes, int64_t *pnum);
+ int coroutine_fn GRAPH_RDLOCK
+ bdrv_co_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
+                            bool include_base, int64_t offset, int64_t bytes,
+                            int64_t *pnum);
+-int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
+-                            bool include_base, int64_t offset, int64_t bytes,
+-                            int64_t *pnum);
++int co_wrapper_mixed_bdrv_rdlock
++bdrv_is_allocated_above(BlockDriverState *bs, BlockDriverState *base,
++                        bool include_base, int64_t offset,
++                        int64_t bytes, int64_t *pnum);
+ int coroutine_fn GRAPH_RDLOCK
+ bdrv_co_is_zero_fast(BlockDriverState *bs, int64_t offset, int64_t bytes);
+diff --git a/block/io.c b/block/io.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/io.c
++++ b/block/io.c
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t offset,
+     return !!(ret & BDRV_BLOCK_ALLOCATED);
+ }
+-int bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
+-                      int64_t *pnum)
+-{
+-    int ret;
+-    int64_t dummy;
+-    IO_CODE();
+-
+-    ret = bdrv_common_block_status_above(bs, bs, true, false, offset,
+-                                         bytes, pnum ? pnum : &dummy, NULL,
+-                                         NULL, NULL);
+-    if (ret < 0) {
+-        return ret;
+-    }
+-    return !!(ret & BDRV_BLOCK_ALLOCATED);
+-}
+-
+-/* See bdrv_is_allocated_above for documentation */
+-int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
+-                                            BlockDriverState *base,
+-                                            bool include_base, int64_t offset,
+-                                            int64_t bytes, int64_t *pnum)
+-{
+-    int depth;
+-    int ret;
+-    IO_CODE();
+-
+-    ret = bdrv_co_common_block_status_above(top, base, include_base, false,
+-                                            offset, bytes, pnum, NULL, NULL,
+-                                            &depth);
+-    if (ret < 0) {
+-        return ret;
+-    }
+-
+-    if (ret & BDRV_BLOCK_ALLOCATED) {
+-        return depth;
+-    }
+-    return 0;
+-}
+-
+ /*
+  * Given an image chain: ... -> [BASE] -> [INTER1] -> [INTER2] -> [TOP]
+  *
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
+  * words, the result is not necessarily the maximum possible range);
+  * but 'pnum' will only be 0 when end of file is reached.
+  */
+-int bdrv_is_allocated_above(BlockDriverState *top,
+-                            BlockDriverState *base,
+-                            bool include_base, int64_t offset,
+-                            int64_t bytes, int64_t *pnum)
++int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *bs,
++                                            BlockDriverState *base,
++                                            bool include_base, int64_t offset,
++                                            int64_t bytes, int64_t *pnum)
+ {
+     int depth;
+     int ret;
+     IO_CODE();
+-    ret = bdrv_common_block_status_above(top, base, include_base, false,
+-                                         offset, bytes, pnum, NULL, NULL,
+-                                         &depth);
++    ret = bdrv_co_common_block_status_above(bs, base, include_base, false,
++                                            offset, bytes, pnum, NULL, NULL,
++                                            &depth);
+     if (ret < 0) {
+         return ret;
+     }
+--
+.41.0

-New patch
+[PULL 04/26] block: convert more bdrv_is_allocated* and bdrv_block_status* calls to coroutine versions
+From: Paolo Bonzini <pbonzini@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Message-ID: <20230904100306.156197-5-pbonzini@redhat.com>
+Reviewed-by: Kevin Wolf <kwolf@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block/copy-before-write.c |  2 +-
+ block/copy-on-read.c      |  8 ++++----
+ block/io.c                |  6 +++---
+ block/mirror.c            | 10 +++++-----
+ block/qcow2.c             |  5 +++--
+ block/replication.c       |  8 ++++----
+ block/stream.c            |  8 ++++----
+ block/vvfat.c             | 18 +++++++++---------
+files changed, 33 insertions(+), 32 deletions(-)
+diff --git a/block/copy-before-write.c b/block/copy-before-write.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/copy-before-write.c
++++ b/block/copy-before-write.c
+@@ -XXX,XX +XXX,XX @@ cbw_co_snapshot_block_status(BlockDriverState *bs,
+         return -EACCES;
+     }
+-    ret = bdrv_block_status(child->bs, offset, cur_bytes, pnum, map, file);
++    ret = bdrv_co_block_status(child->bs, offset, cur_bytes, pnum, map, file);
+     if (child == s->target) {
+         /*
+          * We refer to s->target only for areas that we've written to it.
+diff --git a/block/copy-on-read.c b/block/copy-on-read.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/copy-on-read.c
++++ b/block/copy-on-read.c
+@@ -XXX,XX +XXX,XX @@ cor_co_preadv_part(BlockDriverState *bs, int64_t offset, int64_t bytes,
+         local_flags = flags;
+         /* In case of failure, try to copy-on-read anyway */
+-        ret = bdrv_is_allocated(bs->file->bs, offset, bytes, &n);
++        ret = bdrv_co_is_allocated(bs->file->bs, offset, bytes, &n);
+         if (ret <= 0) {
+-            ret = bdrv_is_allocated_above(bdrv_backing_chain_next(bs->file->bs),
+-                                          state->bottom_bs, true, offset,
+-                                          n, &n);
++            ret = bdrv_co_is_allocated_above(bdrv_backing_chain_next(bs->file->bs),
++                                             state->bottom_bs, true, offset,
++                                             n, &n);
+             if (ret > 0 || ret < 0) {
+                 local_flags |= BDRV_REQ_COPY_ON_READ;
+             }
+diff --git a/block/io.c b/block/io.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/io.c
++++ b/block/io.c
+@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
+             ret = 1; /* "already allocated", so nothing will be copied */
+             pnum = MIN(align_bytes, max_transfer);
+         } else {
+-            ret = bdrv_is_allocated(bs, align_offset,
+-                                    MIN(align_bytes, max_transfer), &pnum);
++            ret = bdrv_co_is_allocated(bs, align_offset,
++                                       MIN(align_bytes, max_transfer), &pnum);
+             if (ret < 0) {
+                 /*
+                  * Safe to treat errors in querying allocation as if
+@@ -XXX,XX +XXX,XX @@ bdrv_aligned_preadv(BdrvChild *child, BdrvTrackedRequest *req,
+         /* The flag BDRV_REQ_COPY_ON_READ has reached its addressee */
+         flags &= ~BDRV_REQ_COPY_ON_READ;
+-        ret = bdrv_is_allocated(bs, offset, bytes, &pnum);
++        ret = bdrv_co_is_allocated(bs, offset, bytes, &pnum);
+         if (ret < 0) {
+             goto out;
+         }
+diff --git a/block/mirror.c b/block/mirror.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/mirror.c
++++ b/block/mirror.c
+@@ -XXX,XX +XXX,XX @@ static void coroutine_fn mirror_iteration(MirrorBlockJob *s)
+         assert(!(offset % s->granularity));
+         WITH_GRAPH_RDLOCK_GUARD() {
+-            ret = bdrv_block_status_above(source, NULL, offset,
+-                                        nb_chunks * s->granularity,
+-                                        &io_bytes, NULL, NULL);
++            ret = bdrv_co_block_status_above(source, NULL, offset,
++                                             nb_chunks * s->granularity,
++                                             &io_bytes, NULL, NULL);
+         }
+         if (ret < 0) {
+             io_bytes = MIN(nb_chunks * s->granularity, max_io_bytes);
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
+         }
+         WITH_GRAPH_RDLOCK_GUARD() {
+-            ret = bdrv_is_allocated_above(bs, s->base_overlay, true, offset,
+-                                          bytes, &count);
++            ret = bdrv_co_is_allocated_above(bs, s->base_overlay, true, offset,
++                                             bytes, &count);
+         }
+         if (ret < 0) {
+             return ret;
+diff --git a/block/qcow2.c b/block/qcow2.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2.c
++++ b/block/qcow2.c
+@@ -XXX,XX +XXX,XX @@ finish:
+ }
+-static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes)
++static bool coroutine_fn GRAPH_RDLOCK
++is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes)
+ {
+     int64_t nr;
+     int res;
+@@ -XXX,XX +XXX,XX @@ static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes)
+      * backing file. So, we need a loop.
+      */
+     do {
+-        res = bdrv_block_status_above(bs, NULL, offset, bytes, &nr, NULL, NULL);
++        res = bdrv_co_block_status_above(bs, NULL, offset, bytes, &nr, NULL, NULL);
+         offset += nr;
+         bytes -= nr;
+     } while (res >= 0 && (res & BDRV_BLOCK_ZERO) && nr && bytes);
+diff --git a/block/replication.c b/block/replication.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/replication.c
++++ b/block/replication.c
+@@ -XXX,XX +XXX,XX @@ replication_co_writev(BlockDriverState *bs, int64_t sector_num,
+     while (remaining_sectors > 0) {
+         int64_t count;
+-        ret = bdrv_is_allocated_above(top->bs, base->bs, false,
+-                                      sector_num * BDRV_SECTOR_SIZE,
+-                                      remaining_sectors * BDRV_SECTOR_SIZE,
+-                                      &count);
++        ret = bdrv_co_is_allocated_above(top->bs, base->bs, false,
++                                         sector_num * BDRV_SECTOR_SIZE,
++                                         remaining_sectors * BDRV_SECTOR_SIZE,
++                                         &count);
+         if (ret < 0) {
+             goto out1;
+         }
+diff --git a/block/stream.c b/block/stream.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/stream.c
++++ b/block/stream.c
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn stream_run(Job *job, Error **errp)
+         copy = false;
+         WITH_GRAPH_RDLOCK_GUARD() {
+-            ret = bdrv_is_allocated(unfiltered_bs, offset, STREAM_CHUNK, &n);
++            ret = bdrv_co_is_allocated(unfiltered_bs, offset, STREAM_CHUNK, &n);
+             if (ret == 1) {
+                 /* Allocated in the top, no need to copy.  */
+             } else if (ret >= 0) {
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn stream_run(Job *job, Error **errp)
+                  * Copy if allocated in the intermediate images.  Limit to the
+                  * known-unallocated area [offset, offset+n*BDRV_SECTOR_SIZE).
+                  */
+-                ret = bdrv_is_allocated_above(bdrv_cow_bs(unfiltered_bs),
+-                                            s->base_overlay, true,
+-                                            offset, n, &n);
++                ret = bdrv_co_is_allocated_above(bdrv_cow_bs(unfiltered_bs),
++                                                 s->base_overlay, true,
++                                                 offset, n, &n);
+                 /* Finish early if end of backing file has been reached */
+                 if (ret == 0 && n == 0) {
+                     n = len - offset;
+diff --git a/block/vvfat.c b/block/vvfat.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/vvfat.c
++++ b/block/vvfat.c
+@@ -XXX,XX +XXX,XX @@ vvfat_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sector
+         if (s->qcow) {
+             int64_t n;
+             int ret;
+-            ret = bdrv_is_allocated(s->qcow->bs, sector_num * BDRV_SECTOR_SIZE,
+-                                    (nb_sectors - i) * BDRV_SECTOR_SIZE, &n);
++            ret = bdrv_co_is_allocated(s->qcow->bs, sector_num * BDRV_SECTOR_SIZE,
++                                       (nb_sectors - i) * BDRV_SECTOR_SIZE, &n);
+             if (ret < 0) {
+                 return ret;
+             }
+@@ -XXX,XX +XXX,XX @@ cluster_was_modified(BDRVVVFATState *s, uint32_t cluster_num)
+     }
+     for (i = 0; !was_modified && i < s->sectors_per_cluster; i++) {
+-        was_modified = bdrv_is_allocated(s->qcow->bs,
+-                                         (cluster2sector(s, cluster_num) +
+-                                          i) * BDRV_SECTOR_SIZE,
+-                                         BDRV_SECTOR_SIZE, NULL);
++        was_modified = bdrv_co_is_allocated(s->qcow->bs,
++                                            (cluster2sector(s, cluster_num) +
++                                             i) * BDRV_SECTOR_SIZE,
++                                            BDRV_SECTOR_SIZE, NULL);
+     }
+     /*
+@@ -XXX,XX +XXX,XX @@ get_cluster_count_for_direntry(BDRVVVFATState* s, direntry_t* direntry, const ch
+                 for (i = 0; i < s->sectors_per_cluster; i++) {
+                     int res;
+-                    res = bdrv_is_allocated(s->qcow->bs,
+-                                            (offs + i) * BDRV_SECTOR_SIZE,
+-                                            BDRV_SECTOR_SIZE, NULL);
++                    res = bdrv_co_is_allocated(s->qcow->bs,
++                                               (offs + i) * BDRV_SECTOR_SIZE,
++                                               BDRV_SECTOR_SIZE, NULL);
+                     if (res < 0) {
+                         return -1;
+                     }
+--
+.41.0

-New patch
+[PULL 05/26] test-bdrv-drain: Don't call bdrv_graph_wrlock() in coroutine context
+AIO callbacks are effectively coroutine_mixed_fn. If AIO requests don't
+return immediately, their callback is called from the request coroutine.
+This means that in AIO callbacks, we can't call no_coroutine_fns such as
+bdrv_graph_wrlock(). Unfortunately test-bdrv-drain does so.
+Change the test to use a BH to drop out of coroutine context, and add
+coroutine_mixed_fn and no_coroutine_fn markers to clarify the context
+each function runs in.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-2-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ tests/unit/test-bdrv-drain.c | 7 ++++---
+file changed, 4 insertions(+), 3 deletions(-)
+diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c
+index XXXXXXX..XXXXXXX 100644
+--- a/tests/unit/test-bdrv-drain.c
++++ b/tests/unit/test-bdrv-drain.c
+@@ -XXX,XX +XXX,XX @@ struct detach_by_parent_data {
+ };
+ static struct detach_by_parent_data detach_by_parent_data;
+-static void detach_indirect_bh(void *opaque)
++static void no_coroutine_fn detach_indirect_bh(void *opaque)
+ {
+     struct detach_by_parent_data *data = opaque;
+@@ -XXX,XX +XXX,XX @@ static void detach_indirect_bh(void *opaque)
+     bdrv_graph_wrunlock();
+ }
+-static void detach_by_parent_aio_cb(void *opaque, int ret)
++static void coroutine_mixed_fn detach_by_parent_aio_cb(void *opaque, int ret)
+ {
+     struct detach_by_parent_data *data = &detach_by_parent_data;
+     g_assert_cmpint(ret, ==, 0);
+     if (data->by_parent_cb) {
+         bdrv_inc_in_flight(data->child_b->bs);
+-        detach_indirect_bh(data);
++        aio_bh_schedule_oneshot(qemu_get_current_aio_context(),
++                                detach_indirect_bh, &detach_by_parent_data);
+     }
+ }
+--
+.41.0

-New patch
+[PULL 06/26] block-coroutine-wrapper: Add no_co_wrapper_bdrv_rdlock functions
+Add a new wrapper type for GRAPH_RDLOCK functions that should be called
+from coroutine context.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-3-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block-common.h       |  7 +++++--
+ scripts/block-coroutine-wrapper.py | 10 +++++++---
+files changed, 12 insertions(+), 5 deletions(-)
+diff --git a/include/block/block-common.h b/include/block/block-common.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-common.h
++++ b/include/block/block-common.h
+@@ -XXX,XX +XXX,XX @@
+  * function. The coroutine yields after scheduling the BH and is reentered when
+  * the wrapped function returns.
+  *
+- * A no_co_wrapper_bdrv_wrlock function is a no_co_wrapper function that
+- * automatically takes the graph wrlock when calling the wrapped function.
++ * A no_co_wrapper_bdrv_rdlock function is a no_co_wrapper function that
++ * automatically takes the graph rdlock when calling the wrapped function. In
++ * the same way, no_co_wrapper_bdrv_wrlock functions automatically take the
++ * graph wrlock.
+  *
+  * If the first parameter of the function is a BlockDriverState, BdrvChild or
+  * BlockBackend pointer, the AioContext lock for it is taken in the wrapper.
+  */
+ #define no_co_wrapper
++#define no_co_wrapper_bdrv_rdlock
+ #define no_co_wrapper_bdrv_wrlock
+ #include "block/blockjob.h"
+diff --git a/scripts/block-coroutine-wrapper.py b/scripts/block-coroutine-wrapper.py
+index XXXXXXX..XXXXXXX 100644
+--- a/scripts/block-coroutine-wrapper.py
++++ b/scripts/block-coroutine-wrapper.py
+@@ -XXX,XX +XXX,XX @@ def __init__(self, wrapper_type: str, return_type: str, name: str,
+                 raise ValueError(f"Invalid no_co function name: {self.name}")
+             if not self.create_only_co:
+                 raise ValueError(f"no_co function can't be mixed: {self.name}")
+-            if self.graph_rdlock:
+-                raise ValueError(f"no_co function can't be rdlock: {self.name}")
++            if self.graph_rdlock and self.graph_wrlock:
++                raise ValueError("function can't be both rdlock and wrlock: "
++                                 f"{self.name}")
+             self.target_name = f'{subsystem}_{subname}'
+         self.ctx = self.gen_ctx()
+@@ -XXX,XX +XXX,XX @@ def gen_no_co_wrapper(func: FuncDecl) -> str:
+     graph_lock=''
+     graph_unlock=''
+-    if func.graph_wrlock:
++    if func.graph_rdlock:
++        graph_lock='    bdrv_graph_rdlock_main_loop();'
++        graph_unlock='    bdrv_graph_rdunlock_main_loop();'
++    elif func.graph_wrlock:
+         graph_lock='    bdrv_graph_wrlock(NULL);'
+         graph_unlock='    bdrv_graph_wrunlock();'
+--
+.41.0

-New patch
+[PULL 07/26] block: Take graph rdlock in bdrv_inactivate_all()
+The function reads the parents list, so it needs to hold the graph lock.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-4-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block.c | 7 ++++---
+file changed, 4 insertions(+), 3 deletions(-)
+diff --git a/block.c b/block.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block.c
++++ b/block.c
+@@ -XXX,XX +XXX,XX @@ void bdrv_activate_all(Error **errp)
+     }
+ }
+-static bool bdrv_has_bds_parent(BlockDriverState *bs, bool only_active)
++static bool GRAPH_RDLOCK
++bdrv_has_bds_parent(BlockDriverState *bs, bool only_active)
+ {
+     BdrvChild *parent;
+     GLOBAL_STATE_CODE();
+@@ -XXX,XX +XXX,XX @@ static bool bdrv_has_bds_parent(BlockDriverState *bs, bool only_active)
+     return false;
+ }
+-static int bdrv_inactivate_recurse(BlockDriverState *bs)
++static int GRAPH_RDLOCK bdrv_inactivate_recurse(BlockDriverState *bs)
+ {
+     BdrvChild *child, *parent;
+     int ret;
+     uint64_t cumulative_perms, cumulative_shared_perms;
+     GLOBAL_STATE_CODE();
+-    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (!bs->drv) {
+         return -ENOMEDIUM;
+@@ -XXX,XX +XXX,XX @@ int bdrv_inactivate_all(void)
+     GSList *aio_ctxs = NULL, *ctx;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
+         AioContext *aio_context = bdrv_get_aio_context(bs);
+--
+.41.0

-New patch
+[PULL 08/26] block: Mark bdrv_first_blk() and bdrv_is_root_node() GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+bdrv_first_blk() and bdrv_is_root_node() need to hold a reader lock
+for the graph. These functions are the only functions in block-backend.c
+that access the parent list of a node.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-5-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block-global-state.h          |  9 +++++----
+ include/sysemu/block-backend-global-state.h |  4 ++--
+ block.c                                     |  1 +
+ block/block-backend.c                       |  6 +++++-
+ block/export/export.c                       |  4 ++++
+ block/io.c                                  |  1 +
+ block/monitor/block-hmp-cmds.c              |  2 ++
+ block/qapi-sysemu.c                         |  2 ++
+ block/replication.c                         | 10 ++++++++--
+ block/snapshot.c                            | 15 +++++++++++----
+ blockdev.c                                  |  5 +++++
+ migration/block.c                           |  2 ++
+ migration/migration-hmp-cmds.c              |  2 ++
+ tests/unit/test-block-iothread.c            |  3 +++
+files changed, 53 insertions(+), 13 deletions(-)
+diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-global-state.h
++++ b/include/block/block-global-state.h
+@@ -XXX,XX +XXX,XX @@ BlockDriverState * GRAPH_RDLOCK
+ check_to_replace_node(BlockDriverState *parent_bs, const char *node_name,
+                       Error **errp);
+-int no_coroutine_fn bdrv_activate(BlockDriverState *bs, Error **errp);
++int no_coroutine_fn GRAPH_RDLOCK
++bdrv_activate(BlockDriverState *bs, Error **errp);
+-int coroutine_fn no_co_wrapper
++int coroutine_fn no_co_wrapper_bdrv_rdlock
+ bdrv_co_activate(BlockDriverState *bs, Error **errp);
+ void bdrv_activate_all(Error **errp);
+@@ -XXX,XX +XXX,XX @@ typedef struct BdrvNextIterator {
+     BlockDriverState *bs;
+ } BdrvNextIterator;
+-BlockDriverState *bdrv_first(BdrvNextIterator *it);
+-BlockDriverState *bdrv_next(BdrvNextIterator *it);
++BlockDriverState * GRAPH_RDLOCK bdrv_first(BdrvNextIterator *it);
++BlockDriverState * GRAPH_RDLOCK bdrv_next(BdrvNextIterator *it);
+ void bdrv_next_cleanup(BdrvNextIterator *it);
+ BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs);
+diff --git a/include/sysemu/block-backend-global-state.h b/include/sysemu/block-backend-global-state.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/sysemu/block-backend-global-state.h
++++ b/include/sysemu/block-backend-global-state.h
+@@ -XXX,XX +XXX,XX @@ BlockBackend *blk_by_public(BlockBackendPublic *public);
+ void blk_remove_bs(BlockBackend *blk);
+ int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs, Error **errp);
+ int blk_replace_bs(BlockBackend *blk, BlockDriverState *new_bs, Error **errp);
+-bool bdrv_has_blk(BlockDriverState *bs);
+-bool bdrv_is_root_node(BlockDriverState *bs);
++bool GRAPH_RDLOCK bdrv_has_blk(BlockDriverState *bs);
++bool GRAPH_RDLOCK bdrv_is_root_node(BlockDriverState *bs);
+ int GRAPH_UNLOCKED blk_set_perm(BlockBackend *blk, uint64_t perm,
+                                 uint64_t shared_perm, Error **errp);
+ void blk_get_perm(BlockBackend *blk, uint64_t *perm, uint64_t *shared_perm);
+diff --git a/block.c b/block.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block.c
++++ b/block.c
+@@ -XXX,XX +XXX,XX @@ void bdrv_activate_all(Error **errp)
+     BdrvNextIterator it;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
+         AioContext *aio_context = bdrv_get_aio_context(bs);
+diff --git a/block/block-backend.c b/block/block-backend.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/block-backend.c
++++ b/block/block-backend.c
+@@ -XXX,XX +XXX,XX @@ BlockDriverState *blk_bs(BlockBackend *blk)
+     return blk->root ? blk->root->bs : NULL;
+ }
+-static BlockBackend *bdrv_first_blk(BlockDriverState *bs)
++static BlockBackend * GRAPH_RDLOCK bdrv_first_blk(BlockDriverState *bs)
+ {
+     BdrvChild *child;
+     GLOBAL_STATE_CODE();
++    assert_bdrv_graph_readable();
+     QLIST_FOREACH(child, &bs->parents, next_parent) {
+         if (child->klass == &child_root) {
+@@ -XXX,XX +XXX,XX @@ bool bdrv_is_root_node(BlockDriverState *bs)
+     BdrvChild *c;
+     GLOBAL_STATE_CODE();
++    assert_bdrv_graph_readable();
++
+     QLIST_FOREACH(c, &bs->parents, next_parent) {
+         if (c->klass != &child_root) {
+             return false;
+@@ -XXX,XX +XXX,XX @@ void blk_activate(BlockBackend *blk, Error **errp)
+     if (qemu_in_coroutine()) {
+         bdrv_co_activate(bs, errp);
+     } else {
++        GRAPH_RDLOCK_GUARD_MAINLOOP();
+         bdrv_activate(bs, errp);
+     }
+ }
+diff --git a/block/export/export.c b/block/export/export.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/export/export.c
++++ b/block/export/export.c
+@@ -XXX,XX +XXX,XX @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
+     uint64_t perm;
+     int ret;
++    GLOBAL_STATE_CODE();
++
+     if (!id_wellformed(export->id)) {
+         error_setg(errp, "Invalid block export id");
+         return NULL;
+@@ -XXX,XX +XXX,XX @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
+      * access since the export could be available before migration handover.
+      * ctx was acquired in the caller.
+      */
++    bdrv_graph_rdlock_main_loop();
+     bdrv_activate(bs, NULL);
++    bdrv_graph_rdunlock_main_loop();
+     perm = BLK_PERM_CONSISTENT_READ;
+     if (export->writable) {
+diff --git a/block/io.c b/block/io.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/io.c
++++ b/block/io.c
+@@ -XXX,XX +XXX,XX @@ int bdrv_flush_all(void)
+     int result = 0;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     /*
+      * bdrv queue is managed by record/replay,
+diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/monitor/block-hmp-cmds.c
++++ b/block/monitor/block-hmp-cmds.c
+@@ -XXX,XX +XXX,XX @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
+     SnapshotEntry *snapshot_entry;
+     Error *err = NULL;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     bs = bdrv_all_find_vmstate_bs(NULL, false, NULL, &err);
+     if (!bs) {
+         error_report_err(err);
+diff --git a/block/qapi-sysemu.c b/block/qapi-sysemu.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qapi-sysemu.c
++++ b/block/qapi-sysemu.c
+@@ -XXX,XX +XXX,XX @@ static void blockdev_insert_medium(const char *device, const char *id,
+     BlockBackend *blk;
+     BlockDriverState *bs;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     blk = qmp_get_blk(device, id, errp);
+     if (!blk) {
+         return;
+diff --git a/block/replication.c b/block/replication.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/replication.c
++++ b/block/replication.c
+@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
+     Error *local_err = NULL;
+     BackupPerf perf = { .use_copy_range = true, .max_workers = 1 };
++    GLOBAL_STATE_CODE();
++
+     aio_context = bdrv_get_aio_context(bs);
+     aio_context_acquire(aio_context);
+     s = bs->opaque;
+@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
+             return;
+         }
++        bdrv_graph_rdlock_main_loop();
+         secondary_disk = hidden_disk->bs->backing;
+         if (!secondary_disk->bs || !bdrv_has_blk(secondary_disk->bs)) {
+             error_setg(errp, "The secondary disk doesn't have block backend");
++            bdrv_graph_rdunlock_main_loop();
+             aio_context_release(aio_context);
+             return;
+         }
++        bdrv_graph_rdunlock_main_loop();
+         /* verify the length */
+         active_length = bdrv_getlength(active_disk->bs);
+@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
+             return;
+         }
+-        bdrv_graph_wrunlock();
+-
+         /* start backup job now */
+         error_setg(&s->blocker,
+                    "Block device is in use by internal backup job");
+@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
+         if (!top_bs || !bdrv_is_root_node(top_bs) ||
+             !check_top_bs(top_bs, bs)) {
+             error_setg(errp, "No top_bs or it is invalid");
++            bdrv_graph_wrunlock();
+             reopen_backing_file(bs, false, NULL);
+             aio_context_release(aio_context);
+             return;
+@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
+         bdrv_op_block_all(top_bs, s->blocker);
+         bdrv_op_unblock(top_bs, BLOCK_OP_TYPE_DATAPLANE, s->blocker);
++        bdrv_graph_wrunlock();
++
+         s->backup_job = backup_job_create(
+                                 NULL, s->secondary_disk->bs, s->hidden_disk->bs,
+, MIRROR_SYNC_MODE_NONE, NULL, 0, false, NULL,
+diff --git a/block/snapshot.c b/block/snapshot.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/snapshot.c
++++ b/block/snapshot.c
+@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs,
+ }
+-static int bdrv_all_get_snapshot_devices(bool has_devices, strList *devices,
+-                                         GList **all_bdrvs,
+-                                         Error **errp)
++static int GRAPH_RDLOCK
++bdrv_all_get_snapshot_devices(bool has_devices, strList *devices,
++                              GList **all_bdrvs, Error **errp)
+ {
+     g_autoptr(GList) bdrvs = NULL;
+@@ -XXX,XX +XXX,XX @@ static int bdrv_all_get_snapshot_devices(bool has_devices, strList *devices,
+ }
+-static bool bdrv_all_snapshots_includes_bs(BlockDriverState *bs)
++static bool GRAPH_RDLOCK bdrv_all_snapshots_includes_bs(BlockDriverState *bs)
+ {
+     if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
+         return false;
+@@ -XXX,XX +XXX,XX @@ bool bdrv_all_can_snapshot(bool has_devices, strList *devices,
+     GList *iterbdrvs;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
+         return false;
+@@ -XXX,XX +XXX,XX @@ int bdrv_all_delete_snapshot(const char *name,
+     GList *iterbdrvs;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
+         return -1;
+@@ -XXX,XX +XXX,XX @@ int bdrv_all_goto_snapshot(const char *name,
+     GList *iterbdrvs;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
+         return -1;
+@@ -XXX,XX +XXX,XX @@ int bdrv_all_has_snapshot(const char *name,
+     GList *iterbdrvs;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
+         return -1;
+@@ -XXX,XX +XXX,XX @@ int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
+ {
+     g_autoptr(GList) bdrvs = NULL;
+     GList *iterbdrvs;
++
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
+         return -1;
+@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_all_find_vmstate_bs(const char *vmstate_bs,
+     GList *iterbdrvs;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
+         return NULL;
+diff --git a/blockdev.c b/blockdev.c
+index XXXXXXX..XXXXXXX 100644
+--- a/blockdev.c
++++ b/blockdev.c
+@@ -XXX,XX +XXX,XX @@ static BlockDriverState *qmp_get_root_bs(const char *name, Error **errp)
+     BlockDriverState *bs;
+     AioContext *aio_context;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     bs = bdrv_lookup_bs(name, name, errp);
+     if (bs == NULL) {
+         return NULL;
+@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_del(const char *node_name, Error **errp)
+     BlockDriverState *bs;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     bs = bdrv_find_node(node_name);
+     if (!bs) {
+@@ -XXX,XX +XXX,XX @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread,
+     AioContext *new_context;
+     BlockDriverState *bs;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     bs = bdrv_find_node(node_name);
+     if (!bs) {
+         error_setg(errp, "Failed to find node with node-name='%s'", node_name);
+diff --git a/migration/block.c b/migration/block.c
+index XXXXXXX..XXXXXXX 100644
+--- a/migration/block.c
++++ b/migration/block.c
+@@ -XXX,XX +XXX,XX @@ static int init_blk_migration(QEMUFile *f)
+     Error *local_err = NULL;
+     int ret;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     block_mig_state.submitted = 0;
+     block_mig_state.read_done = 0;
+     block_mig_state.transferred = 0;
+diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
+index XXXXXXX..XXXXXXX 100644
+--- a/migration/migration-hmp-cmds.c
++++ b/migration/migration-hmp-cmds.c
+@@ -XXX,XX +XXX,XX @@ static void vm_completion(ReadLineState *rs, const char *str)
+     BlockDriverState *bs;
+     BdrvNextIterator it;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     len = strlen(str);
+     readline_set_completion_index(rs, len);
+diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c
+index XXXXXXX..XXXXXXX 100644
+--- a/tests/unit/test-block-iothread.c
++++ b/tests/unit/test-block-iothread.c
+@@ -XXX,XX +XXX,XX @@ static void test_sync_op_check(BdrvChild *c)
+ static void test_sync_op_activate(BdrvChild *c)
+ {
++    GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     /* Early success: Image is not inactive */
+     bdrv_activate(c->bs, NULL);
+ }
+--
+.41.0

-New patch
+[PULL 09/26] block: Mark drain related functions GRAPH_RDLOCK
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
 Draining recursively traverses the graph, therefore we need to make sure
 that also such accesses to the graph are protected by the graph rdlock.
 There are 3 different drain callers to consider:
 . drain in the main loop: no issue at all, rdlock is nop.
 . drain in an iothread: rdlock only works in main loop or coroutines,
    so disallow it.
 . drain in a coroutine (regardless of AioContext): the drain mechanism
    takes care of scheduling a BH in the bs->aio_context that will
    then take care of perform the actual draining. This is wrong,
    because as pointed in (2) if bs->aio_context is an iothread then
    rdlock won't work. Therefore change bdrv_co_yield_to_drain to
    schedule the BH in the main loop.
 Caller (2) also implies that we need to modify test-bdrv-drain.c to
 disallow draining in the iothreads.
 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: Emanuele Giuseppe Esposito <eesposit@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 Message-ID: <20230929145157.45443-6-kwolf@redhat.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
  include/block/block-io.h         | 23 ++++++++++++++++++-----
  include/block/block_int-common.h |  6 +++---
  block.c                          |  6 +++---
  block/io.c                       | 32 ++++++++++++++++++++++++++++----
  tests/unit/test-bdrv-drain.c     |  4 ++--
 files changed, 54 insertions(+), 17 deletions(-)
 diff --git a/include/block/block-io.h b/include/block/block-io.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/block/block-io.h
 +++ b/include/block/block-io.h
@@ -XXX,XX +XXX,XX @@ bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
   *
   * Begin a quiesced section for the parent of @c.
   */
 -void bdrv_parent_drained_begin_single(BdrvChild *c);
 +void GRAPH_RDLOCK bdrv_parent_drained_begin_single(BdrvChild *c);
  /**
   * bdrv_parent_drained_poll_single:
@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_begin_single(BdrvChild *c);
   * Returns true if there is any pending activity to cease before @c can be
   * called quiesced, false otherwise.
   */
 -bool bdrv_parent_drained_poll_single(BdrvChild *c);
 +bool GRAPH_RDLOCK bdrv_parent_drained_poll_single(BdrvChild *c);
  /**
   * bdrv_parent_drained_end_single:
   *
   * End a quiesced section for the parent of @c.
   */
 -void bdrv_parent_drained_end_single(BdrvChild *c);
 +void GRAPH_RDLOCK bdrv_parent_drained_end_single(BdrvChild *c);
  /**
   * bdrv_drain_poll:
@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_end_single(BdrvChild *c);
   *
   * This is part of bdrv_drained_begin.
   */
 -bool bdrv_drain_poll(BlockDriverState *bs, BdrvChild *ignore_parent,
 -                     bool ignore_bds_parents);
 +bool GRAPH_RDLOCK
 +bdrv_drain_poll(BlockDriverState *bs, BdrvChild *ignore_parent,
 +                bool ignore_bds_parents);
  /**
   * bdrv_drained_begin:
@@ -XXX,XX +XXX,XX @@ bool bdrv_drain_poll(BlockDriverState *bs, BdrvChild *ignore_parent,
   * Begin a quiesced section for exclusive access to the BDS, by disabling
   * external request sources including NBD server, block jobs, and device model.
   *
 + * This function can only be invoked by the main loop or a coroutine
 + * (regardless of the AioContext where it is running).
 + * If the coroutine is running in an Iothread AioContext, this function will
 + * just schedule a BH to run in the main loop.
 + * However, it cannot be directly called by an Iothread.
 + *
   * This function can be recursive.
   */
  void bdrv_drained_begin(BlockDriverState *bs);
@@ -XXX,XX +XXX,XX @@ void bdrv_do_drained_begin_quiesce(BlockDriverState *bs, BdrvChild *parent);
   * bdrv_drained_end:
   *
   * End a quiescent section started by bdrv_drained_begin().
 + *
 + * This function can only be invoked by the main loop or a coroutine
 + * (regardless of the AioContext where it is running).
 + * If the coroutine is running in an Iothread AioContext, this function will
 + * just schedule a BH to run in the main loop.
 + * However, it cannot be directly called by an Iothread.
   */
  void bdrv_drained_end(BlockDriverState *bs);
 diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/block/block_int-common.h
 +++ b/include/block/block_int-common.h
@@ -XXX,XX +XXX,XX @@ struct BdrvChildClass {
       * Note that this can be nested. If drained_begin() was called twice, new
       * I/O is allowed only after drained_end() was called twice, too.
       */
 -    void (*drained_begin)(BdrvChild *child);
 -    void (*drained_end)(BdrvChild *child);
 +    void GRAPH_RDLOCK_PTR (*drained_begin)(BdrvChild *child);
 +    void GRAPH_RDLOCK_PTR (*drained_end)(BdrvChild *child);
      /*
       * Returns whether the parent has pending requests for the child. This
       * callback is polled after .drained_begin() has been called until all
       * activity on the child has stopped.
       */
 -    bool (*drained_poll)(BdrvChild *child);
 +    bool GRAPH_RDLOCK_PTR (*drained_poll)(BdrvChild *child);
      /*
       * Notifies the parent that the filename of its child has changed (e.g.
 diff --git a/block.c b/block.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block.c
 +++ b/block.c
@@ -XXX,XX +XXX,XX @@ static char *bdrv_child_get_parent_desc(BdrvChild *c)
      return g_strdup_printf("node '%s'", bdrv_get_node_name(parent));
  }
 -static void bdrv_child_cb_drained_begin(BdrvChild *child)
 +static void GRAPH_RDLOCK bdrv_child_cb_drained_begin(BdrvChild *child)
  {
      BlockDriverState *bs = child->opaque;
      bdrv_do_drained_begin_quiesce(bs, NULL);
  }
 -static bool bdrv_child_cb_drained_poll(BdrvChild *child)
 +static bool GRAPH_RDLOCK bdrv_child_cb_drained_poll(BdrvChild *child)
  {
      BlockDriverState *bs = child->opaque;
      return bdrv_drain_poll(bs, NULL, false);
  }
 -static void bdrv_child_cb_drained_end(BdrvChild *child)
 +static void GRAPH_RDLOCK bdrv_child_cb_drained_end(BdrvChild *child)
  {
      BlockDriverState *bs = child->opaque;
      bdrv_drained_end(bs);
 diff --git a/block/io.c b/block/io.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/io.c
 +++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ static void bdrv_parent_cb_resize(BlockDriverState *bs);
  static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,
      int64_t offset, int64_t bytes, BdrvRequestFlags flags);
 -static void bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore)
 +static void GRAPH_RDLOCK
 +bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore)
  {
      BdrvChild *c, *next;
 +    IO_OR_GS_CODE();
 +    assert_bdrv_graph_readable();
      QLIST_FOREACH_SAFE(c, &bs->parents, next_parent, next) {
          if (c == ignore) {
@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_end_single(BdrvChild *c)
      }
  }
 -static void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore)
 +static void GRAPH_RDLOCK
 +bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore)
  {
      BdrvChild *c;
 +    IO_OR_GS_CODE();
 +    assert_bdrv_graph_readable();
      QLIST_FOREACH(c, &bs->parents, next_parent) {
          if (c == ignore) {
@@ -XXX,XX +XXX,XX @@ static void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore)
  bool bdrv_parent_drained_poll_single(BdrvChild *c)
  {
 +    IO_OR_GS_CODE();
 +
      if (c->klass->drained_poll) {
          return c->klass->drained_poll(c);
      }
      return false;
  }
 -static bool bdrv_parent_drained_poll(BlockDriverState *bs, BdrvChild *ignore,
 -                                     bool ignore_bds_parents)
 +static bool GRAPH_RDLOCK
 +bdrv_parent_drained_poll(BlockDriverState *bs, BdrvChild *ignore,
 +                         bool ignore_bds_parents)
  {
      BdrvChild *c, *next;
      bool busy = false;
 +    IO_OR_GS_CODE();
 +    assert_bdrv_graph_readable();
      QLIST_FOREACH_SAFE(c, &bs->parents, next_parent, next) {
          if (c == ignore || (ignore_bds_parents && c->klass->parent_is_bds)) {
@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_begin_single(BdrvChild *c)
      c->quiesced_parent = true;
      if (c->klass->drained_begin) {
 +        /* called with rdlock taken, but it doesn't really need it. */
          c->klass->drained_begin(c);
      }
  }
@@ -XXX,XX +XXX,XX @@ bool bdrv_drain_poll(BlockDriverState *bs, BdrvChild *ignore_parent,
  static bool bdrv_drain_poll_top_level(BlockDriverState *bs,
                                        BdrvChild *ignore_parent)
  {
 +    GLOBAL_STATE_CODE();
 +    GRAPH_RDLOCK_GUARD_MAINLOOP();
 +
      return bdrv_drain_poll(bs, ignore_parent, false);
  }
@@ -XXX,XX +XXX,XX @@ static void bdrv_do_drained_begin(BlockDriverState *bs, BdrvChild *parent,
      /* Stop things in parent-to-child order */
      if (qatomic_fetch_inc(&bs->quiesce_counter) == 0) {
 +        GRAPH_RDLOCK_GUARD_MAINLOOP();
          bdrv_parent_drained_begin(bs, parent);
          if (bs->drv && bs->drv->bdrv_drain_begin) {
              bs->drv->bdrv_drain_begin(bs);
@@ -XXX,XX +XXX,XX @@ static void bdrv_do_drained_end(BlockDriverState *bs, BdrvChild *parent)
          bdrv_co_yield_to_drain(bs, false, parent, false);
          return;
      }
 +
 +    /* At this point, we should be always running in the main loop. */
 +    GLOBAL_STATE_CODE();
      assert(bs->quiesce_counter > 0);
      GLOBAL_STATE_CODE();
      /* Re-enable things in child-to-parent order */
      old_quiesce_counter = qatomic_fetch_dec(&bs->quiesce_counter);
      if (old_quiesce_counter == 1) {
 +        GRAPH_RDLOCK_GUARD_MAINLOOP();
          if (bs->drv && bs->drv->bdrv_drain_end) {
              bs->drv->bdrv_drain_end(bs);
          }
@@ -XXX,XX +XXX,XX @@ void bdrv_drain(BlockDriverState *bs)
  static void bdrv_drain_assert_idle(BlockDriverState *bs)
  {
      BdrvChild *child, *next;
 +    GLOBAL_STATE_CODE();
 +    GRAPH_RDLOCK_GUARD_MAINLOOP();
      assert(qatomic_read(&bs->in_flight) == 0);
      QLIST_FOREACH_SAFE(child, &bs->children, next, next) {
@@ -XXX,XX +XXX,XX @@ static bool bdrv_drain_all_poll(void)
  {
      BlockDriverState *bs = NULL;
      bool result = false;
 +
      GLOBAL_STATE_CODE();
 +    GRAPH_RDLOCK_GUARD_MAINLOOP();
      /* bdrv_drain_poll() can't make changes to the graph and we are holding the
       * main AioContext lock, so iterating bdrv_next_all_states() is safe. */
 diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/unit/test-bdrv-drain.c
 +++ b/tests/unit/test-bdrv-drain.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_mixed_fn detach_by_parent_aio_cb(void *opaque, int ret)
      }
  }
 -static void detach_by_driver_cb_drained_begin(BdrvChild *child)
 +static void GRAPH_RDLOCK detach_by_driver_cb_drained_begin(BdrvChild *child)
  {
      struct detach_by_parent_data *data = &detach_by_parent_data;
@@ -XXX,XX +XXX,XX @@ static BdrvChildClass detach_by_driver_cb_class;
   *     state is messed up, but if it is only polled in the single
   *     BDRV_POLL_WHILE() at the end of the drain, this should work fine.
   */
 -static void test_detach_indirect(bool by_parent_cb)
 +static void TSA_NO_TSA test_detach_indirect(bool by_parent_cb)
  {
      BlockBackend *blk;
      BlockDriverState *parent_a, *parent_b, *a, *b, *c;
 --
 .41.0

-New patch
+[PULL 10/26] block: Mark bdrv_parent_cb_resize() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+bdrv_parent_cb_resize() need to hold a reader lock for the graph.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-7-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block/io.c | 12 +++++++++---
+file changed, 9 insertions(+), 3 deletions(-)
+diff --git a/block/io.c b/block/io.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/io.c
++++ b/block/io.c
+@@ -XXX,XX +XXX,XX @@
+ /* Maximum bounce buffer for copy-on-read and write zeroes, in bytes */
+ #define MAX_BOUNCE_BUFFER (32768 << BDRV_SECTOR_BITS)
+-static void bdrv_parent_cb_resize(BlockDriverState *bs);
++static void coroutine_fn GRAPH_RDLOCK
++bdrv_parent_cb_resize(BlockDriverState *bs);
++
+ static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,
+     int64_t offset, int64_t bytes, BdrvRequestFlags flags);
+@@ -XXX,XX +XXX,XX @@ bdrv_co_write_req_prepare(BdrvChild *child, int64_t offset, int64_t bytes,
+     }
+ }
+-static inline void coroutine_fn
++static inline void coroutine_fn GRAPH_RDLOCK
+ bdrv_co_write_req_finish(BdrvChild *child, int64_t offset, int64_t bytes,
+                          BdrvTrackedRequest *req, int ret)
+ {
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_copy_range(BdrvChild *src, int64_t src_offset,
+                                    bytes, read_flags, write_flags);
+ }
+-static void bdrv_parent_cb_resize(BlockDriverState *bs)
++static void coroutine_fn GRAPH_RDLOCK
++bdrv_parent_cb_resize(BlockDriverState *bs)
+ {
+     BdrvChild *c;
++
++    assert_bdrv_graph_readable();
++
+     QLIST_FOREACH(c, &bs->parents, next_parent) {
+         if (c->klass->resize) {
+             c->klass->resize(c);
+--
+.41.0

-New patch
+[PULL 11/26] block: Mark bdrv_snapshot_fallback() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+bdrv_snapshot_fallback() need to hold a reader lock for the graph
+because it accesses the children list of a node.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-8-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block_int-common.h | 18 ++++++++--------
+ include/block/snapshot.h         | 24 +++++++++++++---------
+ block/snapshot.c                 | 35 ++++++++++++++++++++++++++------
+ blockdev.c                       |  9 ++++++++
+ qemu-img.c                       |  5 +++++
+files changed, 67 insertions(+), 24 deletions(-)
+diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block_int-common.h
++++ b/include/block/block_int-common.h
+@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
+     int GRAPH_RDLOCK_PTR (*bdrv_inactivate)(BlockDriverState *bs);
+-    int (*bdrv_snapshot_create)(BlockDriverState *bs,
+-                                QEMUSnapshotInfo *sn_info);
+-    int (*bdrv_snapshot_goto)(BlockDriverState *bs,
+-                              const char *snapshot_id);
+-    int (*bdrv_snapshot_delete)(BlockDriverState *bs,
+-                                const char *snapshot_id,
+-                                const char *name,
+-                                Error **errp);
++    int GRAPH_RDLOCK_PTR (*bdrv_snapshot_create)(
++        BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
++
++    int GRAPH_UNLOCKED_PTR (*bdrv_snapshot_goto)(
++        BlockDriverState *bs, const char *snapshot_id);
++
++    int GRAPH_RDLOCK_PTR (*bdrv_snapshot_delete)(
++        BlockDriverState *bs, const char *snapshot_id, const char *name,
++        Error **errp);
++
+     int (*bdrv_snapshot_list)(BlockDriverState *bs,
+                               QEMUSnapshotInfo **psn_info);
+     int (*bdrv_snapshot_load_tmp)(BlockDriverState *bs,
+diff --git a/include/block/snapshot.h b/include/block/snapshot.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/snapshot.h
++++ b/include/block/snapshot.h
+@@ -XXX,XX +XXX,XX @@
+ #ifndef SNAPSHOT_H
+ #define SNAPSHOT_H
++#include "block/graph-lock.h"
+ #include "qapi/qapi-builtin-types.h"
+ #define SNAPSHOT_OPT_BASE       "snapshot."
+@@ -XXX,XX +XXX,XX @@ bool bdrv_snapshot_find_by_id_and_name(BlockDriverState *bs,
+                                        const char *name,
+                                        QEMUSnapshotInfo *sn_info,
+                                        Error **errp);
+-int bdrv_can_snapshot(BlockDriverState *bs);
+-int bdrv_snapshot_create(BlockDriverState *bs,
+-                         QEMUSnapshotInfo *sn_info);
+-int bdrv_snapshot_goto(BlockDriverState *bs,
+-                       const char *snapshot_id,
+-                       Error **errp);
+-int bdrv_snapshot_delete(BlockDriverState *bs,
+-                         const char *snapshot_id,
+-                         const char *name,
+-                         Error **errp);
++
++int GRAPH_RDLOCK bdrv_can_snapshot(BlockDriverState *bs);
++
++int GRAPH_RDLOCK
++bdrv_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
++
++int GRAPH_UNLOCKED
++bdrv_snapshot_goto(BlockDriverState *bs, const char *snapshot_id, Error **errp);
++
++int GRAPH_RDLOCK
++bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id,
++                     const char *name, Error **errp);
++
+ int bdrv_snapshot_list(BlockDriverState *bs,
+                        QEMUSnapshotInfo **psn_info);
+ int bdrv_snapshot_load_tmp(BlockDriverState *bs,
+diff --git a/block/snapshot.c b/block/snapshot.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/snapshot.c
++++ b/block/snapshot.c
+@@ -XXX,XX +XXX,XX @@ bool bdrv_snapshot_find_by_id_and_name(BlockDriverState *bs,
+  * back if the given BDS does not support snapshots.
+  * Return NULL if there is no BDS to (safely) fall back to.
+  */
+-static BdrvChild *bdrv_snapshot_fallback_child(BlockDriverState *bs)
++static BdrvChild * GRAPH_RDLOCK
++bdrv_snapshot_fallback_child(BlockDriverState *bs)
+ {
+     BdrvChild *fallback = bdrv_primary_child(bs);
+     BdrvChild *child;
++    GLOBAL_STATE_CODE();
++    assert_bdrv_graph_readable();
++
+     /* We allow fallback only to primary child */
+     if (!fallback) {
+         return NULL;
+@@ -XXX,XX +XXX,XX @@ static BdrvChild *bdrv_snapshot_fallback_child(BlockDriverState *bs)
+     return fallback;
+ }
+-static BlockDriverState *bdrv_snapshot_fallback(BlockDriverState *bs)
++static BlockDriverState * GRAPH_RDLOCK
++bdrv_snapshot_fallback(BlockDriverState *bs)
+ {
++    GLOBAL_STATE_CODE();
+     return child_bs(bdrv_snapshot_fallback_child(bs));
+ }
+@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_goto(BlockDriverState *bs,
+         return ret;
+     }
++    bdrv_graph_rdlock_main_loop();
+     fallback = bdrv_snapshot_fallback_child(bs);
++    bdrv_graph_rdunlock_main_loop();
++
+     if (fallback) {
+         QDict *options;
+         QDict *file_options;
+@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_delete(BlockDriverState *bs,
+ int bdrv_snapshot_list(BlockDriverState *bs,
+                        QEMUSnapshotInfo **psn_info)
+ {
++    GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     BlockDriver *drv = bs->drv;
+     BlockDriverState *fallback_bs = bdrv_snapshot_fallback(bs);
+-    GLOBAL_STATE_CODE();
+     if (!drv) {
+         return -ENOMEDIUM;
+     }
+@@ -XXX,XX +XXX,XX @@ bdrv_all_get_snapshot_devices(bool has_devices, strList *devices,
+ static bool GRAPH_RDLOCK bdrv_all_snapshots_includes_bs(BlockDriverState *bs)
+ {
++    GLOBAL_STATE_CODE();
++    assert_bdrv_graph_readable();
++
+     if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
+         return false;
+     }
+@@ -XXX,XX +XXX,XX @@ int bdrv_all_goto_snapshot(const char *name,
+ {
+     g_autoptr(GList) bdrvs = NULL;
+     GList *iterbdrvs;
++    int ret;
+     GLOBAL_STATE_CODE();
+-    GRAPH_RDLOCK_GUARD_MAINLOOP();
+-    if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
++    bdrv_graph_rdlock_main_loop();
++    ret = bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp);
++    bdrv_graph_rdunlock_main_loop();
++
++    if (ret < 0) {
+         return -1;
+     }
+@@ -XXX,XX +XXX,XX @@ int bdrv_all_goto_snapshot(const char *name,
+         BlockDriverState *bs = iterbdrvs->data;
+         AioContext *ctx = bdrv_get_aio_context(bs);
+         int ret = 0;
++        bool all_snapshots_includes_bs;
+         aio_context_acquire(ctx);
+-        if (devices || bdrv_all_snapshots_includes_bs(bs)) {
++        bdrv_graph_rdlock_main_loop();
++        all_snapshots_includes_bs = bdrv_all_snapshots_includes_bs(bs);
++        bdrv_graph_rdunlock_main_loop();
++
++        if (devices || all_snapshots_includes_bs) {
+             ret = bdrv_snapshot_goto(bs, name, errp);
+         }
+         aio_context_release(ctx);
+diff --git a/blockdev.c b/blockdev.c
+index XXXXXXX..XXXXXXX 100644
+--- a/blockdev.c
++++ b/blockdev.c
+@@ -XXX,XX +XXX,XX @@ SnapshotInfo *qmp_blockdev_snapshot_delete_internal_sync(const char *device,
+     SnapshotInfo *info = NULL;
+     int ret;
++    GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     bs = qmp_get_root_bs(device, errp);
+     if (!bs) {
+         return NULL;
+@@ -XXX,XX +XXX,XX @@ static void internal_snapshot_action(BlockdevSnapshotInternal *internal,
+     AioContext *aio_context;
+     int ret1;
++    GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     tran_add(tran, &internal_snapshot_drv, state);
+     device = internal->device;
+@@ -XXX,XX +XXX,XX @@ static void internal_snapshot_abort(void *opaque)
+     AioContext *aio_context;
+     Error *local_error = NULL;
++    GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     if (!state->created) {
+         return;
+     }
+diff --git a/qemu-img.c b/qemu-img.c
+index XXXXXXX..XXXXXXX 100644
+--- a/qemu-img.c
++++ b/qemu-img.c
+@@ -XXX,XX +XXX,XX @@ static int img_snapshot(int argc, char **argv)
+         sn.date_sec = rt / G_USEC_PER_SEC;
+         sn.date_nsec = (rt % G_USEC_PER_SEC) * 1000;
++        bdrv_graph_rdlock_main_loop();
+         ret = bdrv_snapshot_create(bs, &sn);
++        bdrv_graph_rdunlock_main_loop();
++
+         if (ret) {
+             error_report("Could not create snapshot '%s': %s",
+                 snapshot_name, strerror(-ret));
+@@ -XXX,XX +XXX,XX @@ static int img_snapshot(int argc, char **argv)
+         break;
+     case SNAPSHOT_DELETE:
++        bdrv_graph_rdlock_main_loop();
+         ret = bdrv_snapshot_find(bs, &sn, snapshot_name);
+         if (ret < 0) {
+             error_report("Could not delete snapshot '%s': snapshot not "
+@@ -XXX,XX +XXX,XX @@ static int img_snapshot(int argc, char **argv)
+                 ret = 1;
+             }
+         }
++        bdrv_graph_rdunlock_main_loop();
+         break;
+     }
+--
+.41.0

-New patch
+[PULL 12/26] block: Take graph rdlock in parts of reopen
+Reopen isn't easy with respect to locking because many of its functions
+need to iterate the graph, some change it, and then you get some drains
+in the middle where you can't hold any locks.
+Therefore just documents most of the functions to be unlocked, and take
+locks internally before accessing the graph.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-9-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block_int-common.h | 13 +++++---
+ block.c                          | 57 ++++++++++++++++++++------------
+files changed, 43 insertions(+), 27 deletions(-)
+diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block_int-common.h
++++ b/include/block/block_int-common.h
+@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
+                                 Error **errp);
+     /* For handling image reopen for split or non-split files. */
+-    int (*bdrv_reopen_prepare)(BDRVReopenState *reopen_state,
+-                               BlockReopenQueue *queue, Error **errp);
+-    void (*bdrv_reopen_commit)(BDRVReopenState *reopen_state);
+-    void (*bdrv_reopen_commit_post)(BDRVReopenState *reopen_state);
+-    void (*bdrv_reopen_abort)(BDRVReopenState *reopen_state);
++    int GRAPH_UNLOCKED_PTR (*bdrv_reopen_prepare)(
++        BDRVReopenState *reopen_state, BlockReopenQueue *queue, Error **errp);
++    void GRAPH_UNLOCKED_PTR (*bdrv_reopen_commit)(
++        BDRVReopenState *reopen_state);
++    void GRAPH_UNLOCKED_PTR (*bdrv_reopen_commit_post)(
++        BDRVReopenState *reopen_state);
++    void GRAPH_UNLOCKED_PTR (*bdrv_reopen_abort)(
++        BDRVReopenState *reopen_state);
+     void (*bdrv_join_options)(QDict *options, QDict *old_options);
+     int GRAPH_UNLOCKED_PTR (*bdrv_open)(
+diff --git a/block.c b/block.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block.c
++++ b/block.c
+@@ -XXX,XX +XXX,XX @@ static int bdrv_reset_options_allowed(BlockDriverState *bs,
+ /*
+  * Returns true if @child can be reached recursively from @bs
+  */
+-static bool bdrv_recurse_has_child(BlockDriverState *bs,
+-                                   BlockDriverState *child)
++static bool GRAPH_RDLOCK
++bdrv_recurse_has_child(BlockDriverState *bs, BlockDriverState *child)
+ {
+     BdrvChild *c;
+@@ -XXX,XX +XXX,XX @@ static bool bdrv_recurse_has_child(BlockDriverState *bs,
+  *
+  * To be called with bs->aio_context locked.
+  */
+-static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
+-                                                 BlockDriverState *bs,
+-                                                 QDict *options,
+-                                                 const BdrvChildClass *klass,
+-                                                 BdrvChildRole role,
+-                                                 bool parent_is_format,
+-                                                 QDict *parent_options,
+-                                                 int parent_flags,
+-                                                 bool keep_old_opts)
++static BlockReopenQueue * GRAPH_RDLOCK
++bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, BlockDriverState *bs,
++                        QDict *options, const BdrvChildClass *klass,
++                        BdrvChildRole role, bool parent_is_format,
++                        QDict *parent_options, int parent_flags,
++                        bool keep_old_opts)
+ {
+     assert(bs != NULL);
+@@ -XXX,XX +XXX,XX @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
+     GLOBAL_STATE_CODE();
++    /*
++     * Strictly speaking, draining is illegal under GRAPH_RDLOCK. We know that
++     * we've been called with bdrv_graph_rdlock_main_loop(), though, so it's ok
++     * in practice.
++     */
+     bdrv_drained_begin(bs);
+     if (bs_queue == NULL) {
+@@ -XXX,XX +XXX,XX @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
+                                     QDict *options, bool keep_old_opts)
+ {
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     return bdrv_reopen_queue_child(bs_queue, bs, options, NULL, 0, false,
+                                    NULL, 0, keep_old_opts);
+@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only,
+  * Callers must make sure that their AioContext locking is still correct after
+  * this.
+  */
+-static int bdrv_reopen_parse_file_or_backing(BDRVReopenState *reopen_state,
+-                                             bool is_backing, Transaction *tran,
+-                                             Error **errp)
++static int GRAPH_UNLOCKED
++bdrv_reopen_parse_file_or_backing(BDRVReopenState *reopen_state,
++                                  bool is_backing, Transaction *tran,
++                                  Error **errp)
+ {
+     BlockDriverState *bs = reopen_state->bs;
+     BlockDriverState *new_child_bs;
+@@ -XXX,XX +XXX,XX @@ static int bdrv_reopen_parse_file_or_backing(BDRVReopenState *reopen_state,
+     QObject *value;
+     const char *str;
+     AioContext *ctx, *old_ctx;
++    bool has_child;
+     int ret;
+     GLOBAL_STATE_CODE();
+@@ -XXX,XX +XXX,XX @@ static int bdrv_reopen_parse_file_or_backing(BDRVReopenState *reopen_state,
+         new_child_bs = bdrv_lookup_bs(NULL, str, errp);
+         if (new_child_bs == NULL) {
+             return -EINVAL;
+-        } else if (bdrv_recurse_has_child(new_child_bs, bs)) {
++        }
++
++        bdrv_graph_rdlock_main_loop();
++        has_child = bdrv_recurse_has_child(new_child_bs, bs);
++        bdrv_graph_rdunlock_main_loop();
++
++        if (has_child) {
+             error_setg(errp, "Making '%s' a %s child of '%s' would create a "
+                        "cycle", str, child_name, bs->node_name);
+             return -EINVAL;
+@@ -XXX,XX +XXX,XX @@ static int bdrv_reopen_parse_file_or_backing(BDRVReopenState *reopen_state,
+  * After calling this function, the transaction @change_child_tran may only be
+  * completed while holding a writer lock for the graph.
+  */
+-static int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
+-                               BlockReopenQueue *queue,
+-                               Transaction *change_child_tran, Error **errp)
++static int GRAPH_UNLOCKED
++bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
++                    Transaction *change_child_tran, Error **errp)
+ {
+     int ret = -1;
+     int old_flags;
+@@ -XXX,XX +XXX,XX @@ static int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
+     if (qdict_size(reopen_state->options)) {
+         const QDictEntry *entry = qdict_first(reopen_state->options);
++        GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+         do {
+             QObject *new = entry->value;
+             QObject *old = qdict_get(reopen_state->bs->options, entry->key);
+@@ -XXX,XX +XXX,XX @@ error:
+  * makes them final by swapping the staging BlockDriverState contents into
+  * the active BlockDriverState contents.
+  */
+-static void bdrv_reopen_commit(BDRVReopenState *reopen_state)
++static void GRAPH_UNLOCKED bdrv_reopen_commit(BDRVReopenState *reopen_state)
+ {
+     BlockDriver *drv;
+     BlockDriverState *bs;
+@@ -XXX,XX +XXX,XX @@ static void bdrv_reopen_commit(BDRVReopenState *reopen_state)
+         drv->bdrv_reopen_commit(reopen_state);
+     }
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     /* set BDS specific flags now */
+     qobject_unref(bs->explicit_options);
+     qobject_unref(bs->options);
+@@ -XXX,XX +XXX,XX @@ static void bdrv_reopen_commit(BDRVReopenState *reopen_state)
+     qdict_del(bs->explicit_options, "backing");
+     qdict_del(bs->options, "backing");
+-    bdrv_graph_rdlock_main_loop();
+     bdrv_refresh_limits(bs, NULL, NULL);
+-    bdrv_graph_rdunlock_main_loop();
+     bdrv_refresh_total_sectors(bs, bs->total_sectors);
+ }
+@@ -XXX,XX +XXX,XX @@ static void bdrv_reopen_commit(BDRVReopenState *reopen_state)
+  * Abort the reopen, and delete and free the staged changes in
+  * reopen_state
+  */
+-static void bdrv_reopen_abort(BDRVReopenState *reopen_state)
++static void GRAPH_UNLOCKED bdrv_reopen_abort(BDRVReopenState *reopen_state)
+ {
+     BlockDriver *drv;
+--
+.41.0

-[PULL 1/3] block: Lock AioContext for drain_end in blockdev-reopen
+[PULL 13/26] block: Mark bdrv_get_xdbg_block_graph() and callers GRAPH_RDLOCK
-bdrv_subtree_drained_end() requires the caller to hold the AioContext
+This adds GRAPH_RDLOCK annotations to declare that callers of
-lock for the drained node. Not doing this for nodes outside of the main
+bdrv_get_xdbg_block_graph() need to hold a reader lock for the graph
-AioContext leads to crashes when AIO_WAIT_WHILE() needs to wait and
+because it accesses the children list of a node.
 tries to temporarily release the lock.
-Fixes: 3908b7a8994fa5ef7a89aa58cd5a02fc58141592
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2046659
-Reported-by: Qing Wang <qinwang@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Message-Id: <20220203140534.36522-2-kwolf@redhat.com>
+Message-ID: <20230929145157.45443-10-kwolf@redhat.com>
-Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- blockdev.c | 11 ++++++++++-
+ include/block/block-global-state.h | 2 +-
-file changed, 10 insertions(+), 1 deletion(-)
+ blockdev.c                         | 2 ++
 files changed, 3 insertions(+), 1 deletion(-)
+diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-global-state.h
++++ b/include/block/block-global-state.h
+@@ -XXX,XX +XXX,XX @@ int bdrv_has_zero_init_1(BlockDriverState *bs);
+ int bdrv_has_zero_init(BlockDriverState *bs);
+ BlockDriverState *bdrv_find_node(const char *node_name);
+ BlockDeviceInfoList *bdrv_named_nodes_list(bool flat, Error **errp);
+-XDbgBlockGraph *bdrv_get_xdbg_block_graph(Error **errp);
++XDbgBlockGraph * GRAPH_RDLOCK bdrv_get_xdbg_block_graph(Error **errp);
+ BlockDriverState *bdrv_lookup_bs(const char *device,
+                                  const char *node_name,
+                                  Error **errp);
 diff --git a/blockdev.c b/blockdev.c
 index XXXXXXX..XXXXXXX 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)
+@@ -XXX,XX +XXX,XX @@ BlockDeviceInfoList *qmp_query_named_block_nodes(bool has_flat,
  XDbgBlockGraph *qmp_x_debug_query_block_graph(Error **errp)
  {
-     BlockReopenQueue *queue = NULL;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
      GSList *drained = NULL;
 +    GSList *p;
      /* Add each one of the BDS that we want to reopen to the queue */
      for (; reopen_list != NULL; reopen_list = reopen_list->next) {
@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)
  fail:
      bdrv_reopen_queue_free(queue);
 -    g_slist_free_full(drained, (GDestroyNotify) bdrv_subtree_drained_end);
 +    for (p = drained; p; p = p->next) {
 +        BlockDriverState *bs = p->data;
 +        AioContext *ctx = bdrv_get_aio_context(bs);
 +
-+        aio_context_acquire(ctx);
+     return bdrv_get_xdbg_block_graph(errp);
 +        bdrv_subtree_drained_end(bs);
 +        aio_context_release(ctx);
 +    }
 +    g_slist_free(drained);
  }
- void qmp_blockdev_del(const char *node_name, Error **errp)
 --
-.34.1
+.41.0

-New patch
+[PULL 14/26] block: Mark bdrv_refresh_filename() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+bdrv_refresh_filename() need to hold a reader lock for the graph
+because it accesses the children list of a node.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-11-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block/vhdx.h                       |  5 +--
+ include/block/block-global-state.h |  9 ++++--
+ include/block/block_int-common.h   |  8 ++---
+ include/block/qapi.h               | 16 ++++------
+ block.c                            | 23 +++++++++++---
+ block/nfs.c                        |  2 +-
+ block/qapi.c                       | 11 ++++---
+ block/raw-format.c                 |  2 ++
+ block/vhdx.c                       |  4 +++
+ block/vmdk.c                       | 51 +++++++++++++++++++-----------
+ blockdev.c                         | 13 ++++++++
+ qemu-img.c                         |  4 +++
+files changed, 101 insertions(+), 47 deletions(-)
+diff --git a/block/vhdx.h b/block/vhdx.h
+index XXXXXXX..XXXXXXX 100644
+--- a/block/vhdx.h
++++ b/block/vhdx.h
+@@ -XXX,XX +XXX,XX @@ uint32_t vhdx_checksum_calc(uint32_t crc, uint8_t *buf, size_t size,
+ bool vhdx_checksum_is_valid(uint8_t *buf, size_t size, int crc_offset);
+-int vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s, bool *flushed,
+-                   Error **errp);
++int GRAPH_RDLOCK
++vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s, bool *flushed,
++               Error **errp);
+ int coroutine_fn GRAPH_RDLOCK
+ vhdx_log_write_and_flush(BlockDriverState *bs, BDRVVHDXState *s,
+diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-global-state.h
++++ b/include/block/block-global-state.h
+@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only,
+                               Error **errp);
+ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
+                                           const char *backing_file);
+-void bdrv_refresh_filename(BlockDriverState *bs);
++void GRAPH_RDLOCK bdrv_refresh_filename(BlockDriverState *bs);
+ void GRAPH_RDLOCK
+ bdrv_refresh_limits(BlockDriverState *bs, Transaction *tran, Error **errp);
+@@ -XXX,XX +XXX,XX @@ void bdrv_next_cleanup(BdrvNextIterator *it);
+ BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs);
+ void bdrv_iterate_format(void (*it)(void *opaque, const char *name),
+                          void *opaque, bool read_only);
+-char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp);
+-char *bdrv_dirname(BlockDriverState *bs, Error **errp);
++
++char * GRAPH_RDLOCK
++bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp);
++
++char * GRAPH_RDLOCK bdrv_dirname(BlockDriverState *bs, Error **errp);
+ void bdrv_img_create(const char *filename, const char *fmt,
+                      const char *base_filename, const char *base_fmt,
+diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block_int-common.h
++++ b/include/block/block_int-common.h
+@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
+      * Refreshes the bs->exact_filename field. If that is impossible,
+      * bs->exact_filename has to be left empty.
+      */
+-    void (*bdrv_refresh_filename)(BlockDriverState *bs);
++    void GRAPH_RDLOCK_PTR (*bdrv_refresh_filename)(BlockDriverState *bs);
+     /*
+      * Gathers the open options for all children into @target.
+@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
+      * block driver which implements it is probably doing something
+      * shady regarding its runtime option structure.
+      */
+-    void (*bdrv_gather_child_options)(BlockDriverState *bs, QDict *target,
+-                                      bool backing_overridden);
++    void GRAPH_RDLOCK_PTR (*bdrv_gather_child_options)(
++        BlockDriverState *bs, QDict *target, bool backing_overridden);
+     /*
+      * Returns an allocated string which is the directory name of this BDS: It
+      * will be used to make relative filenames absolute by prepending this
+      * function's return value to them.
+      */
+-    char *(*bdrv_dirname)(BlockDriverState *bs, Error **errp);
++    char * GRAPH_RDLOCK_PTR (*bdrv_dirname)(BlockDriverState *bs, Error **errp);
+     /*
+      * This informs the driver that we are no longer interested in the result
+diff --git a/include/block/qapi.h b/include/block/qapi.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/qapi.h
++++ b/include/block/qapi.h
+@@ -XXX,XX +XXX,XX @@
+ #include "block/snapshot.h"
+ #include "qapi/qapi-types-block-core.h"
+-BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
+-                                        BlockDriverState *bs,
+-                                        bool flat,
+-                                        Error **errp);
++BlockDeviceInfo * GRAPH_RDLOCK
++bdrv_block_device_info(BlockBackend *blk, BlockDriverState *bs,
++                       bool flat, Error **errp);
++
+ int bdrv_query_snapshot_info_list(BlockDriverState *bs,
+                                   SnapshotInfoList **p_list,
+                                   Error **errp);
+-void bdrv_query_image_info(BlockDriverState *bs,
+-                           ImageInfo **p_info,
+-                           bool flat,
+-                           bool skip_implicit_filters,
+-                           Error **errp);
++void GRAPH_RDLOCK
++bdrv_query_image_info(BlockDriverState *bs, ImageInfo **p_info, bool flat,
++                      bool skip_implicit_filters, Error **errp);
+ void GRAPH_RDLOCK
+ bdrv_query_block_graph_info(BlockDriverState *bs, BlockGraphInfo **p_info,
+                             Error **errp);
+diff --git a/block.c b/block.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block.c
++++ b/block.c
+@@ -XXX,XX +XXX,XX @@ char *bdrv_get_full_backing_filename_from_filename(const char *backed,
+  * setting @errp.  In all other cases, NULL will only be returned with
+  * @errp set.
+  */
+-static char *bdrv_make_absolute_filename(BlockDriverState *relative_to,
+-                                         const char *filename, Error **errp)
++static char * GRAPH_RDLOCK
++bdrv_make_absolute_filename(BlockDriverState *relative_to,
++                            const char *filename, Error **errp)
+ {
+     char *dir, *full_name;
+@@ -XXX,XX +XXX,XX @@ static void bdrv_temp_snapshot_options(int *child_flags, QDict *child_options,
+     *child_flags &= ~BDRV_O_NATIVE_AIO;
+ }
+-static void bdrv_backing_attach(BdrvChild *c)
++static void GRAPH_WRLOCK bdrv_backing_attach(BdrvChild *c)
+ {
+     BlockDriverState *parent = c->opaque;
+     BlockDriverState *backing_hd = c->bs;
+@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
+     }
+     if (file != NULL) {
++        bdrv_graph_rdlock_main_loop();
+         bdrv_refresh_filename(blk_bs(file));
++        bdrv_graph_rdunlock_main_loop();
++
+         filename = blk_bs(file)->filename;
+     } else {
+         /*
+@@ -XXX,XX +XXX,XX @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options,
+             implicit_backing = !strcmp(bs->auto_backing_file, bs->backing_file);
+         }
++        bdrv_graph_rdlock_main_loop();
+         backing_filename = bdrv_get_full_backing_filename(bs, &local_err);
++        bdrv_graph_rdunlock_main_loop();
++
+         if (local_err) {
+             ret = -EINVAL;
+             error_propagate(errp, local_err);
+@@ -XXX,XX +XXX,XX @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options,
+     }
+     if (implicit_backing) {
++        bdrv_graph_rdlock_main_loop();
+         bdrv_refresh_filename(backing_hd);
++        bdrv_graph_rdunlock_main_loop();
+         pstrcpy(bs->auto_backing_file, sizeof(bs->auto_backing_file),
+                 backing_hd->filename);
+     }
+@@ -XXX,XX +XXX,XX @@ bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
+             if (local_err != NULL) {
+                 error_propagate(errp, local_err);
+             } else {
++                bdrv_graph_rdlock_main_loop();
+                 bdrv_refresh_filename(reopen_state->bs);
++                bdrv_graph_rdunlock_main_loop();
+                 error_setg(errp, "failed while preparing to reopen image '%s'",
+                            reopen_state->bs->filename);
+             }
+@@ -XXX,XX +XXX,XX @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base,
+     bdrv_ref(top);
+     bdrv_drained_begin(base);
++    bdrv_graph_rdlock_main_loop();
+     if (!top->drv || !base->drv) {
+         goto exit;
+@@ -XXX,XX +XXX,XX @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base,
+         backing_file_str = base->filename;
+     }
+-    bdrv_graph_rdlock_main_loop();
+     QLIST_FOREACH(c, &top->parents, next_parent) {
+         updated_children = g_slist_prepend(updated_children, c);
+     }
+-    bdrv_graph_rdunlock_main_loop();
+     /*
+      * It seems correct to pass detach_subchain=true here, but it triggers
+@@ -XXX,XX +XXX,XX @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base,
+     ret = 0;
+ exit:
++    bdrv_graph_rdunlock_main_loop();
+     bdrv_drained_end(base);
+     bdrv_unref(top);
+     return ret;
+@@ -XXX,XX +XXX,XX @@ BlockDeviceInfoList *bdrv_named_nodes_list(bool flat,
+     BlockDriverState *bs;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     list = NULL;
+     QTAILQ_FOREACH(bs, &graph_bdrv_states, node_list) {
+@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
+     BlockDriverState *bs_below;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (!bs || !bs->drv || !backing_file) {
+         return NULL;
+diff --git a/block/nfs.c b/block/nfs.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/nfs.c
++++ b/block/nfs.c
+@@ -XXX,XX +XXX,XX @@ static void nfs_refresh_filename(BlockDriverState *bs)
+     }
+ }
+-static char *nfs_dirname(BlockDriverState *bs, Error **errp)
++static char * GRAPH_RDLOCK nfs_dirname(BlockDriverState *bs, Error **errp)
+ {
+     NFSClient *client = bs->opaque;
+diff --git a/block/qapi.c b/block/qapi.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qapi.c
++++ b/block/qapi.c
+@@ -XXX,XX +XXX,XX @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs,
+  * Helper function for other query info functions.  Store information about @bs
+  * in @info, setting @errp on error.
+  */
+-static void bdrv_do_query_node_info(BlockDriverState *bs,
+-                                    BlockNodeInfo *info,
+-                                    Error **errp)
++static void GRAPH_RDLOCK
++bdrv_do_query_node_info(BlockDriverState *bs, BlockNodeInfo *info, Error **errp)
+ {
+     int64_t size;
+     const char *backing_filename;
+@@ -XXX,XX +XXX,XX @@ fail:
+ }
+ /* @p_info will be set only on success. */
+-static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info,
+-                            Error **errp)
++static void GRAPH_RDLOCK
++bdrv_query_info(BlockBackend *blk, BlockInfo **p_info, Error **errp)
+ {
+     BlockInfo *info = g_malloc0(sizeof(*info));
+     BlockDriverState *bs = blk_bs(blk);
+@@ -XXX,XX +XXX,XX @@ BlockInfoList *qmp_query_block(Error **errp)
+     BlockBackend *blk;
+     Error *local_err = NULL;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) {
+         BlockInfoList *info;
+diff --git a/block/raw-format.c b/block/raw-format.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/raw-format.c
++++ b/block/raw-format.c
+@@ -XXX,XX +XXX,XX @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags,
+                                    BDRV_REQ_ZERO_WRITE;
+     if (bs->probed && !bdrv_is_read_only(bs)) {
++        bdrv_graph_rdlock_main_loop();
+         bdrv_refresh_filename(bs->file->bs);
++        bdrv_graph_rdunlock_main_loop();
+         fprintf(stderr,
+                 "WARNING: Image format was not specified for '%s' and probing "
+                 "guessed raw.\n"
+diff --git a/block/vhdx.c b/block/vhdx.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/vhdx.c
++++ b/block/vhdx.c
+@@ -XXX,XX +XXX,XX @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,
+     uint64_t signature;
+     Error *local_err = NULL;
++    GLOBAL_STATE_CODE();
++
+     ret = bdrv_open_file_child(NULL, options, "file", bs, errp);
+     if (ret < 0) {
+         return ret;
+     }
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     s->bat = NULL;
+     s->first_visible_write = true;
+diff --git a/block/vmdk.c b/block/vmdk.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/vmdk.c
++++ b/block/vmdk.c
+@@ -XXX,XX +XXX,XX @@ static int vmdk_add_extent(BlockDriverState *bs,
+     return 0;
+ }
+-static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent,
+-                            Error **errp)
++static int GRAPH_RDLOCK
++vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent, Error **errp)
+ {
+     int ret;
+     size_t l1_size;
+@@ -XXX,XX +XXX,XX @@ static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent,
+     return ret;
+ }
+-static int vmdk_open_vmfs_sparse(BlockDriverState *bs,
+-                                 BdrvChild *file,
+-                                 int flags, Error **errp)
++static int GRAPH_RDLOCK
++vmdk_open_vmfs_sparse(BlockDriverState *bs, BdrvChild *file, int flags,
++                      Error **errp)
+ {
+     int ret;
+     uint32_t magic;
+@@ -XXX,XX +XXX,XX @@ static int check_se_sparse_volatile_header(VMDKSESparseVolatileHeader *header,
+     return 0;
+ }
+-static int vmdk_open_se_sparse(BlockDriverState *bs,
+-                               BdrvChild *file,
+-                               int flags, Error **errp)
++static int GRAPH_RDLOCK
++vmdk_open_se_sparse(BlockDriverState *bs, BdrvChild *file, int flags,
++                    Error **errp)
+ {
+     int ret;
+     VMDKSESparseConstHeader const_header;
+@@ -XXX,XX +XXX,XX @@ static char *vmdk_read_desc(BdrvChild *file, uint64_t desc_offset, Error **errp)
+     return buf;
+ }
+-static int vmdk_open_vmdk4(BlockDriverState *bs,
+-                           BdrvChild *file,
+-                           int flags, QDict *options, Error **errp)
++static int GRAPH_RDLOCK
++vmdk_open_vmdk4(BlockDriverState *bs, BdrvChild *file, int flags,
++                QDict *options, Error **errp)
+ {
+     int ret;
+     uint32_t magic;
+@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_description(const char *desc, const char *opt_name,
+ }
+ /* Open an extent file and append to bs array */
+-static int vmdk_open_sparse(BlockDriverState *bs, BdrvChild *file, int flags,
+-                            char *buf, QDict *options, Error **errp)
++static int GRAPH_RDLOCK
++vmdk_open_sparse(BlockDriverState *bs, BdrvChild *file, int flags,
++                 char *buf, QDict *options, Error **errp)
+ {
+     uint32_t magic;
+@@ -XXX,XX +XXX,XX @@ static const char *next_line(const char *s)
+     return s;
+ }
+-static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
+-                              QDict *options, Error **errp)
++static int GRAPH_RDLOCK
++vmdk_parse_extents(const char *desc, BlockDriverState *bs, QDict *options,
++                   Error **errp)
+ {
+     int ret;
+     int matches;
+@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
+     char extent_opt_prefix[32];
+     Error *local_err = NULL;
++    GLOBAL_STATE_CODE();
++
+     for (p = desc; *p; p = next_line(p)) {
+         /* parse extent line in one of below formats:
+          *
+@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
+             ret = vmdk_add_extent(bs, extent_file, true, sectors,
+, 0, 0, 0, 0, &extent, errp);
+             if (ret < 0) {
++                bdrv_graph_rdunlock_main_loop();
+                 bdrv_graph_wrlock(NULL);
+                 bdrv_unref_child(bs, extent_file);
+                 bdrv_graph_wrunlock();
++                bdrv_graph_rdlock_main_loop();
+                 goto out;
+             }
+             extent->flat_start_offset = flat_offset << 9;
+@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
+             }
+             g_free(buf);
+             if (ret) {
++                bdrv_graph_rdunlock_main_loop();
+                 bdrv_graph_wrlock(NULL);
+                 bdrv_unref_child(bs, extent_file);
+                 bdrv_graph_wrunlock();
++                bdrv_graph_rdlock_main_loop();
+                 goto out;
+             }
+             extent = &s->extents[s->num_extents - 1];
+         } else if (!strcmp(type, "SESPARSE")) {
+             ret = vmdk_open_se_sparse(bs, extent_file, bs->open_flags, errp);
+             if (ret) {
++                bdrv_graph_rdunlock_main_loop();
+                 bdrv_graph_wrlock(NULL);
+                 bdrv_unref_child(bs, extent_file);
+                 bdrv_graph_wrunlock();
++                bdrv_graph_rdlock_main_loop();
+                 goto out;
+             }
+             extent = &s->extents[s->num_extents - 1];
+         } else {
+             error_setg(errp, "Unsupported extent type '%s'", type);
++            bdrv_graph_rdunlock_main_loop();
+             bdrv_graph_wrlock(NULL);
+             bdrv_unref_child(bs, extent_file);
+             bdrv_graph_wrunlock();
++            bdrv_graph_rdlock_main_loop();
+             ret = -ENOTSUP;
+             goto out;
+         }
+@@ -XXX,XX +XXX,XX @@ out:
+     return ret;
+ }
+-static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf,
+-                               QDict *options, Error **errp)
++static int GRAPH_RDLOCK
++vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf, QDict *options,
++                    Error **errp)
+ {
+     int ret;
+     char ct[128];
+@@ -XXX,XX +XXX,XX @@ static int vmdk_has_zero_init(BlockDriverState *bs)
+     return 1;
+ }
+-static VmdkExtentInfo *vmdk_get_extent_info(VmdkExtent *extent)
++static VmdkExtentInfo * GRAPH_RDLOCK vmdk_get_extent_info(VmdkExtent *extent)
+ {
+     VmdkExtentInfo *info = g_new0(VmdkExtentInfo, 1);
+@@ -XXX,XX +XXX,XX @@ static ImageInfoSpecific *vmdk_get_specific_info(BlockDriverState *bs,
+     ImageInfoSpecific *spec_info = g_new0(ImageInfoSpecific, 1);
+     VmdkExtentInfoList **tail;
++    assume_graph_lock(); /* FIXME */
++
+     *spec_info = (ImageInfoSpecific){
+         .type = IMAGE_INFO_SPECIFIC_KIND_VMDK,
+         .u = {
+diff --git a/blockdev.c b/blockdev.c
+index XXXXXXX..XXXXXXX 100644
+--- a/blockdev.c
++++ b/blockdev.c
+@@ -XXX,XX +XXX,XX @@ static void drive_backup_action(DriveBackup *backup,
+     bool set_backing_hd = false;
+     int ret;
++    GLOBAL_STATE_CODE();
++
+     tran_add(tran, &drive_backup_drv, state);
+     if (!backup->has_mode) {
+@@ -XXX,XX +XXX,XX @@ static void drive_backup_action(DriveBackup *backup,
+             BlockDriverState *explicit_backing =
+                 bdrv_skip_implicit_filters(source);
++            bdrv_graph_rdlock_main_loop();
+             bdrv_refresh_filename(explicit_backing);
++            bdrv_graph_rdunlock_main_loop();
++
+             bdrv_img_create(backup->target, format,
+                             explicit_backing->filename,
+                             explicit_backing->drv->format_name, NULL,
+@@ -XXX,XX +XXX,XX @@ void qmp_block_stream(const char *job_id, const char *device,
+     Error *local_err = NULL;
+     int job_flags = JOB_DEFAULT;
++    GLOBAL_STATE_CODE();
++
+     if (base && base_node) {
+         error_setg(errp, "'base' and 'base-node' cannot be specified "
+                    "at the same time");
+@@ -XXX,XX +XXX,XX @@ void qmp_block_stream(const char *job_id, const char *device,
+             goto out;
+         }
+         assert(bdrv_get_aio_context(base_bs) == aio_context);
++
++        bdrv_graph_rdlock_main_loop();
+         bdrv_refresh_filename(base_bs);
++        bdrv_graph_rdunlock_main_loop();
+     }
+     if (bottom) {
+@@ -XXX,XX +XXX,XX @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
+             break;
+         case NEW_IMAGE_MODE_ABSOLUTE_PATHS:
+             /* create new image with backing file */
++            bdrv_graph_rdlock_main_loop();
+             bdrv_refresh_filename(explicit_backing);
++            bdrv_graph_rdunlock_main_loop();
++
+             bdrv_img_create(arg->target, format,
+                             explicit_backing->filename,
+                             explicit_backing->drv->format_name,
+diff --git a/qemu-img.c b/qemu-img.c
+index XXXXXXX..XXXXXXX 100644
+--- a/qemu-img.c
++++ b/qemu-img.c
+@@ -XXX,XX +XXX,XX @@ static int get_block_status(BlockDriverState *bs, int64_t offset,
+     has_offset = !!(ret & BDRV_BLOCK_OFFSET_VALID);
+     if (file && has_offset) {
++        bdrv_graph_rdlock_main_loop();
+         bdrv_refresh_filename(file);
++        bdrv_graph_rdunlock_main_loop();
+         filename = file->filename;
+     }
+@@ -XXX,XX +XXX,XX @@ static int img_rebase(int argc, char **argv)
+                 qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
+             }
++            bdrv_graph_rdlock_main_loop();
+             bdrv_refresh_filename(bs);
++            bdrv_graph_rdunlock_main_loop();
+             overlay_filename = bs->exact_filename[0] ? bs->exact_filename
+                                                      : bs->filename;
+             out_real_path =
+--
+.41.0

-New patch
+[PULL 15/26] block: Mark bdrv_primary_child() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+bdrv_primary_child() need to hold a reader lock for the graph
+because it accesses the children list of a node.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-12-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block_int-io.h |  5 +++--
+ block.c                      | 11 ++++++++++-
+ block/snapshot.c             |  3 +++
+files changed, 16 insertions(+), 3 deletions(-)
+diff --git a/include/block/block_int-io.h b/include/block/block_int-io.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block_int-io.h
++++ b/include/block/block_int-io.h
+@@ -XXX,XX +XXX,XX @@ bdrv_refresh_total_sectors(BlockDriverState *bs, int64_t hint);
+ BdrvChild *bdrv_cow_child(BlockDriverState *bs);
+ BdrvChild *bdrv_filter_child(BlockDriverState *bs);
+ BdrvChild *bdrv_filter_or_cow_child(BlockDriverState *bs);
+-BdrvChild *bdrv_primary_child(BlockDriverState *bs);
++BdrvChild * GRAPH_RDLOCK bdrv_primary_child(BlockDriverState *bs);
+ BlockDriverState *bdrv_skip_filters(BlockDriverState *bs);
+ BlockDriverState *bdrv_backing_chain_next(BlockDriverState *bs);
+@@ -XXX,XX +XXX,XX @@ static inline BlockDriverState *bdrv_filter_or_cow_bs(BlockDriverState *bs)
+     return child_bs(bdrv_filter_or_cow_child(bs));
+ }
+-static inline BlockDriverState *bdrv_primary_bs(BlockDriverState *bs)
++static inline BlockDriverState * GRAPH_RDLOCK
++bdrv_primary_bs(BlockDriverState *bs)
+ {
+     IO_CODE();
+     return child_bs(bdrv_primary_child(bs));
+diff --git a/block.c b/block.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block.c
++++ b/block.c
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn bdrv_co_debug_event(BlockDriverState *bs, BlkdebugEvent event)
+     bs->drv->bdrv_co_debug_event(bs, event);
+ }
+-static BlockDriverState *bdrv_find_debug_node(BlockDriverState *bs)
++static BlockDriverState * GRAPH_RDLOCK
++bdrv_find_debug_node(BlockDriverState *bs)
+ {
+     GLOBAL_STATE_CODE();
+     while (bs && bs->drv && !bs->drv->bdrv_debug_breakpoint) {
+@@ -XXX,XX +XXX,XX @@ int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
+                           const char *tag)
+ {
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     bs = bdrv_find_debug_node(bs);
+     if (bs) {
+         return bs->drv->bdrv_debug_breakpoint(bs, event, tag);
+@@ -XXX,XX +XXX,XX @@ int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
+ int bdrv_debug_remove_breakpoint(BlockDriverState *bs, const char *tag)
+ {
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     bs = bdrv_find_debug_node(bs);
+     if (bs) {
+         return bs->drv->bdrv_debug_remove_breakpoint(bs, tag);
+@@ -XXX,XX +XXX,XX @@ int bdrv_debug_remove_breakpoint(BlockDriverState *bs, const char *tag)
+ int bdrv_debug_resume(BlockDriverState *bs, const char *tag)
+ {
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     while (bs && (!bs->drv || !bs->drv->bdrv_debug_resume)) {
+         bs = bdrv_primary_bs(bs);
+     }
+@@ -XXX,XX +XXX,XX @@ int bdrv_debug_resume(BlockDriverState *bs, const char *tag)
+ bool bdrv_debug_is_suspended(BlockDriverState *bs, const char *tag)
+ {
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     while (bs && bs->drv && !bs->drv->bdrv_debug_is_suspended) {
+         bs = bdrv_primary_bs(bs);
+     }
+diff --git a/block/snapshot.c b/block/snapshot.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/snapshot.c
++++ b/block/snapshot.c
+@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_goto(BlockDriverState *bs,
+          * respective option (with the qdict_put_str() call above).
+          * Assert that .bdrv_open() has attached the right BDS as primary child.
+          */
++        bdrv_graph_rdlock_main_loop();
+         assert(bdrv_primary_bs(bs) == fallback_bs);
++        bdrv_graph_rdunlock_main_loop();
++
+         bdrv_unref(fallback_bs);
+         return ret;
+     }
+--
+.41.0

-New patch
+[PULL 16/26] block: Mark bdrv_get_parent_name() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+bdrv_get_parent_name() need to hold a reader lock for the graph
+because it accesses the parents list of a node.
+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: <20230929145157.45443-13-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block/qcow2.h                |  7 +++----
+ include/block/block-io.h     |  8 ++++++--
+ include/block/block_int-io.h |  2 +-
+ include/block/qapi.h         |  7 ++++---
+ block.c                      | 14 ++++++++++++--
+ block/backup.c               |  1 +
+ block/parallels.c            |  3 +++
+ block/qcow.c                 |  3 +++
+ block/qcow2-bitmap.c         |  2 ++
+ block/qcow2.c                |  4 ++++
+ block/quorum.c               |  4 ++--
+ block/rbd.c                  |  2 ++
+ block/snapshot.c             |  3 +++
+ block/vdi.c                  |  3 +++
+ block/vpc.c                  |  3 +++
+ block/vvfat.c                |  2 ++
+ blockjob.c                   |  1 +
+files changed, 55 insertions(+), 14 deletions(-)
+diff --git a/block/qcow2.h b/block/qcow2.h
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2.h
++++ b/block/qcow2.h
+@@ -XXX,XX +XXX,XX @@ int coroutine_fn qcow2_truncate_bitmaps_check(BlockDriverState *bs, Error **errp
+ bool qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
+                                           bool release_stored, Error **errp);
+ int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp);
+-bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
+-                                                      const char *name,
+-                                                      uint32_t granularity,
+-                                                      Error **errp);
++bool coroutine_fn GRAPH_RDLOCK
++qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *name,
++                                    uint32_t granularity, Error **errp);
+ int coroutine_fn qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs,
+                                                          const char *name,
+                                                          Error **errp);
+diff --git a/include/block/block-io.h b/include/block/block-io.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-io.h
++++ b/include/block/block-io.h
+@@ -XXX,XX +XXX,XX @@ const char *bdrv_get_format_name(BlockDriverState *bs);
+ bool bdrv_supports_compressed_writes(BlockDriverState *bs);
+ const char *bdrv_get_node_name(const BlockDriverState *bs);
+-const char *bdrv_get_device_name(const BlockDriverState *bs);
+-const char *bdrv_get_device_or_node_name(const BlockDriverState *bs);
++
++const char * GRAPH_RDLOCK
++bdrv_get_device_name(const BlockDriverState *bs);
++
++const char * GRAPH_RDLOCK
++bdrv_get_device_or_node_name(const BlockDriverState *bs);
+ int coroutine_fn GRAPH_RDLOCK
+ bdrv_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
+diff --git a/include/block/block_int-io.h b/include/block/block_int-io.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block_int-io.h
++++ b/include/block/block_int-io.h
+@@ -XXX,XX +XXX,XX @@ BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size,
+  */
+ void bdrv_wakeup(BlockDriverState *bs);
+-const char *bdrv_get_parent_name(const BlockDriverState *bs);
++const char * GRAPH_RDLOCK bdrv_get_parent_name(const BlockDriverState *bs);
+ bool blk_dev_has_tray(BlockBackend *blk);
+ bool blk_dev_is_tray_open(BlockBackend *blk);
+diff --git a/include/block/qapi.h b/include/block/qapi.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/qapi.h
++++ b/include/block/qapi.h
+@@ -XXX,XX +XXX,XX @@ BlockDeviceInfo * GRAPH_RDLOCK
+ bdrv_block_device_info(BlockBackend *blk, BlockDriverState *bs,
+                        bool flat, Error **errp);
+-int bdrv_query_snapshot_info_list(BlockDriverState *bs,
+-                                  SnapshotInfoList **p_list,
+-                                  Error **errp);
++int GRAPH_RDLOCK
++bdrv_query_snapshot_info_list(BlockDriverState *bs,
++                              SnapshotInfoList **p_list,
++                              Error **errp);
+ void GRAPH_RDLOCK
+ bdrv_query_image_info(BlockDriverState *bs, ImageInfo **p_info, bool flat,
+                       bool skip_implicit_filters, Error **errp);
+diff --git a/block.c b/block.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block.c
++++ b/block.c
+@@ -XXX,XX +XXX,XX @@ bool bdrv_is_read_only(BlockDriverState *bs)
+     return !(bs->open_flags & BDRV_O_RDWR);
+ }
+-static int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,
+-                                  bool ignore_allow_rdw, Error **errp)
++static int GRAPH_RDLOCK
++bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,
++                       bool ignore_allow_rdw, Error **errp)
+ {
+     IO_CODE();
+@@ -XXX,XX +XXX,XX @@ int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
+     int ret = 0;
+     IO_CODE();
++    assume_graph_lock(); /* FIXME */
++
+     if (!(bs->open_flags & BDRV_O_RDWR)) {
+         return 0;
+     }
+@@ -XXX,XX +XXX,XX @@ bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
+      * to r/w. Attempting to set to r/w may fail if either BDRV_O_ALLOW_RDWR is
+      * not set, or if the BDS still has copy_on_read enabled */
+     read_only = !(reopen_state->flags & BDRV_O_RDWR);
++
++    bdrv_graph_rdlock_main_loop();
+     ret = bdrv_can_set_read_only(reopen_state->bs, read_only, true, &local_err);
++    bdrv_graph_rdunlock_main_loop();
+     if (local_err) {
+         error_propagate(errp, local_err);
+         goto error;
+@@ -XXX,XX +XXX,XX @@ bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
+     } else {
+         /* It is currently mandatory to have a bdrv_reopen_prepare()
+          * handler for each supported drv. */
++        bdrv_graph_rdlock_main_loop();
+         error_setg(errp, "Block format '%s' used by node '%s' "
+                    "does not support reopening files", drv->format_name,
+                    bdrv_get_device_or_node_name(reopen_state->bs));
++        bdrv_graph_rdunlock_main_loop();
+         ret = -1;
+         goto error;
+     }
+@@ -XXX,XX +XXX,XX @@ bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp)
+ {
+     BdrvOpBlocker *blocker;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     assert((int) op >= 0 && op < BLOCK_OP_TYPE_MAX);
+     if (!QLIST_EMPTY(&bs->op_blockers[op])) {
+         blocker = QLIST_FIRST(&bs->op_blockers[op]);
+diff --git a/block/backup.c b/block/backup.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/backup.c
++++ b/block/backup.c
+@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
+     assert(bs);
+     assert(target);
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     /* QMP interface protects us from these cases */
+     assert(sync_mode != MIRROR_SYNC_MODE_INCREMENTAL);
+diff --git a/block/parallels.c b/block/parallels.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/parallels.c
++++ b/block/parallels.c
+@@ -XXX,XX +XXX,XX @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
+         bitmap_new(DIV_ROUND_UP(s->header_size, s->bat_dirty_block));
+     /* Disable migration until bdrv_activate method is added */
++    bdrv_graph_rdlock_main_loop();
+     error_setg(&s->migration_blocker, "The Parallels format used by node '%s' "
+                "does not support live migration",
+                bdrv_get_device_or_node_name(bs));
++    bdrv_graph_rdunlock_main_loop();
++
+     ret = migrate_add_blocker(s->migration_blocker, errp);
+     if (ret < 0) {
+         error_setg(errp, "Migration blocker error");
+diff --git a/block/qcow.c b/block/qcow.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow.c
++++ b/block/qcow.c
+@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
+     }
+     /* Disable migration when qcow images are used */
++    bdrv_graph_rdlock_main_loop();
+     error_setg(&s->migration_blocker, "The qcow format used by node '%s' "
+                "does not support live migration",
+                bdrv_get_device_or_node_name(bs));
++    bdrv_graph_rdunlock_main_loop();
++
+     ret = migrate_add_blocker(s->migration_blocker, errp);
+     if (ret < 0) {
+         error_free(s->migration_blocker);
+diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2-bitmap.c
++++ b/block/qcow2-bitmap.c
+@@ -XXX,XX +XXX,XX @@ static int check_constraints_on_bitmap(BlockDriverState *bs,
+     int64_t len = bdrv_getlength(bs);
+     int64_t bitmap_bytes;
++    assume_graph_lock(); /* FIXME */
++
+     assert(granularity > 0);
+     assert((granularity & (granularity - 1)) == 0);
+diff --git a/block/qcow2.c b/block/qcow2.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2.c
++++ b/block/qcow2.c
+@@ -XXX,XX +XXX,XX @@ static int qcow2_inactivate(BlockDriverState *bs)
+     int ret, result = 0;
+     Error *local_err = NULL;
++    assume_graph_lock(); /* FIXME */
++
+     qcow2_store_persistent_dirty_bitmaps(bs, true, &local_err);
+     if (local_err != NULL) {
+         result = -EINVAL;
+@@ -XXX,XX +XXX,XX @@ void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
+     char *message;
+     va_list ap;
++    assume_graph_lock(); /* FIXME */
++
+     fatal = fatal && bdrv_is_writable(bs);
+     if (s->signaled_corruption &&
+diff --git a/block/quorum.c b/block/quorum.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/quorum.c
++++ b/block/quorum.c
+@@ -XXX,XX +XXX,XX @@ static void quorum_report_bad(QuorumOpType type, uint64_t offset,
+                                       end_sector - start_sector);
+ }
+-static void quorum_report_failure(QuorumAIOCB *acb)
++static void GRAPH_RDLOCK quorum_report_failure(QuorumAIOCB *acb)
+ {
+     const char *reference = bdrv_get_device_or_node_name(acb->bs);
+     int64_t start_sector = acb->offset / BDRV_SECTOR_SIZE;
+@@ -XXX,XX +XXX,XX @@ static void quorum_report_failure(QuorumAIOCB *acb)
+ static int quorum_vote_error(QuorumAIOCB *acb);
+-static bool quorum_has_too_much_io_failed(QuorumAIOCB *acb)
++static bool GRAPH_RDLOCK quorum_has_too_much_io_failed(QuorumAIOCB *acb)
+ {
+     BDRVQuorumState *s = acb->bs->opaque;
+diff --git a/block/rbd.c b/block/rbd.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/rbd.c
++++ b/block/rbd.c
+@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_reopen_prepare(BDRVReopenState *state,
+     BDRVRBDState *s = state->bs->opaque;
+     int ret = 0;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     if (s->snap && state->flags & BDRV_O_RDWR) {
+         error_setg(errp,
+                    "Cannot change node '%s' to r/w when using RBD snapshot",
+diff --git a/block/snapshot.c b/block/snapshot.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/snapshot.c
++++ b/block/snapshot.c
+@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_load_tmp(BlockDriverState *bs,
+     BlockDriver *drv = bs->drv;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (!drv) {
+         error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs));
+@@ -XXX,XX +XXX,XX @@ int bdrv_all_goto_snapshot(const char *name,
+         }
+         aio_context_release(ctx);
+         if (ret < 0) {
++            bdrv_graph_rdlock_main_loop();
+             error_prepend(errp, "Could not load snapshot '%s' on '%s': ",
+                           name, bdrv_get_device_or_node_name(bs));
++            bdrv_graph_rdunlock_main_loop();
+             return -1;
+         }
+diff --git a/block/vdi.c b/block/vdi.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/vdi.c
++++ b/block/vdi.c
+@@ -XXX,XX +XXX,XX @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
+     }
+     /* Disable migration when vdi images are used */
++    bdrv_graph_rdlock_main_loop();
+     error_setg(&s->migration_blocker, "The vdi format used by node '%s' "
+                "does not support live migration",
+                bdrv_get_device_or_node_name(bs));
++    bdrv_graph_rdunlock_main_loop();
++
+     ret = migrate_add_blocker(s->migration_blocker, errp);
+     if (ret < 0) {
+         error_free(s->migration_blocker);
+diff --git a/block/vpc.c b/block/vpc.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/vpc.c
++++ b/block/vpc.c
+@@ -XXX,XX +XXX,XX @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
+     }
+     /* Disable migration when VHD images are used */
++    bdrv_graph_rdlock_main_loop();
+     error_setg(&s->migration_blocker, "The vpc format used by node '%s' "
+                "does not support live migration",
+                bdrv_get_device_or_node_name(bs));
++    bdrv_graph_rdunlock_main_loop();
++
+     ret = migrate_add_blocker(s->migration_blocker, errp);
+     if (ret < 0) {
+         error_free(s->migration_blocker);
+diff --git a/block/vvfat.c b/block/vvfat.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/vvfat.c
++++ b/block/vvfat.c
+@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
+     QemuOpts *opts;
+     int ret;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+ #ifdef DEBUG
+     vvv = s;
+ #endif
+diff --git a/blockjob.c b/blockjob.c
+index XXXXXXX..XXXXXXX 100644
+--- a/blockjob.c
++++ b/blockjob.c
+@@ -XXX,XX +XXX,XX @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
+     BlockJob *job;
+     int ret;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (job_id == NULL && !(flags & JOB_INTERNAL)) {
+         job_id = bdrv_get_device_name(bs);
+--
+.41.0

-New patch
+[PULL 17/26] block: Mark bdrv_amend_options() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+bdrv_amend_options() need to hold a reader lock for the graph. This
+removes an assume_graph_lock() call in crypto's implementation.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-14-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block-global-state.h |  8 ++++----
+ include/block/block_int-common.h   | 10 ++++------
+ block/crypto.c                     |  4 +---
+ qemu-img.c                         |  7 +++++++
+files changed, 16 insertions(+), 13 deletions(-)
+diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-global-state.h
++++ b/include/block/block-global-state.h
+@@ -XXX,XX +XXX,XX @@ void bdrv_unfreeze_backing_chain(BlockDriverState *bs, BlockDriverState *base);
+  */
+ typedef void BlockDriverAmendStatusCB(BlockDriverState *bs, int64_t offset,
+                                       int64_t total_work_size, void *opaque);
+-int bdrv_amend_options(BlockDriverState *bs_new, QemuOpts *opts,
+-                       BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
+-                       bool force,
+-                       Error **errp);
++int GRAPH_RDLOCK
++bdrv_amend_options(BlockDriverState *bs_new, QemuOpts *opts,
++                   BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
++                   bool force, Error **errp);
+ /* check if a named node can be replaced when doing drive-mirror */
+ BlockDriverState * GRAPH_RDLOCK
+diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block_int-common.h
++++ b/include/block/block_int-common.h
+@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
+     int coroutine_fn GRAPH_UNLOCKED_PTR (*bdrv_co_create_opts)(
+         BlockDriver *drv, const char *filename, QemuOpts *opts, Error **errp);
+-    int (*bdrv_amend_options)(BlockDriverState *bs,
+-                              QemuOpts *opts,
+-                              BlockDriverAmendStatusCB *status_cb,
+-                              void *cb_opaque,
+-                              bool force,
+-                              Error **errp);
++    int GRAPH_RDLOCK_PTR (*bdrv_amend_options)(
++        BlockDriverState *bs, QemuOpts *opts,
++        BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
++        bool force, Error **errp);
+     int (*bdrv_make_empty)(BlockDriverState *bs);
+diff --git a/block/crypto.c b/block/crypto.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/crypto.c
++++ b/block/crypto.c
+@@ -XXX,XX +XXX,XX @@ block_crypto_amend_options_generic_luks(BlockDriverState *bs,
+                                        errp);
+ }
+-static int
++static int GRAPH_RDLOCK
+ block_crypto_amend_options_luks(BlockDriverState *bs,
+                                 QemuOpts *opts,
+                                 BlockDriverAmendStatusCB *status_cb,
+@@ -XXX,XX +XXX,XX @@ block_crypto_amend_options_luks(BlockDriverState *bs,
+     QCryptoBlockAmendOptions *amend_options = NULL;
+     int ret = -EINVAL;
+-    assume_graph_lock(); /* FIXME */
+-
+     assert(crypto);
+     assert(crypto->block);
+diff --git a/qemu-img.c b/qemu-img.c
+index XXXXXXX..XXXXXXX 100644
+--- a/qemu-img.c
++++ b/qemu-img.c
+@@ -XXX,XX +XXX,XX @@ static int print_amend_option_help(const char *format)
+ {
+     BlockDriver *drv;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     /* Find driver and parse its options */
+     drv = bdrv_find_format(format);
+     if (!drv) {
+@@ -XXX,XX +XXX,XX @@ static int img_amend(int argc, char **argv)
+         goto out;
+     }
++    bdrv_graph_rdlock_main_loop();
+     if (!bs->drv->bdrv_amend_options) {
+         error_report("Format driver '%s' does not support option amendment",
+                      fmt);
++        bdrv_graph_rdunlock_main_loop();
+         ret = -1;
+         goto out;
+     }
+@@ -XXX,XX +XXX,XX @@ static int img_amend(int argc, char **argv)
+                               "This option is only supported for image creation\n");
+         }
++        bdrv_graph_rdunlock_main_loop();
+         error_report_err(err);
+         ret = -1;
+         goto out;
+@@ -XXX,XX +XXX,XX @@ static int img_amend(int argc, char **argv)
+     qemu_progress_print(0.f, 0);
+     ret = bdrv_amend_options(bs, opts, &amend_status_cb, NULL, force, &err);
+     qemu_progress_print(100.f, 0);
++    bdrv_graph_rdunlock_main_loop();
++
+     if (ret < 0) {
+         error_report_err(err);
+         goto out;
+--
+.41.0

-New patch
+[PULL 18/26] qcow2: Mark qcow2_signal_corruption() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+qcow2_signal_corruption() need to hold a reader lock for the graph
+because it calls bdrv_get_node_name(), which accesses the parents list
+of a node.
+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: <20230929145157.45443-15-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block/qcow2.h                      | 180 +++++++++++++++++------------
+ include/block/block-global-state.h |   2 +-
+ include/block/block_int-common.h   |   2 +-
+ block.c                            |   3 +-
+ block/block-backend.c              |   2 +
+ block/qcow2-bitmap.c               |  31 ++---
+ block/qcow2-cache.c                |  11 +-
+ block/qcow2-cluster.c              |  62 +++++-----
+ block/qcow2-refcount.c             |  80 ++++++-------
+ block/qcow2.c                      |  61 +++++-----
+ block/replication.c                |   8 +-
+files changed, 250 insertions(+), 192 deletions(-)
+diff --git a/block/qcow2.h b/block/qcow2.h
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2.h
++++ b/block/qcow2.h
+@@ -XXX,XX +XXX,XX @@ int qcow2_mark_dirty(BlockDriverState *bs);
+ int qcow2_mark_corrupt(BlockDriverState *bs);
+ int qcow2_update_header(BlockDriverState *bs);
+-void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
+-                             int64_t size, const char *message_format, ...)
+-                             G_GNUC_PRINTF(5, 6);
++void GRAPH_RDLOCK
++qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
++                        int64_t size, const char *message_format, ...)
++                        G_GNUC_PRINTF(5, 6);
+ int qcow2_validate_table(BlockDriverState *bs, uint64_t offset,
+                          uint64_t entries, size_t entry_len,
+@@ -XXX,XX +XXX,XX @@ int qcow2_validate_table(BlockDriverState *bs, uint64_t offset,
+ int coroutine_fn GRAPH_RDLOCK qcow2_refcount_init(BlockDriverState *bs);
+ void qcow2_refcount_close(BlockDriverState *bs);
+-int qcow2_get_refcount(BlockDriverState *bs, int64_t cluster_index,
+-                       uint64_t *refcount);
++int GRAPH_RDLOCK qcow2_get_refcount(BlockDriverState *bs, int64_t cluster_index,
++                                    uint64_t *refcount);
+-int qcow2_update_cluster_refcount(BlockDriverState *bs, int64_t cluster_index,
+-                                  uint64_t addend, bool decrease,
+-                                  enum qcow2_discard_type type);
++int GRAPH_RDLOCK
++qcow2_update_cluster_refcount(BlockDriverState *bs, int64_t cluster_index,
++                              uint64_t addend, bool decrease,
++                              enum qcow2_discard_type type);
+-int64_t qcow2_refcount_area(BlockDriverState *bs, uint64_t offset,
+-                            uint64_t additional_clusters, bool exact_size,
+-                            int new_refblock_index,
+-                            uint64_t new_refblock_offset);
++int64_t GRAPH_RDLOCK
++qcow2_refcount_area(BlockDriverState *bs, uint64_t offset,
++                    uint64_t additional_clusters, bool exact_size,
++                    int new_refblock_index,
++                    uint64_t new_refblock_offset);
+-int64_t qcow2_alloc_clusters(BlockDriverState *bs, uint64_t size);
+-int64_t coroutine_fn qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset,
+-                                             int64_t nb_clusters);
+-int64_t coroutine_fn GRAPH_RDLOCK qcow2_alloc_bytes(BlockDriverState *bs, int size);
+-void qcow2_free_clusters(BlockDriverState *bs,
+-                          int64_t offset, int64_t size,
+-                          enum qcow2_discard_type type);
+-void qcow2_free_any_cluster(BlockDriverState *bs, uint64_t l2_entry,
+-                            enum qcow2_discard_type type);
++int64_t GRAPH_RDLOCK
++qcow2_alloc_clusters(BlockDriverState *bs, uint64_t size);
+-int qcow2_update_snapshot_refcount(BlockDriverState *bs,
+-    int64_t l1_table_offset, int l1_size, int addend);
++int64_t GRAPH_RDLOCK coroutine_fn
++qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset,
++                        int64_t nb_clusters);
+-int qcow2_flush_caches(BlockDriverState *bs);
+-int qcow2_write_caches(BlockDriverState *bs);
++int64_t coroutine_fn GRAPH_RDLOCK qcow2_alloc_bytes(BlockDriverState *bs, int size);
++void GRAPH_RDLOCK qcow2_free_clusters(BlockDriverState *bs,
++                                      int64_t offset, int64_t size,
++                                      enum qcow2_discard_type type);
++void GRAPH_RDLOCK
++qcow2_free_any_cluster(BlockDriverState *bs, uint64_t l2_entry,
++                       enum qcow2_discard_type type);
++
++int GRAPH_RDLOCK
++qcow2_update_snapshot_refcount(BlockDriverState *bs, int64_t l1_table_offset,
++                               int l1_size, int addend);
++
++int GRAPH_RDLOCK qcow2_flush_caches(BlockDriverState *bs);
++int GRAPH_RDLOCK qcow2_write_caches(BlockDriverState *bs);
+ int coroutine_fn qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
+                                        BdrvCheckMode fix);
+@@ -XXX,XX +XXX,XX @@ void qcow2_process_discards(BlockDriverState *bs, int ret);
+ int qcow2_check_metadata_overlap(BlockDriverState *bs, int ign, int64_t offset,
+                                  int64_t size);
+-int qcow2_pre_write_overlap_check(BlockDriverState *bs, int ign, int64_t offset,
+-                                  int64_t size, bool data_file);
++int GRAPH_RDLOCK
++qcow2_pre_write_overlap_check(BlockDriverState *bs, int ign, int64_t offset,
++                              int64_t size, bool data_file);
++
+ int coroutine_fn qcow2_inc_refcounts_imrt(BlockDriverState *bs, BdrvCheckResult *res,
+                                           void **refcount_table,
+                                           int64_t *refcount_table_size,
+                                           int64_t offset, int64_t size);
+-int qcow2_change_refcount_order(BlockDriverState *bs, int refcount_order,
+-                                BlockDriverAmendStatusCB *status_cb,
+-                                void *cb_opaque, Error **errp);
++int GRAPH_RDLOCK
++qcow2_change_refcount_order(BlockDriverState *bs, int refcount_order,
++                            BlockDriverAmendStatusCB *status_cb,
++                            void *cb_opaque, Error **errp);
+ int coroutine_fn GRAPH_RDLOCK qcow2_shrink_reftable(BlockDriverState *bs);
+-int64_t coroutine_fn qcow2_get_last_cluster(BlockDriverState *bs, int64_t size);
++
++int64_t coroutine_fn GRAPH_RDLOCK
++qcow2_get_last_cluster(BlockDriverState *bs, int64_t size);
+ int coroutine_fn GRAPH_RDLOCK
+ qcow2_detect_metadata_preallocation(BlockDriverState *bs);
+ /* qcow2-cluster.c functions */
+-int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
+-                        bool exact_size);
++int GRAPH_RDLOCK
++qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, bool exact_size);
+ int coroutine_fn GRAPH_RDLOCK
+ qcow2_shrink_l1_table(BlockDriverState *bs, uint64_t max_size);
+-int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index);
++int GRAPH_RDLOCK qcow2_write_l1_entry(BlockDriverState *bs, int l1_index);
+ int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num,
+                           uint8_t *buf, int nb_sectors, bool enc, Error **errp);
+-int qcow2_get_host_offset(BlockDriverState *bs, uint64_t offset,
+-                          unsigned int *bytes, uint64_t *host_offset,
+-                          QCow2SubclusterType *subcluster_type);
+-int coroutine_fn qcow2_alloc_host_offset(BlockDriverState *bs, uint64_t offset,
+-                                         unsigned int *bytes,
+-                                         uint64_t *host_offset, QCowL2Meta **m);
++int GRAPH_RDLOCK
++qcow2_get_host_offset(BlockDriverState *bs, uint64_t offset,
++                      unsigned int *bytes, uint64_t *host_offset,
++                      QCow2SubclusterType *subcluster_type);
++
++int coroutine_fn GRAPH_RDLOCK
++qcow2_alloc_host_offset(BlockDriverState *bs, uint64_t offset,
++                        unsigned int *bytes, uint64_t *host_offset,
++                        QCowL2Meta **m);
++
+ int coroutine_fn GRAPH_RDLOCK
+ qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs, uint64_t offset,
+                                       int compressed_size, uint64_t *host_offset);
+@@ -XXX,XX +XXX,XX @@ void qcow2_parse_compressed_l2_entry(BlockDriverState *bs, uint64_t l2_entry,
+ int coroutine_fn GRAPH_RDLOCK
+ qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m);
+-void coroutine_fn qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m);
+-int qcow2_cluster_discard(BlockDriverState *bs, uint64_t offset,
+-                          uint64_t bytes, enum qcow2_discard_type type,
+-                          bool full_discard);
++void coroutine_fn GRAPH_RDLOCK
++qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m);
++
++int GRAPH_RDLOCK
++qcow2_cluster_discard(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
++                      enum qcow2_discard_type type, bool full_discard);
+ int coroutine_fn GRAPH_RDLOCK
+ qcow2_subcluster_zeroize(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
+                          int flags);
+-int qcow2_expand_zero_clusters(BlockDriverState *bs,
+-                               BlockDriverAmendStatusCB *status_cb,
+-                               void *cb_opaque);
++int GRAPH_RDLOCK
++qcow2_expand_zero_clusters(BlockDriverState *bs,
++                           BlockDriverAmendStatusCB *status_cb,
++                           void *cb_opaque);
+ /* qcow2-snapshot.c functions */
+-int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
+-int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id);
+-int qcow2_snapshot_delete(BlockDriverState *bs,
+-                          const char *snapshot_id,
+-                          const char *name,
+-                          Error **errp);
++int GRAPH_RDLOCK
++qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
++
++int GRAPH_RDLOCK
++qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id);
++
++int GRAPH_RDLOCK
++qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id,
++                          const char *name, Error **errp);
++
+ int qcow2_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab);
+ int qcow2_snapshot_load_tmp(BlockDriverState *bs,
+                             const char *snapshot_id,
+@@ -XXX,XX +XXX,XX @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs,
+ void qcow2_free_snapshots(BlockDriverState *bs);
+ int coroutine_fn GRAPH_RDLOCK
+ qcow2_read_snapshots(BlockDriverState *bs, Error **errp);
+-int qcow2_write_snapshots(BlockDriverState *bs);
++int GRAPH_RDLOCK qcow2_write_snapshots(BlockDriverState *bs);
+ int coroutine_fn GRAPH_RDLOCK
+ qcow2_check_read_snapshot_table(BlockDriverState *bs, BdrvCheckResult *result,
+                                 BdrvCheckMode fix);
+-int coroutine_fn qcow2_check_fix_snapshot_table(BlockDriverState *bs,
+-                                                BdrvCheckResult *result,
+-                                                BdrvCheckMode fix);
++int coroutine_fn GRAPH_RDLOCK
++qcow2_check_fix_snapshot_table(BlockDriverState *bs, BdrvCheckResult *result,
++                               BdrvCheckMode fix);
+ /* qcow2-cache.c functions */
+ Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables,
+@@ -XXX,XX +XXX,XX @@ Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables,
+ int qcow2_cache_destroy(Qcow2Cache *c);
+ void qcow2_cache_entry_mark_dirty(Qcow2Cache *c, void *table);
+-int qcow2_cache_flush(BlockDriverState *bs, Qcow2Cache *c);
+-int qcow2_cache_write(BlockDriverState *bs, Qcow2Cache *c);
+-int qcow2_cache_set_dependency(BlockDriverState *bs, Qcow2Cache *c,
+-    Qcow2Cache *dependency);
++int GRAPH_RDLOCK qcow2_cache_flush(BlockDriverState *bs, Qcow2Cache *c);
++int GRAPH_RDLOCK qcow2_cache_write(BlockDriverState *bs, Qcow2Cache *c);
++int GRAPH_RDLOCK qcow2_cache_set_dependency(BlockDriverState *bs, Qcow2Cache *c,
++                                            Qcow2Cache *dependency);
+ void qcow2_cache_depends_on_flush(Qcow2Cache *c);
+ void qcow2_cache_clean_unused(Qcow2Cache *c);
+-int qcow2_cache_empty(BlockDriverState *bs, Qcow2Cache *c);
++int GRAPH_RDLOCK qcow2_cache_empty(BlockDriverState *bs, Qcow2Cache *c);
++
++int GRAPH_RDLOCK
++qcow2_cache_get(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
++                void **table);
++
++int GRAPH_RDLOCK
++qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
++                      void **table);
+-int qcow2_cache_get(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
+-    void **table);
+-int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
+-    void **table);
+ void qcow2_cache_put(Qcow2Cache *c, void **table);
+ void *qcow2_cache_is_table_offset(Qcow2Cache *c, uint64_t offset);
+ void qcow2_cache_discard(Qcow2Cache *c, void *table);
+@@ -XXX,XX +XXX,XX @@ bool coroutine_fn GRAPH_RDLOCK
+ qcow2_load_dirty_bitmaps(BlockDriverState *bs, bool *header_updated, Error **errp);
+ bool qcow2_get_bitmap_info_list(BlockDriverState *bs,
+                                 Qcow2BitmapInfoList **info_list, Error **errp);
+-int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp);
++int GRAPH_RDLOCK qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp);
++int GRAPH_RDLOCK qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp);
+ int coroutine_fn qcow2_truncate_bitmaps_check(BlockDriverState *bs, Error **errp);
+-bool qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
+-                                          bool release_stored, Error **errp);
+-int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp);
++
++bool GRAPH_RDLOCK
++qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, bool release_stored,
++                                     Error **errp);
++
+ bool coroutine_fn GRAPH_RDLOCK
+ qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *name,
+                                     uint32_t granularity, Error **errp);
+-int coroutine_fn qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs,
+-                                                         const char *name,
+-                                                         Error **errp);
++
++int coroutine_fn GRAPH_RDLOCK
++qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *name,
++                                        Error **errp);
++
+ bool qcow2_supports_persistent_dirty_bitmap(BlockDriverState *bs);
+ uint64_t qcow2_get_persistent_dirty_bitmap_size(BlockDriverState *bs,
+                                                 uint32_t cluster_size);
+diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-global-state.h
++++ b/include/block/block-global-state.h
+@@ -XXX,XX +XXX,XX @@ void GRAPH_RDLOCK
+ bdrv_refresh_limits(BlockDriverState *bs, Transaction *tran, Error **errp);
+ int bdrv_commit(BlockDriverState *bs);
+-int bdrv_make_empty(BdrvChild *c, Error **errp);
++int GRAPH_RDLOCK bdrv_make_empty(BdrvChild *c, Error **errp);
+ int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file,
+                              const char *backing_fmt, bool warn);
+ void bdrv_register(BlockDriver *bdrv);
+diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block_int-common.h
++++ b/include/block/block_int-common.h
+@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
+         BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
+         bool force, Error **errp);
+-    int (*bdrv_make_empty)(BlockDriverState *bs);
++    int GRAPH_RDLOCK_PTR (*bdrv_make_empty)(BlockDriverState *bs);
+     /*
+      * Refreshes the bs->exact_filename field. If that is impossible,
+diff --git a/block.c b/block.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block.c
++++ b/block.c
+@@ -XXX,XX +XXX,XX @@ bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp)
+ {
+     BdrvOpBlocker *blocker;
+     GLOBAL_STATE_CODE();
+-    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
++    assume_graph_lock(); /* FIXME */
+     assert((int) op >= 0 && op < BLOCK_OP_TYPE_MAX);
+     if (!QLIST_EMPTY(&bs->op_blockers[op])) {
+diff --git a/block/block-backend.c b/block/block-backend.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/block-backend.c
++++ b/block/block-backend.c
+@@ -XXX,XX +XXX,XX @@ const BdrvChild *blk_root(BlockBackend *blk)
+ int blk_make_empty(BlockBackend *blk, Error **errp)
+ {
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     if (!blk_is_available(blk)) {
+         error_setg(errp, "No medium inserted");
+         return -ENOMEDIUM;
+diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2-bitmap.c
++++ b/block/qcow2-bitmap.c
+@@ -XXX,XX +XXX,XX @@ static int check_constraints_on_bitmap(BlockDriverState *bs,
+     return 0;
+ }
+-static void clear_bitmap_table(BlockDriverState *bs, uint64_t *bitmap_table,
+-                               uint32_t bitmap_table_size)
++static void GRAPH_RDLOCK
++clear_bitmap_table(BlockDriverState *bs, uint64_t *bitmap_table,
++                   uint32_t bitmap_table_size)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int i;
+@@ -XXX,XX +XXX,XX @@ fail:
+     return ret;
+ }
+-static int free_bitmap_clusters(BlockDriverState *bs, Qcow2BitmapTable *tb)
++static int GRAPH_RDLOCK
++free_bitmap_clusters(BlockDriverState *bs, Qcow2BitmapTable *tb)
+ {
+     int ret;
+     uint64_t *bitmap_table;
+@@ -XXX,XX +XXX,XX @@ out:
+  * Store bitmap list to qcow2 image as a bitmap directory.
+  * Everything is checked.
+  */
+-static int bitmap_list_store(BlockDriverState *bs, Qcow2BitmapList *bm_list,
+-                             uint64_t *offset, uint64_t *size, bool in_place)
++static int GRAPH_RDLOCK
++bitmap_list_store(BlockDriverState *bs, Qcow2BitmapList *bm_list,
++                  uint64_t *offset, uint64_t *size, bool in_place)
+ {
+     int ret;
+     uint8_t *dir;
+@@ -XXX,XX +XXX,XX @@ fail:
+  * Bitmap List end
+  */
+-static int update_ext_header_and_dir_in_place(BlockDriverState *bs,
+-                                              Qcow2BitmapList *bm_list)
++static int GRAPH_RDLOCK
++update_ext_header_and_dir_in_place(BlockDriverState *bs,
++                                   Qcow2BitmapList *bm_list)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int ret;
+@@ -XXX,XX +XXX,XX @@ static int update_ext_header_and_dir_in_place(BlockDriverState *bs,
+      */
+ }
+-static int update_ext_header_and_dir(BlockDriverState *bs,
+-                                     Qcow2BitmapList *bm_list)
++static int GRAPH_RDLOCK
++update_ext_header_and_dir(BlockDriverState *bs, Qcow2BitmapList *bm_list)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int ret;
+@@ -XXX,XX +XXX,XX @@ out:
+ /* store_bitmap_data()
+  * Store bitmap to image, filling bitmap table accordingly.
+  */
+-static uint64_t *store_bitmap_data(BlockDriverState *bs,
+-                                   BdrvDirtyBitmap *bitmap,
+-                                   uint32_t *bitmap_table_size, Error **errp)
++static uint64_t * GRAPH_RDLOCK
++store_bitmap_data(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,
++                  uint32_t *bitmap_table_size, Error **errp)
+ {
+     int ret;
+     BDRVQcow2State *s = bs->opaque;
+@@ -XXX,XX +XXX,XX @@ fail:
+  * Store bm->dirty_bitmap to qcow2.
+  * Set bm->table_offset and bm->table_size accordingly.
+  */
+-static int store_bitmap(BlockDriverState *bs, Qcow2Bitmap *bm, Error **errp)
++static int GRAPH_RDLOCK
++store_bitmap(BlockDriverState *bs, Qcow2Bitmap *bm, Error **errp)
+ {
+     int ret;
+     uint64_t *tb;
+diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2-cache.c
++++ b/block/qcow2-cache.c
+@@ -XXX,XX +XXX,XX @@ int qcow2_cache_destroy(Qcow2Cache *c)
+     return 0;
+ }
+-static int qcow2_cache_flush_dependency(BlockDriverState *bs, Qcow2Cache *c)
++static int GRAPH_RDLOCK
++qcow2_cache_flush_dependency(BlockDriverState *bs, Qcow2Cache *c)
+ {
+     int ret;
+@@ -XXX,XX +XXX,XX @@ static int qcow2_cache_flush_dependency(BlockDriverState *bs, Qcow2Cache *c)
+     return 0;
+ }
+-static int qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i)
++static int GRAPH_RDLOCK
++qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int ret = 0;
+@@ -XXX,XX +XXX,XX @@ int qcow2_cache_empty(BlockDriverState *bs, Qcow2Cache *c)
+     return 0;
+ }
+-static int qcow2_cache_do_get(BlockDriverState *bs, Qcow2Cache *c,
+-    uint64_t offset, void **table, bool read_from_disk)
++static int GRAPH_RDLOCK
++qcow2_cache_do_get(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
++                   void **table, bool read_from_disk)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int i;
+diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2-cluster.c
++++ b/block/qcow2-cluster.c
+@@ -XXX,XX +XXX,XX @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
+  * the cache is used; otherwise the L2 slice is loaded from the image
+  * file.
+  */
+-static int l2_load(BlockDriverState *bs, uint64_t offset,
+-                   uint64_t l2_offset, uint64_t **l2_slice)
++static int GRAPH_RDLOCK
++l2_load(BlockDriverState *bs, uint64_t offset,
++        uint64_t l2_offset, uint64_t **l2_slice)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int start_of_slice = l2_entry_size(s) *
+@@ -XXX,XX +XXX,XX @@ int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index)
+  *
+  */
+-static int l2_allocate(BlockDriverState *bs, int l1_index)
++static int GRAPH_RDLOCK l2_allocate(BlockDriverState *bs, int l1_index)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     uint64_t old_l2_offset;
+@@ -XXX,XX +XXX,XX @@ fail:
+  *
+  * Returns 0 on success, -errno in failure case
+  */
+-static int get_cluster_table(BlockDriverState *bs, uint64_t offset,
+-                             uint64_t **new_l2_slice,
+-                             int *new_l2_index)
++static int GRAPH_RDLOCK
++get_cluster_table(BlockDriverState *bs, uint64_t offset,
++                  uint64_t **new_l2_slice, int *new_l2_index)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     unsigned int l2_index;
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m)
+  *
+  * Returns 0 on success, -errno on failure.
+  */
+-static int coroutine_fn calculate_l2_meta(BlockDriverState *bs,
+-                                          uint64_t host_cluster_offset,
+-                                          uint64_t guest_offset, unsigned bytes,
+-                                          uint64_t *l2_slice, QCowL2Meta **m,
+-                                          bool keep_old)
++static int coroutine_fn GRAPH_RDLOCK
++calculate_l2_meta(BlockDriverState *bs, uint64_t host_cluster_offset,
++                  uint64_t guest_offset, unsigned bytes, uint64_t *l2_slice,
++                  QCowL2Meta **m, bool keep_old)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int sc_index, l2_index = offset_to_l2_slice_index(s, guest_offset);
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn handle_dependencies(BlockDriverState *bs,
+  *
+  *  -errno: in error cases
+  */
+-static int coroutine_fn handle_copied(BlockDriverState *bs,
+-    uint64_t guest_offset, uint64_t *host_offset, uint64_t *bytes,
+-    QCowL2Meta **m)
++static int coroutine_fn GRAPH_RDLOCK
++handle_copied(BlockDriverState *bs, uint64_t guest_offset,
++              uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int l2_index;
+@@ -XXX,XX +XXX,XX @@ out:
+  * function has been waiting for another request and the allocation must be
+  * restarted, but the whole request should not be failed.
+  */
+-static int coroutine_fn do_alloc_cluster_offset(BlockDriverState *bs,
+-                                                uint64_t guest_offset,
+-                                                uint64_t *host_offset,
+-                                                uint64_t *nb_clusters)
++static int coroutine_fn GRAPH_RDLOCK
++do_alloc_cluster_offset(BlockDriverState *bs, uint64_t guest_offset,
++                        uint64_t *host_offset, uint64_t *nb_clusters)
+ {
+     BDRVQcow2State *s = bs->opaque;
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn do_alloc_cluster_offset(BlockDriverState *bs,
+  *
+  *  -errno: in error cases
+  */
+-static int coroutine_fn handle_alloc(BlockDriverState *bs,
+-    uint64_t guest_offset, uint64_t *host_offset, uint64_t *bytes,
+-    QCowL2Meta **m)
++static int coroutine_fn GRAPH_RDLOCK
++handle_alloc(BlockDriverState *bs, uint64_t guest_offset,
++             uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int l2_index;
+@@ -XXX,XX +XXX,XX @@ again:
+  * all clusters in the same L2 slice) and returns the number of discarded
+  * clusters.
+  */
+-static int discard_in_l2_slice(BlockDriverState *bs, uint64_t offset,
+-                               uint64_t nb_clusters,
+-                               enum qcow2_discard_type type, bool full_discard)
++static int GRAPH_RDLOCK
++discard_in_l2_slice(BlockDriverState *bs, uint64_t offset, uint64_t nb_clusters,
++                    enum qcow2_discard_type type, bool full_discard)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     uint64_t *l2_slice;
+@@ -XXX,XX +XXX,XX @@ fail:
+  * all clusters in the same L2 slice) and returns the number of zeroed
+  * clusters.
+  */
+-static int coroutine_fn
++static int coroutine_fn GRAPH_RDLOCK
+ zero_in_l2_slice(BlockDriverState *bs, uint64_t offset,
+                  uint64_t nb_clusters, int flags)
+ {
+@@ -XXX,XX +XXX,XX @@ zero_in_l2_slice(BlockDriverState *bs, uint64_t offset,
+     return nb_clusters;
+ }
+-static int coroutine_fn
++static int coroutine_fn GRAPH_RDLOCK
+ zero_l2_subclusters(BlockDriverState *bs, uint64_t offset,
+                     unsigned nb_subclusters)
+ {
+@@ -XXX,XX +XXX,XX @@ fail:
+  * status_cb(). l1_entries contains the total number of L1 entries and
+  * *visited_l1_entries counts all visited L1 entries.
+  */
+-static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table,
+-                                      int l1_size, int64_t *visited_l1_entries,
+-                                      int64_t l1_entries,
+-                                      BlockDriverAmendStatusCB *status_cb,
+-                                      void *cb_opaque)
++static int GRAPH_RDLOCK
++expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table,
++                           int l1_size, int64_t *visited_l1_entries,
++                           int64_t l1_entries,
++                           BlockDriverAmendStatusCB *status_cb,
++                           void *cb_opaque)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     bool is_active_l1 = (l1_table == s->l1_table);
+diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2-refcount.c
++++ b/block/qcow2-refcount.c
+@@ -XXX,XX +XXX,XX @@ static void set_refcount_ro6(void *refcount_array, uint64_t index,
+ }
+-static int load_refcount_block(BlockDriverState *bs,
+-                               int64_t refcount_block_offset,
+-                               void **refcount_block)
++static int GRAPH_RDLOCK
++load_refcount_block(BlockDriverState *bs, int64_t refcount_block_offset,
++                    void **refcount_block)
+ {
+     BDRVQcow2State *s = bs->opaque;
+@@ -XXX,XX +XXX,XX @@ static int in_same_refcount_block(BDRVQcow2State *s, uint64_t offset_a,
+  *
+  * Returns 0 on success or -errno in error case
+  */
+-static int alloc_refcount_block(BlockDriverState *bs,
+-                                int64_t cluster_index, void **refcount_block)
++static int GRAPH_RDLOCK
++alloc_refcount_block(BlockDriverState *bs, int64_t cluster_index,
++                     void **refcount_block)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     unsigned int refcount_table_index;
+@@ -XXX,XX +XXX,XX @@ found:
+ /* XXX: cache several refcount block clusters ? */
+ /* @addend is the absolute value of the addend; if @decrease is set, @addend
+  * will be subtracted from the current refcount, otherwise it will be added */
+-static int update_refcount(BlockDriverState *bs,
+-                           int64_t offset,
+-                           int64_t length,
+-                           uint64_t addend,
+-                           bool decrease,
+-                           enum qcow2_discard_type type)
++static int GRAPH_RDLOCK
++update_refcount(BlockDriverState *bs, int64_t offset, int64_t length,
++                uint64_t addend, bool decrease, enum qcow2_discard_type type)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int64_t start, last, cluster_offset;
+@@ -XXX,XX +XXX,XX @@ int qcow2_update_cluster_refcount(BlockDriverState *bs,
+ /* return < 0 if error */
+-static int64_t alloc_clusters_noref(BlockDriverState *bs, uint64_t size,
+-                                    uint64_t max)
++static int64_t GRAPH_RDLOCK
++alloc_clusters_noref(BlockDriverState *bs, uint64_t size, uint64_t max)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     uint64_t i, nb_clusters, refcount;
+@@ -XXX,XX +XXX,XX @@ calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
+  * Compares the actual reference count for each cluster in the image against the
+  * refcount as reported by the refcount structures on-disk.
+  */
+-static void coroutine_fn
++static void coroutine_fn GRAPH_RDLOCK
+ compare_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
+                   BdrvCheckMode fix, bool *rebuild,
+                   int64_t *highest_cluster,
+@@ -XXX,XX +XXX,XX @@ int qcow2_pre_write_overlap_check(BlockDriverState *bs, int ign, int64_t offset,
+  *
+  * @allocated should be set to true if a new cluster has been allocated.
+  */
+-typedef int (RefblockFinishOp)(BlockDriverState *bs, uint64_t **reftable,
+-                               uint64_t reftable_index, uint64_t *reftable_size,
+-                               void *refblock, bool refblock_empty,
+-                               bool *allocated, Error **errp);
++typedef int /* GRAPH_RDLOCK_PTR */
++    (RefblockFinishOp)(BlockDriverState *bs, uint64_t **reftable,
++                       uint64_t reftable_index, uint64_t *reftable_size,
++                       void *refblock, bool refblock_empty,
++                       bool *allocated, Error **errp);
+ /**
+  * This "operation" for walk_over_reftable() allocates the refblock on disk (if
+  * it is not empty) and inserts its offset into the new reftable. The size of
+  * this new reftable is increased as required.
+  */
+-static int alloc_refblock(BlockDriverState *bs, uint64_t **reftable,
+-                          uint64_t reftable_index, uint64_t *reftable_size,
+-                          void *refblock, bool refblock_empty, bool *allocated,
+-                          Error **errp)
++static int GRAPH_RDLOCK
++alloc_refblock(BlockDriverState *bs, uint64_t **reftable,
++               uint64_t reftable_index, uint64_t *reftable_size,
++               void *refblock, bool refblock_empty, bool *allocated,
++               Error **errp)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int64_t offset;
+@@ -XXX,XX +XXX,XX @@ static int alloc_refblock(BlockDriverState *bs, uint64_t **reftable,
+  * offset specified by the new reftable's entry. It does not modify the new
+  * reftable or change any refcounts.
+  */
+-static int flush_refblock(BlockDriverState *bs, uint64_t **reftable,
+-                          uint64_t reftable_index, uint64_t *reftable_size,
+-                          void *refblock, bool refblock_empty, bool *allocated,
+-                          Error **errp)
++static int GRAPH_RDLOCK
++flush_refblock(BlockDriverState *bs, uint64_t **reftable,
++               uint64_t reftable_index, uint64_t *reftable_size,
++               void *refblock, bool refblock_empty, bool *allocated,
++               Error **errp)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int64_t offset;
+@@ -XXX,XX +XXX,XX @@ static int flush_refblock(BlockDriverState *bs, uint64_t **reftable,
+  *
+  * @allocated is set to true if a new cluster has been allocated.
+  */
+-static int walk_over_reftable(BlockDriverState *bs, uint64_t **new_reftable,
+-                              uint64_t *new_reftable_index,
+-                              uint64_t *new_reftable_size,
+-                              void *new_refblock, int new_refblock_size,
+-                              int new_refcount_bits,
+-                              RefblockFinishOp *operation, bool *allocated,
+-                              Qcow2SetRefcountFunc *new_set_refcount,
+-                              BlockDriverAmendStatusCB *status_cb,
+-                              void *cb_opaque, int index, int total,
+-                              Error **errp)
++static int GRAPH_RDLOCK
++walk_over_reftable(BlockDriverState *bs, uint64_t **new_reftable,
++                   uint64_t *new_reftable_index,
++                   uint64_t *new_reftable_size,
++                   void *new_refblock, int new_refblock_size,
++                   int new_refcount_bits,
++                   RefblockFinishOp *operation, bool *allocated,
++                   Qcow2SetRefcountFunc *new_set_refcount,
++                   BlockDriverAmendStatusCB *status_cb,
++                   void *cb_opaque, int index, int total,
++                   Error **errp)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     uint64_t reftable_index;
+@@ -XXX,XX +XXX,XX @@ done:
+     return ret;
+ }
+-static int64_t coroutine_fn get_refblock_offset(BlockDriverState *bs,
+-                                                uint64_t offset)
++static int64_t coroutine_fn GRAPH_RDLOCK
++get_refblock_offset(BlockDriverState *bs, uint64_t offset)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     uint32_t index = offset_to_reftable_index(s, offset);
+@@ -XXX,XX +XXX,XX @@ static int64_t coroutine_fn get_refblock_offset(BlockDriverState *bs,
+     return covering_refblock_offset;
+ }
+-static int coroutine_fn
++static int coroutine_fn GRAPH_RDLOCK
+ qcow2_discard_refcount_block(BlockDriverState *bs, uint64_t discard_block_offs)
+ {
+     BDRVQcow2State *s = bs->opaque;
+diff --git a/block/qcow2.c b/block/qcow2.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2.c
++++ b/block/qcow2.c
+@@ -XXX,XX +XXX,XX @@ int qcow2_mark_dirty(BlockDriverState *bs)
+  * function when there are no pending requests, it does not guard against
+  * concurrent requests dirtying the image.
+  */
+-static int qcow2_mark_clean(BlockDriverState *bs)
++static int GRAPH_RDLOCK qcow2_mark_clean(BlockDriverState *bs)
+ {
+     BDRVQcow2State *s = bs->opaque;
+@@ -XXX,XX +XXX,XX @@ int qcow2_mark_corrupt(BlockDriverState *bs)
+  * Marks the image as consistent, i.e., unsets the corrupt bit, and flushes
+  * before if necessary.
+  */
+-static int coroutine_fn qcow2_mark_consistent(BlockDriverState *bs)
++static int coroutine_fn GRAPH_RDLOCK
++qcow2_mark_consistent(BlockDriverState *bs)
+ {
+     BDRVQcow2State *s = bs->opaque;
+@@ -XXX,XX +XXX,XX @@ typedef struct Qcow2ReopenState {
+     QCryptoBlockOpenOptions *crypto_opts; /* Disk encryption runtime options */
+ } Qcow2ReopenState;
+-static int qcow2_update_options_prepare(BlockDriverState *bs,
+-                                        Qcow2ReopenState *r,
+-                                        QDict *options, int flags,
+-                                        Error **errp)
++static int GRAPH_RDLOCK
++qcow2_update_options_prepare(BlockDriverState *bs, Qcow2ReopenState *r,
++                             QDict *options, int flags, Error **errp)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     QemuOpts *opts = NULL;
+@@ -XXX,XX +XXX,XX @@ static void qcow2_update_options_abort(BlockDriverState *bs,
+     qapi_free_QCryptoBlockOpenOptions(r->crypto_opts);
+ }
+-static int coroutine_fn
++static int coroutine_fn GRAPH_RDLOCK
+ qcow2_update_options(BlockDriverState *bs, QDict *options, int flags,
+                      Error **errp)
+ {
+@@ -XXX,XX +XXX,XX @@ static void qcow2_refresh_limits(BlockDriverState *bs, Error **errp)
+     bs->bl.pdiscard_alignment = s->cluster_size;
+ }
+-static int qcow2_reopen_prepare(BDRVReopenState *state,
+-                                BlockReopenQueue *queue, Error **errp)
++static int GRAPH_UNLOCKED
++qcow2_reopen_prepare(BDRVReopenState *state,BlockReopenQueue *queue,
++                     Error **errp)
+ {
+     BDRVQcow2State *s = state->bs->opaque;
+     Qcow2ReopenState *r;
+     int ret;
++    GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     r = g_new0(Qcow2ReopenState, 1);
+     state->opaque = r;
+@@ -XXX,XX +XXX,XX @@ static void qcow2_reopen_commit(BDRVReopenState *state)
+ static void qcow2_reopen_commit_post(BDRVReopenState *state)
+ {
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     if (state->flags & BDRV_O_RDWR) {
+         Error *local_err = NULL;
+@@ -XXX,XX +XXX,XX @@ qcow2_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int64_t bytes,
+     return ret;
+ }
+-static coroutine_fn int qcow2_co_pdiscard(BlockDriverState *bs,
+-                                          int64_t offset, int64_t bytes)
++static int coroutine_fn GRAPH_RDLOCK
++qcow2_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes)
+ {
+     int ret;
+     BDRVQcow2State *s = bs->opaque;
+@@ -XXX,XX +XXX,XX @@ fail:
+     return ret;
+ }
+-static int make_completely_empty(BlockDriverState *bs)
++static int GRAPH_RDLOCK make_completely_empty(BlockDriverState *bs)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     Error *local_err = NULL;
+@@ -XXX,XX +XXX,XX @@ fail:
+     return ret;
+ }
+-static int qcow2_make_empty(BlockDriverState *bs)
++static int GRAPH_RDLOCK qcow2_make_empty(BlockDriverState *bs)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     uint64_t offset, end_offset;
+@@ -XXX,XX +XXX,XX @@ static int qcow2_make_empty(BlockDriverState *bs)
+     return ret;
+ }
+-static coroutine_fn int qcow2_co_flush_to_os(BlockDriverState *bs)
++static coroutine_fn GRAPH_RDLOCK int qcow2_co_flush_to_os(BlockDriverState *bs)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int ret;
+@@ -XXX,XX +XXX,XX @@ qcow2_co_load_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
+     return bs->drv->bdrv_co_preadv_part(bs, offset, qiov->size, qiov, 0, 0);
+ }
+-static int qcow2_has_compressed_clusters(BlockDriverState *bs)
++static int GRAPH_RDLOCK qcow2_has_compressed_clusters(BlockDriverState *bs)
+ {
+     int64_t offset = 0;
+     int64_t bytes = bdrv_getlength(bs);
+@@ -XXX,XX +XXX,XX @@ static int qcow2_has_compressed_clusters(BlockDriverState *bs)
+  * Downgrades an image's version. To achieve this, any incompatible features
+  * have to be removed.
+  */
+-static int qcow2_downgrade(BlockDriverState *bs, int target_version,
+-                           BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
+-                           Error **errp)
++static int GRAPH_RDLOCK
++qcow2_downgrade(BlockDriverState *bs, int target_version,
++                BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
++                Error **errp)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int current_version = s->qcow_version;
+@@ -XXX,XX +XXX,XX @@ static int qcow2_downgrade(BlockDriverState *bs, int target_version,
+  * features of older versions, some things may have to be presented
+  * differently.
+  */
+-static int qcow2_upgrade(BlockDriverState *bs, int target_version,
+-                         BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
+-                         Error **errp)
++static int GRAPH_RDLOCK
++qcow2_upgrade(BlockDriverState *bs, int target_version,
++              BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
++              Error **errp)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     bool need_snapshot_update;
+@@ -XXX,XX +XXX,XX @@ static void qcow2_amend_helper_cb(BlockDriverState *bs,
+                              info->original_cb_opaque);
+ }
+-static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,
+-                               BlockDriverAmendStatusCB *status_cb,
+-                               void *cb_opaque,
+-                               bool force,
+-                               Error **errp)
++static int GRAPH_RDLOCK
++qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,
++                    BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
++                    bool force, Error **errp)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int old_version = s->qcow_version, new_version = old_version;
+@@ -XXX,XX +XXX,XX @@ void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
+     char *message;
+     va_list ap;
+-    assume_graph_lock(); /* FIXME */
+-
+     fatal = fatal && bdrv_is_writable(bs);
+     if (s->signaled_corruption &&
+diff --git a/block/replication.c b/block/replication.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/replication.c
++++ b/block/replication.c
+@@ -XXX,XX +XXX,XX @@ out:
+     return ret;
+ }
+-static void secondary_do_checkpoint(BlockDriverState *bs, Error **errp)
++static void GRAPH_UNLOCKED
++secondary_do_checkpoint(BlockDriverState *bs, Error **errp)
+ {
+     BDRVReplicationState *s = bs->opaque;
+     BdrvChild *active_disk = bs->file;
+     Error *local_err = NULL;
+     int ret;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     if (!s->backup_job) {
+         error_setg(errp, "Backup job was cancelled unexpectedly");
+         return;
+@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
+         /* Must be true, or the bdrv_getlength() calls would have failed */
+         assert(active_disk->bs->drv && hidden_disk->bs->drv);
++        bdrv_graph_rdlock_main_loop();
+         if (!active_disk->bs->drv->bdrv_make_empty ||
+             !hidden_disk->bs->drv->bdrv_make_empty) {
+             error_setg(errp,
+                        "Active disk or hidden disk doesn't support make_empty");
+             aio_context_release(aio_context);
++            bdrv_graph_rdunlock_main_loop();
+             return;
+         }
++        bdrv_graph_rdunlock_main_loop();
+         /* reopen the backing file in r/w mode */
+         reopen_backing_file(bs, true, &local_err);
+--
+.41.0

-New patch
+[PULL 19/26] qcow2: Mark qcow2_inactivate() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+qcow2_inactivate() need to hold a reader lock for the graph because it
+calls bdrv_get_device_or_node_name(), which accesses the parents list of
+a node.
+qcow2_do_close() is a bit strange because it is called from different
+contexts. If close_data_file = true, we know that we were called from
+non-coroutine main loop context (more specifically, we're coming from
+qcow2_close()) and can safely drop the reader lock temporarily with
+bdrv_graph_rdunlock_main_loop() and acquire the writer lock.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-16-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block/qcow2.c | 15 ++++++++++-----
+file changed, 10 insertions(+), 5 deletions(-)
+diff --git a/block/qcow2.c b/block/qcow2.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2.c
++++ b/block/qcow2.c
+@@ -XXX,XX +XXX,XX @@ fail_nometa:
+     return ret;
+ }
+-static int qcow2_inactivate(BlockDriverState *bs)
++static int GRAPH_RDLOCK qcow2_inactivate(BlockDriverState *bs)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int ret, result = 0;
+     Error *local_err = NULL;
+-    assume_graph_lock(); /* FIXME */
+-
+     qcow2_store_persistent_dirty_bitmaps(bs, true, &local_err);
+     if (local_err != NULL) {
+         result = -EINVAL;
+@@ -XXX,XX +XXX,XX @@ static int qcow2_inactivate(BlockDriverState *bs)
+     return result;
+ }
+-static void qcow2_do_close(BlockDriverState *bs, bool close_data_file)
++static void coroutine_mixed_fn GRAPH_RDLOCK
++qcow2_do_close(BlockDriverState *bs, bool close_data_file)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     qemu_vfree(s->l1_table);
+@@ -XXX,XX +XXX,XX @@ static void qcow2_do_close(BlockDriverState *bs, bool close_data_file)
+     g_free(s->image_backing_format);
+     if (close_data_file && has_data_file(bs)) {
++        GLOBAL_STATE_CODE();
++        bdrv_graph_rdunlock_main_loop();
+         bdrv_graph_wrlock(NULL);
+         bdrv_unref_child(bs, s->data_file);
+         bdrv_graph_wrunlock();
+         s->data_file = NULL;
++        bdrv_graph_rdlock_main_loop();
+     }
+     qcow2_refcount_close(bs);
+     qcow2_free_snapshots(bs);
+ }
+-static void qcow2_close(BlockDriverState *bs)
++static void GRAPH_UNLOCKED qcow2_close(BlockDriverState *bs)
+ {
++    GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     qcow2_do_close(bs, true);
+ }
+--
+.41.0

-New patch
+[PULL 20/26] qcow2: Mark check_constraints_on_bitmap() GRAPH_RDLOCK
+It still has an assume_graph_lock() call, but all of its callers are now
+properly annotated to hold the graph lock. Update the function to be
+GRAPH_RDLOCK as well and remove the assume_graph_lock().
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-17-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ block/qcow2-bitmap.c | 9 +++------
+file changed, 3 insertions(+), 6 deletions(-)
+diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qcow2-bitmap.c
++++ b/block/qcow2-bitmap.c
+@@ -XXX,XX +XXX,XX @@ static int64_t get_bitmap_bytes_needed(int64_t len, uint32_t granularity)
+     return DIV_ROUND_UP(num_bits, 8);
+ }
+-static int check_constraints_on_bitmap(BlockDriverState *bs,
+-                                       const char *name,
+-                                       uint32_t granularity,
+-                                       Error **errp)
++static int GRAPH_RDLOCK
++check_constraints_on_bitmap(BlockDriverState *bs, const char *name,
++                            uint32_t granularity, Error **errp)
+ {
+     BDRVQcow2State *s = bs->opaque;
+     int granularity_bits = ctz32(granularity);
+     int64_t len = bdrv_getlength(bs);
+     int64_t bitmap_bytes;
+-    assume_graph_lock(); /* FIXME */
+-
+     assert(granularity > 0);
+     assert((granularity & (granularity - 1)) == 0);
+--
+.41.0

-New patch
+[PULL 21/26] block: Mark bdrv_op_is_blocked() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+bdrv_op_is_blocked() need to hold a reader lock for the graph
+because it calls bdrv_get_device_or_node_name(), which accesses the
+parents list of a node.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-18-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block-global-state.h |  4 +++-
+ block.c                            |  2 --
+ block/block-backend.c              |  1 +
+ block/commit.c                     |  1 +
+ block/monitor/block-hmp-cmds.c     |  3 +++
+ block/qapi-sysemu.c                |  9 +++++++--
+ blockdev.c                         | 15 +++++++++++++++
+files changed, 30 insertions(+), 5 deletions(-)
+diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-global-state.h
++++ b/include/block/block-global-state.h
+@@ -XXX,XX +XXX,XX @@ bdrv_attach_child(BlockDriverState *parent_bs,
+                   BdrvChildRole child_role,
+                   Error **errp);
+-bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp);
++bool GRAPH_RDLOCK
++bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp);
++
+ void bdrv_op_block(BlockDriverState *bs, BlockOpType op, Error *reason);
+ void bdrv_op_unblock(BlockDriverState *bs, BlockOpType op, Error *reason);
+ void bdrv_op_block_all(BlockDriverState *bs, Error *reason);
+diff --git a/block.c b/block.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block.c
++++ b/block.c
+@@ -XXX,XX +XXX,XX @@ bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp)
+     BdrvOpBlocker *blocker;
+     GLOBAL_STATE_CODE();
+-    assume_graph_lock(); /* FIXME */
+-
+     assert((int) op >= 0 && op < BLOCK_OP_TYPE_MAX);
+     if (!QLIST_EMPTY(&bs->op_blockers[op])) {
+         blocker = QLIST_FIRST(&bs->op_blockers[op]);
+diff --git a/block/block-backend.c b/block/block-backend.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/block-backend.c
++++ b/block/block-backend.c
+@@ -XXX,XX +XXX,XX @@ bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op, Error **errp)
+ {
+     BlockDriverState *bs = blk_bs(blk);
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (!bs) {
+         return false;
+diff --git a/block/commit.c b/block/commit.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/commit.c
++++ b/block/commit.c
+@@ -XXX,XX +XXX,XX @@ int bdrv_commit(BlockDriverState *bs)
+     Error *local_err = NULL;
+     GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
+     if (!drv)
+         return -ENOMEDIUM;
+diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/monitor/block-hmp-cmds.c
++++ b/block/monitor/block-hmp-cmds.c
+@@ -XXX,XX +XXX,XX @@ void hmp_drive_del(Monitor *mon, const QDict *qdict)
+     AioContext *aio_context;
+     Error *local_err = NULL;
++    GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     bs = bdrv_find_node(id);
+     if (bs) {
+         qmp_blockdev_del(id, &local_err);
+diff --git a/block/qapi-sysemu.c b/block/qapi-sysemu.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/qapi-sysemu.c
++++ b/block/qapi-sysemu.c
+@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_close_tray(const char *device,
+     }
+ }
+-static void blockdev_remove_medium(const char *device, const char *id,
+-                                   Error **errp)
++static void GRAPH_UNLOCKED
++blockdev_remove_medium(const char *device, const char *id, Error **errp)
+ {
+     BlockBackend *blk;
+     BlockDriverState *bs;
+     AioContext *aio_context;
+     bool has_attached_device;
++    GLOBAL_STATE_CODE();
++
+     blk = qmp_get_blk(device, id, errp);
+     if (!blk) {
+         return;
+@@ -XXX,XX +XXX,XX @@ static void blockdev_remove_medium(const char *device, const char *id,
+     aio_context = bdrv_get_aio_context(bs);
+     aio_context_acquire(aio_context);
++    bdrv_graph_rdlock_main_loop();
+     if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_EJECT, errp)) {
++        bdrv_graph_rdunlock_main_loop();
+         goto out;
+     }
++    bdrv_graph_rdunlock_main_loop();
+     blk_remove_bs(blk);
+diff --git a/blockdev.c b/blockdev.c
+index XXXXXXX..XXXXXXX 100644
+--- a/blockdev.c
++++ b/blockdev.c
+@@ -XXX,XX +XXX,XX @@ static void drive_backup_action(DriveBackup *backup,
+     }
+     /* Early check to avoid creating target */
++    bdrv_graph_rdlock_main_loop();
+     if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKUP_SOURCE, errp)) {
++        bdrv_graph_rdunlock_main_loop();
+         goto out;
+     }
++    bdrv_graph_rdunlock_main_loop();
+     flags = bs->open_flags | BDRV_O_RDWR;
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn qmp_block_resize(const char *device, const char *node_name,
+         return;
+     }
++    bdrv_graph_co_rdlock();
+     if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_RESIZE, NULL)) {
+         error_setg(errp, QERR_DEVICE_IN_USE, device);
++        bdrv_graph_co_rdunlock();
+         return;
+     }
++    bdrv_graph_co_rdunlock();
+     blk = blk_co_new_with_bs(bs, BLK_PERM_RESIZE, BLK_PERM_ALL, errp);
+     if (!blk) {
+@@ -XXX,XX +XXX,XX @@ void qmp_block_stream(const char *job_id, const char *device,
+      * Check for op blockers in the whole chain between bs and base (or bottom)
+      */
+     iter_end = bottom ? bdrv_filter_or_cow_bs(bottom_bs) : base_bs;
++    bdrv_graph_rdlock_main_loop();
+     for (iter = bs; iter && iter != iter_end;
+          iter = bdrv_filter_or_cow_bs(iter))
+     {
+         if (bdrv_op_is_blocked(iter, BLOCK_OP_TYPE_STREAM, errp)) {
++            bdrv_graph_rdunlock_main_loop();
+             goto out;
+         }
+     }
++    bdrv_graph_rdunlock_main_loop();
+     /* if we are streaming the entire chain, the result will have no backing
+      * file, and specifying one is therefore an error */
+@@ -XXX,XX +XXX,XX @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
+     }
+     /* Early check to avoid creating target */
++    bdrv_graph_rdlock_main_loop();
+     if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_MIRROR_SOURCE, errp)) {
++        bdrv_graph_rdunlock_main_loop();
+         return;
+     }
++    bdrv_graph_rdunlock_main_loop();
+     aio_context = bdrv_get_aio_context(bs);
+     aio_context_acquire(aio_context);
+@@ -XXX,XX +XXX,XX @@ void qmp_change_backing_file(const char *device,
+     /* even though we are not necessarily operating on bs, we need it to
+      * determine if block ops are currently prohibited on the chain */
++    bdrv_graph_rdlock_main_loop();
+     if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_CHANGE, errp)) {
++        bdrv_graph_rdunlock_main_loop();
+         goto out;
+     }
++    bdrv_graph_rdunlock_main_loop();
+     /* final sanity check */
+     if (!bdrv_chain_contains(bs, image_bs)) {
+--
+.41.0

-New patch
+[PULL 22/26] block: Mark bdrv_apply_auto_read_only() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+bdrv_apply_auto_read_only() need to hold a reader lock for the graph
+because it calls bdrv_can_set_read_only(), which indirectly accesses the
+parents list of a node.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-19-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block-io.h | 6 ++++--
+ block.c                  | 4 ++--
+ block/bochs.c            | 2 ++
+ block/cloop.c            | 2 ++
+ block/curl.c             | 2 ++
+ block/dmg.c              | 2 ++
+ block/gluster.c          | 2 ++
+ block/iscsi.c            | 2 ++
+ block/nbd.c              | 3 ++-
+ block/rbd.c              | 2 ++
+files changed, 22 insertions(+), 5 deletions(-)
+diff --git a/include/block/block-io.h b/include/block/block-io.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-io.h
++++ b/include/block/block-io.h
+@@ -XXX,XX +XXX,XX @@ bdrv_is_allocated_above(BlockDriverState *bs, BlockDriverState *base,
+ int coroutine_fn GRAPH_RDLOCK
+ bdrv_co_is_zero_fast(BlockDriverState *bs, int64_t offset, int64_t bytes);
+-int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
+-                              Error **errp);
++int GRAPH_RDLOCK
++bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
++                          Error **errp);
++
+ bool bdrv_is_read_only(BlockDriverState *bs);
+ bool bdrv_is_writable(BlockDriverState *bs);
+ bool bdrv_is_sg(BlockDriverState *bs);
+diff --git a/block.c b/block.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block.c
++++ b/block.c
+@@ -XXX,XX +XXX,XX @@ int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
+     int ret = 0;
+     IO_CODE();
+-    assume_graph_lock(); /* FIXME */
+-
+     if (!(bs->open_flags & BDRV_O_RDWR)) {
+         return 0;
+     }
+@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
+     if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, ro)) {
+         if (!ro && bdrv_is_whitelisted(drv, true)) {
++            bdrv_graph_rdlock_main_loop();
+             ret = bdrv_apply_auto_read_only(bs, NULL, NULL);
++            bdrv_graph_rdunlock_main_loop();
+         } else {
+             ret = -ENOTSUP;
+         }
+diff --git a/block/bochs.c b/block/bochs.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/bochs.c
++++ b/block/bochs.c
+@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
+     int ret;
+     /* No write support yet */
++    bdrv_graph_rdlock_main_loop();
+     ret = bdrv_apply_auto_read_only(bs, NULL, errp);
++    bdrv_graph_rdunlock_main_loop();
+     if (ret < 0) {
+         return ret;
+     }
+diff --git a/block/cloop.c b/block/cloop.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/cloop.c
++++ b/block/cloop.c
+@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
+     uint32_t offsets_size, max_compressed_block_size = 1, i;
+     int ret;
++    bdrv_graph_rdlock_main_loop();
+     ret = bdrv_apply_auto_read_only(bs, NULL, errp);
++    bdrv_graph_rdunlock_main_loop();
+     if (ret < 0) {
+         return ret;
+     }
+diff --git a/block/curl.c b/block/curl.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/curl.c
++++ b/block/curl.c
+@@ -XXX,XX +XXX,XX @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
+     const char *protocol_delimiter;
+     int ret;
++    bdrv_graph_rdlock_main_loop();
+     ret = bdrv_apply_auto_read_only(bs, "curl driver does not support writes",
+                                     errp);
++    bdrv_graph_rdunlock_main_loop();
+     if (ret < 0) {
+         return ret;
+     }
+diff --git a/block/dmg.c b/block/dmg.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/dmg.c
++++ b/block/dmg.c
+@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
+     int64_t offset;
+     int ret;
++    bdrv_graph_rdlock_main_loop();
+     ret = bdrv_apply_auto_read_only(bs, NULL, errp);
++    bdrv_graph_rdunlock_main_loop();
+     if (ret < 0) {
+         return ret;
+     }
+diff --git a/block/gluster.c b/block/gluster.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/gluster.c
++++ b/block/gluster.c
+@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_open(BlockDriverState *bs,  QDict *options,
+     if (ret == -EACCES || ret == -EROFS) {
+         /* Try to degrade to read-only, but if it doesn't work, still use the
+          * normal error message. */
++        bdrv_graph_rdlock_main_loop();
+         if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
+             open_flags = (open_flags & ~O_RDWR) | O_RDONLY;
+             s->fd = glfs_open(s->glfs, gconf->path, open_flags);
+             ret = s->fd ? 0 : -errno;
+         }
++        bdrv_graph_rdunlock_main_loop();
+     }
+     s->supports_seek_data = qemu_gluster_test_seek(s->fd);
+diff --git a/block/iscsi.c b/block/iscsi.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/iscsi.c
++++ b/block/iscsi.c
+@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
+     /* Check the write protect flag of the LUN if we want to write */
+     if (iscsilun->type == TYPE_DISK && (flags & BDRV_O_RDWR) &&
+         iscsilun->write_protected) {
++        bdrv_graph_rdlock_main_loop();
+         ret = bdrv_apply_auto_read_only(bs, "LUN is write protected", errp);
++        bdrv_graph_rdunlock_main_loop();
+         if (ret < 0) {
+             goto out;
+         }
+diff --git a/block/nbd.c b/block/nbd.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/nbd.c
++++ b/block/nbd.c
+@@ -XXX,XX +XXX,XX @@ static bool nbd_client_will_reconnect(BDRVNBDState *s)
+  * Return failure if the server's advertised options are incompatible with the
+  * client's needs.
+  */
+-static int nbd_handle_updated_info(BlockDriverState *bs, Error **errp)
++static int coroutine_fn GRAPH_RDLOCK
++nbd_handle_updated_info(BlockDriverState *bs, Error **errp)
+ {
+     BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
+     int ret;
+diff --git a/block/rbd.c b/block/rbd.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/rbd.c
++++ b/block/rbd.c
+@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
+     /* If we are using an rbd snapshot, we must be r/o, otherwise
+      * leave as-is */
+     if (s->snap != NULL) {
++        bdrv_graph_rdlock_main_loop();
+         r = bdrv_apply_auto_read_only(bs, "rbd snapshots are read-only", errp);
++        bdrv_graph_rdunlock_main_loop();
+         if (r < 0) {
+             goto failed_post_open;
+         }
+--
+.41.0

-New patch
+[PULL 23/26] block: Mark bdrv_get_specific_info() and callers GRAPH_RDLOCK
+This adds GRAPH_RDLOCK annotations to declare that callers of
+bdrv_get_specific_info() need to hold a reader lock for the graph.
+This removes an assume_graph_lock() call in vmdk's implementation.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-20-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block-io.h         | 5 +++--
+ include/block/block_int-common.h | 4 ++--
+ block/vmdk.c                     | 6 ++----
+ qemu-io-cmds.c                   | 3 +++
+files changed, 10 insertions(+), 8 deletions(-)
+diff --git a/include/block/block-io.h b/include/block/block-io.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block-io.h
++++ b/include/block/block-io.h
+@@ -XXX,XX +XXX,XX @@ bdrv_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
+ int co_wrapper_mixed_bdrv_rdlock
+ bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
+-ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,
+-                                          Error **errp);
++ImageInfoSpecific * GRAPH_RDLOCK
++bdrv_get_specific_info(BlockDriverState *bs, Error **errp);
++
+ BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs);
+ void bdrv_round_to_subclusters(BlockDriverState *bs,
+                                int64_t offset, int64_t bytes,
+diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block_int-common.h
++++ b/include/block/block_int-common.h
+@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
+     int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_get_info)(
+         BlockDriverState *bs, BlockDriverInfo *bdi);
+-    ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs,
+-                                                 Error **errp);
++    ImageInfoSpecific * GRAPH_RDLOCK_PTR (*bdrv_get_specific_info)(
++        BlockDriverState *bs, Error **errp);
+     BlockStatsSpecific *(*bdrv_get_specific_stats)(BlockDriverState *bs);
+     int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_save_vmstate)(
+diff --git a/block/vmdk.c b/block/vmdk.c
+index XXXXXXX..XXXXXXX 100644
+--- a/block/vmdk.c
++++ b/block/vmdk.c
+@@ -XXX,XX +XXX,XX @@ vmdk_co_check(BlockDriverState *bs, BdrvCheckResult *result, BdrvCheckMode fix)
+     return ret;
+ }
+-static ImageInfoSpecific *vmdk_get_specific_info(BlockDriverState *bs,
+-                                                 Error **errp)
++static ImageInfoSpecific * GRAPH_RDLOCK
++vmdk_get_specific_info(BlockDriverState *bs, Error **errp)
+ {
+     int i;
+     BDRVVmdkState *s = bs->opaque;
+     ImageInfoSpecific *spec_info = g_new0(ImageInfoSpecific, 1);
+     VmdkExtentInfoList **tail;
+-    assume_graph_lock(); /* FIXME */
+-
+     *spec_info = (ImageInfoSpecific){
+         .type = IMAGE_INFO_SPECIFIC_KIND_VMDK,
+         .u = {
+diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
+index XXXXXXX..XXXXXXX 100644
+--- a/qemu-io-cmds.c
++++ b/qemu-io-cmds.c
+@@ -XXX,XX +XXX,XX @@ static int info_f(BlockBackend *blk, int argc, char **argv)
+     char s1[64], s2[64];
+     int ret;
++    GLOBAL_STATE_CODE();
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
++
+     if (bs->drv && bs->drv->format_name) {
+         printf("format name: %s\n", bs->drv->format_name);
+     }
+--
+.41.0

-New patch
+[PULL 24/26] block: Protect bs->parents with graph_lock
+Almost all functions that access the parent link already take the graph
+lock now. Add locking to the remaining user in a test case and finally
+annotate the struct field itself as protected by the graph lock.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Message-ID: <20230929145157.45443-21-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+---
+ include/block/block_int-common.h | 4 ++--
+ tests/unit/test-block-iothread.c | 5 +++++
+files changed, 7 insertions(+), 2 deletions(-)
+diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/block/block_int-common.h
++++ b/include/block/block_int-common.h
+@@ -XXX,XX +XXX,XX @@ struct BdrvChild {
+     bool quiesced_parent;
+     QLIST_ENTRY(BdrvChild) next;
+-    QLIST_ENTRY(BdrvChild) next_parent;
++    QLIST_ENTRY(BdrvChild GRAPH_RDLOCK_PTR) next_parent;
+ };
+ /*
+@@ -XXX,XX +XXX,XX @@ struct BlockDriverState {
+     BdrvChild *backing;
+     BdrvChild *file;
+-    QLIST_HEAD(, BdrvChild) parents;
++    QLIST_HEAD(, BdrvChild GRAPH_RDLOCK_PTR) parents;
+     QDict *options;
+     QDict *explicit_options;
+diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c
+index XXXXXXX..XXXXXXX 100644
+--- a/tests/unit/test-block-iothread.c
++++ b/tests/unit/test-block-iothread.c
+@@ -XXX,XX +XXX,XX @@ static void test_sync_op(const void *opaque)
+     BlockDriverState *bs;
+     BdrvChild *c;
++    GLOBAL_STATE_CODE();
++
+     blk = blk_new(qemu_get_aio_context(), BLK_PERM_ALL, BLK_PERM_ALL);
+     bs = bdrv_new_open_driver(&bdrv_test, "base", BDRV_O_RDWR, &error_abort);
+     bs->total_sectors = 65536 / BDRV_SECTOR_SIZE;
+     blk_insert_bs(blk, bs, &error_abort);
++
++    bdrv_graph_rdlock_main_loop();
+     c = QLIST_FIRST(&bs->parents);
++    bdrv_graph_rdunlock_main_loop();
+     blk_set_aio_context(blk, ctx, &error_abort);
+     aio_context_acquire(ctx);
+--
+.41.0

-[PULL 3/3] hw/block/fdc-isa: Respect QOM properties when building AML
+[PULL 25/26] block: Protect bs->children with graph_lock
-From: Bernhard Beschow <shentey@gmail.com>
+Almost all functions that access the child links already take the graph
 lock now. Add locking to the remaining users and finally annotate the
 struct field itself as protected by the graph lock.
-Other ISA devices such as serial-isa use the properties in their
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-build_aml functions. fdc-isa not using them is probably an oversight.
+Message-ID: <20230929145157.45443-22-kwolf@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Signed-off-by: Bernhard Beschow <shentey@gmail.com>
 Message-Id: <20220209191558.30393-1-shentey@gmail.com>
 Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- hw/block/fdc-isa.c | 11 +++++++----
+ include/block/block_int-common.h | 4 ++--
-file changed, 7 insertions(+), 4 deletions(-)
+ block.c                          | 2 ++
  block/replication.c              | 3 ++-
  tests/unit/test-bdrv-drain.c     | 4 ++++
 files changed, 10 insertions(+), 3 deletions(-)
-diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
+diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
 index XXXXXXX..XXXXXXX 100644
---- a/hw/block/fdc-isa.c
+--- a/include/block/block_int-common.h
-+++ b/hw/block/fdc-isa.c
++++ b/include/block/block_int-common.h
-@@ -XXX,XX +XXX,XX @@ int cmos_get_fd_drive_type(FloppyDriveType fd0)
+@@ -XXX,XX +XXX,XX @@ struct BdrvChild {
+      */
- static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)
+     bool quiesced_parent;
 -    QLIST_ENTRY(BdrvChild) next;
 +    QLIST_ENTRY(BdrvChild GRAPH_RDLOCK_PTR) next;
      QLIST_ENTRY(BdrvChild GRAPH_RDLOCK_PTR) next_parent;
  };
@@ -XXX,XX +XXX,XX @@ struct BlockDriverState {
       * See also comment in include/block/block.h, to learn how backing and file
       * are connected with BdrvChildRole.
       */
 -    QLIST_HEAD(, BdrvChild) children;
 +    QLIST_HEAD(, BdrvChild GRAPH_RDLOCK_PTR) children;
      BdrvChild *backing;
      BdrvChild *file;
 diff --git a/block.c b/block.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block.c
 +++ b/block.c
@@ -XXX,XX +XXX,XX @@ static void bdrv_child_free(BdrvChild *child)
  {
-+    FDCtrlISABus *isa = ISA_FDC(isadev);
+     assert(!child->bs);
-     Aml *dev;
+     GLOBAL_STATE_CODE();
-     Aml *crs;
++    GRAPH_RDLOCK_GUARD_MAINLOOP();
-     int i;
++
-@@ -XXX,XX +XXX,XX @@ static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)
+     assert(!child->next.le_prev); /* not in children list */
-     };
+     g_free(child->name);
-     crs = aml_resource_template();
+diff --git a/block/replication.c b/block/replication.c
--    aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04));
+index XXXXXXX..XXXXXXX 100644
--    aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01));
+--- a/block/replication.c
--    aml_append(crs, aml_irq_no_flags(6));
++++ b/block/replication.c
-     aml_append(crs,
+@@ -XXX,XX +XXX,XX @@ static void backup_job_completed(void *opaque, int ret)
--        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2));
+     backup_job_cleanup(bs);
-+        aml_io(AML_DECODE16, isa->iobase + 2, isa->iobase + 2, 0x00, 0x04));
+ }
-+    aml_append(crs,
-+        aml_io(AML_DECODE16, isa->iobase + 7, isa->iobase + 7, 0x00, 0x01));
+-static bool check_top_bs(BlockDriverState *top_bs, BlockDriverState *bs)
-+    aml_append(crs, aml_irq_no_flags(isa->irq));
++static bool GRAPH_RDLOCK
-+    aml_append(crs,
++check_top_bs(BlockDriverState *top_bs, BlockDriverState *bs)
-+        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, isa->dma));
+ {
+     BdrvChild *child;
-     dev = aml_device("FDC0");
-     aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700")));
+diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/unit/test-bdrv-drain.c
 +++ b/tests/unit/test-bdrv-drain.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn test_co_delete_by_drain(void *opaque)
          blk_co_unref(blk);
      } else {
          BdrvChild *c, *next_c;
 +        bdrv_graph_co_rdlock();
          QLIST_FOREACH_SAFE(c, &bs->children, next, next_c) {
 +            bdrv_graph_co_rdunlock();
              bdrv_co_unref_child(bs, c);
 +            bdrv_graph_co_rdlock();
          }
 +        bdrv_graph_co_rdunlock();
      }
      dbdd->done = true;
 --
-.34.1
+.41.0

-[PULL 2/3] iotests: Test blockdev-reopen with iothreads and throttling
+[PULL 26/26] block: Add assertion for bdrv_graph_wrlock()
-The 'throttle' block driver implements .bdrv_co_drain_end, so
+bdrv_graph_wrlock() can't run in a coroutine (because it polls) and
-blockdev-reopen will have to wait for it to complete in the polling
+requires holding the BQL. We already have GLOBAL_STATE_CODE() to assert
-loop at the end of qmp_blockdev_reopen(). This makes AIO_WAIT_WHILE()
+the latter. Assert the former as well and add a no_coroutine_fn marker.
 release the AioContext lock, which causes a crash if the lock hasn't
 correctly been taken.
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Message-Id: <20220203140534.36522-3-kwolf@redhat.com>
+Message-ID: <20230929145157.45443-23-kwolf@redhat.com>
-Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 ---
- tests/qemu-iotests/245     | 36 +++++++++++++++++++++++++++++++++---
+ include/block/graph-lock.h | 3 ++-
- tests/qemu-iotests/245.out |  4 ++--
+ block/graph-lock.c         | 3 ++-
-files changed, 35 insertions(+), 5 deletions(-)
+files changed, 4 insertions(+), 2 deletions(-)
-diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245
+diff --git a/include/block/graph-lock.h b/include/block/graph-lock.h
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/245
 +++ b/tests/qemu-iotests/245
@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):
          self.assertEqual(self.get_node('hd1'), None)
          self.assert_qmp(self.get_node('hd2'), 'ro', True)
 -    def run_test_iothreads(self, iothread_a, iothread_b, errmsg = None):
 -        opts = hd_opts(0)
 +    def run_test_iothreads(self, iothread_a, iothread_b, errmsg = None,
 +                           opts_a = None, opts_b = None):
 +        opts = opts_a or hd_opts(0)
          result = self.vm.qmp('blockdev-add', conv_keys = False, **opts)
          self.assert_qmp(result, 'return', {})
 -        opts2 = hd_opts(2)
 +        opts2 = opts_b or hd_opts(2)
          result = self.vm.qmp('blockdev-add', conv_keys = False, **opts2)
          self.assert_qmp(result, 'return', {})
@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):
      def test_iothreads_switch_overlay(self):
          self.run_test_iothreads('', 'iothread0')
 +    def test_iothreads_with_throttling(self):
 +        # Create a throttle-group object
 +        opts = { 'qom-type': 'throttle-group', 'id': 'group0',
 +                 'limits': { 'iops-total': 1000 } }
 +        result = self.vm.qmp('object-add', conv_keys = False, **opts)
 +        self.assert_qmp(result, 'return', {})
 +
 +        # Options with a throttle filter between format and protocol
 +        opts = [
 +            {
 +                'driver': iotests.imgfmt,
 +                'node-name': f'hd{idx}',
 +                'file' : {
 +                    'node-name': f'hd{idx}-throttle',
 +                    'driver': 'throttle',
 +                    'throttle-group': 'group0',
 +                    'file': {
 +                        'driver': 'file',
 +                        'node-name': f'hd{idx}-file',
 +                        'filename': hd_path[idx],
 +                    },
 +                },
 +            }
 +            for idx in (0, 2)
 +        ]
 +
 +        self.run_test_iothreads('iothread0', 'iothread0', None,
 +                                opts[0], opts[1])
 +
  if __name__ == '__main__':
      iotests.activate_logging()
      iotests.main(supported_fmts=["qcow2"],
 diff --git a/tests/qemu-iotests/245.out b/tests/qemu-iotests/245.out
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/245.out
+--- a/include/block/graph-lock.h
-+++ b/tests/qemu-iotests/245.out
++++ b/include/block/graph-lock.h
-@@ -XXX,XX +XXX,XX @@ read 1/1 bytes at offset 262152
+@@ -XXX,XX +XXX,XX @@ void unregister_aiocontext(AioContext *ctx);
- read 1/1 bytes at offset 262160
+  * This function polls. Callers must not hold the lock of any AioContext other
-bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+  * 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);
--Ran 25 tests
-+Ran 26 tests
+ /*
+  * bdrv_graph_wrunlock:
- OK
+diff --git a/block/graph-lock.c b/block/graph-lock.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/graph-lock.c
 +++ b/block/graph-lock.c
@@ -XXX,XX +XXX,XX @@ 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
 --
-.34.1
+.41.0

The following changes since commit 0a301624c2f4ced3331ffd5bce85b4274fe132af:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20220208' into staging (2022-02-08 11:40:08 +0000)

are available in the Git repository at:

https://gitlab.com/kmwolf/qemu.git tags/for-upstream

for you to fetch changes up to fdb8541b2e4f6ff60f435fbb5a5e1df20c275a86:

hw/block/fdc-isa: Respect QOM properties when building AML (2022-02-11 17:37:26 +0100)

----------------------------------------------------------------
Block layer patches

- Fix crash in blockdev-reopen with iothreads
- fdc-isa: Respect QOM properties when building AML

----------------------------------------------------------------
Bernhard Beschow (1):
      hw/block/fdc-isa: Respect QOM properties when building AML

Kevin Wolf (2):
      block: Lock AioContext for drain_end in blockdev-reopen
      iotests: Test blockdev-reopen with iothreads and throttling

blockdev.c                 | 11 ++++++++++-
 hw/block/fdc-isa.c         | 11 +++++++----
 tests/qemu-iotests/245     | 36 +++++++++++++++++++++++++++++++++---
 tests/qemu-iotests/245.out |  4 ++--
 4 files changed, 52 insertions(+), 10 deletions(-)

bdrv_subtree_drained_end() requires the caller to hold the AioContext
lock for the drained node. Not doing this for nodes outside of the main
AioContext leads to crashes when AIO_WAIT_WHILE() needs to wait and
tries to temporarily release the lock.

Fixes: 3908b7a8994fa5ef7a89aa58cd5a02fc58141592
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2046659
Reported-by: Qing Wang <qinwang@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220203140534.36522-2-kwolf@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 blockdev.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/blockdev.c b/blockdev.c
index XXXXXXX..XXXXXXX 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)
 {
     BlockReopenQueue *queue = NULL;
     GSList *drained = NULL;
+    GSList *p;
 
     /* Add each one of the BDS that we want to reopen to the queue */
     for (; reopen_list != NULL; reopen_list = reopen_list->next) {
@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_reopen(BlockdevOptionsList *reopen_list, Error **errp)
 
 fail:
     bdrv_reopen_queue_free(queue);
-    g_slist_free_full(drained, (GDestroyNotify) bdrv_subtree_drained_end);
+    for (p = drained; p; p = p->next) {
+        BlockDriverState *bs = p->data;
+        AioContext *ctx = bdrv_get_aio_context(bs);
+
+        aio_context_acquire(ctx);
+        bdrv_subtree_drained_end(bs);
+        aio_context_release(ctx);
+    }
+    g_slist_free(drained);
 }
 
 void qmp_blockdev_del(const char *node_name, Error **errp)
-- 
2.34.1

The 'throttle' block driver implements .bdrv_co_drain_end, so
blockdev-reopen will have to wait for it to complete in the polling
loop at the end of qmp_blockdev_reopen(). This makes AIO_WAIT_WHILE()
release the AioContext lock, which causes a crash if the lock hasn't
correctly been taken.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220203140534.36522-3-kwolf@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/245     | 36 +++++++++++++++++++++++++++++++++---
 tests/qemu-iotests/245.out |  4 ++--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/245
+++ b/tests/qemu-iotests/245
@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):
         self.assertEqual(self.get_node('hd1'), None)
         self.assert_qmp(self.get_node('hd2'), 'ro', True)
 
-    def run_test_iothreads(self, iothread_a, iothread_b, errmsg = None):
-        opts = hd_opts(0)
+    def run_test_iothreads(self, iothread_a, iothread_b, errmsg = None,
+                           opts_a = None, opts_b = None):
+        opts = opts_a or hd_opts(0)
         result = self.vm.qmp('blockdev-add', conv_keys = False, **opts)
         self.assert_qmp(result, 'return', {})
 
-        opts2 = hd_opts(2)
+        opts2 = opts_b or hd_opts(2)
         result = self.vm.qmp('blockdev-add', conv_keys = False, **opts2)
         self.assert_qmp(result, 'return', {})
 
@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):
     def test_iothreads_switch_overlay(self):
         self.run_test_iothreads('', 'iothread0')
 
+    def test_iothreads_with_throttling(self):
+        # Create a throttle-group object
+        opts = { 'qom-type': 'throttle-group', 'id': 'group0',
+                 'limits': { 'iops-total': 1000 } }
+        result = self.vm.qmp('object-add', conv_keys = False, **opts)
+        self.assert_qmp(result, 'return', {})
+
+        # Options with a throttle filter between format and protocol
+        opts = [
+            {
+                'driver': iotests.imgfmt,
+                'node-name': f'hd{idx}',
+                'file' : {
+                    'node-name': f'hd{idx}-throttle',
+                    'driver': 'throttle',
+                    'throttle-group': 'group0',
+                    'file': {
+                        'driver': 'file',
+                        'node-name': f'hd{idx}-file',
+                        'filename': hd_path[idx],
+                    },
+                },
+            }
+            for idx in (0, 2)
+        ]
+
+        self.run_test_iothreads('iothread0', 'iothread0', None,
+                                opts[0], opts[1])
+
 if __name__ == '__main__':
     iotests.activate_logging()
     iotests.main(supported_fmts=["qcow2"],
diff --git a/tests/qemu-iotests/245.out b/tests/qemu-iotests/245.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/245.out
+++ b/tests/qemu-iotests/245.out
@@ -XXX,XX +XXX,XX @@ read 1/1 bytes at offset 262152
 read 1/1 bytes at offset 262160
 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
-...............
+................
 ----------------------------------------------------------------------
-Ran 25 tests
+Ran 26 tests
 
 OK
-- 
2.34.1

From: Bernhard Beschow <shentey@gmail.com>

Other ISA devices such as serial-isa use the properties in their
build_aml functions. fdc-isa not using them is probably an oversight.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20220209191558.30393-1-shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 hw/block/fdc-isa.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/fdc-isa.c
+++ b/hw/block/fdc-isa.c
@@ -XXX,XX +XXX,XX @@ int cmos_get_fd_drive_type(FloppyDriveType fd0)
 
 static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)
 {
+    FDCtrlISABus *isa = ISA_FDC(isadev);
     Aml *dev;
     Aml *crs;
     int i;
@@ -XXX,XX +XXX,XX @@ static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)
     };
 
     crs = aml_resource_template();
-    aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04));
-    aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01));
-    aml_append(crs, aml_irq_no_flags(6));
     aml_append(crs,
-        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2));
+        aml_io(AML_DECODE16, isa->iobase + 2, isa->iobase + 2, 0x00, 0x04));
+    aml_append(crs,
+        aml_io(AML_DECODE16, isa->iobase + 7, isa->iobase + 7, 0x00, 0x01));
+    aml_append(crs, aml_irq_no_flags(isa->irq));
+    aml_append(crs,
+        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, isa->dma));
 
     dev = aml_device("FDC0");
     aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700")));
-- 
2.34.1

The following changes since commit a51e5124a655b3dad80b36b18547cb1eca2c5eb2:

Merge tag 'pull-omnibus-111023-1' of https://gitlab.com/stsquad/qemu into staging (2023-10-11 09:43:10 -0400)

are available in the Git repository at:

https://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to e6e964b8b021446c8d3d1f91c0208f653e9ec92c:

block: Add assertion for bdrv_graph_wrlock() (2023-10-12 16:31:33 +0200)

----------------------------------------------------------------
Block layer patches

- Clean up coroutine versions of bdrv_{is_allocated,block_status}*
- Graph locking part 5 (protect children/parent links)

----------------------------------------------------------------
Emanuele Giuseppe Esposito (1):
      block: Mark drain related functions GRAPH_RDLOCK

Kevin Wolf (21):
      test-bdrv-drain: Don't call bdrv_graph_wrlock() in coroutine context
      block-coroutine-wrapper: Add no_co_wrapper_bdrv_rdlock functions
      block: Take graph rdlock in bdrv_inactivate_all()
      block: Mark bdrv_first_blk() and bdrv_is_root_node() GRAPH_RDLOCK
      block: Mark bdrv_parent_cb_resize() and callers GRAPH_RDLOCK
      block: Mark bdrv_snapshot_fallback() and callers GRAPH_RDLOCK
      block: Take graph rdlock in parts of reopen
      block: Mark bdrv_get_xdbg_block_graph() and callers GRAPH_RDLOCK
      block: Mark bdrv_refresh_filename() and callers GRAPH_RDLOCK
      block: Mark bdrv_primary_child() and callers GRAPH_RDLOCK
      block: Mark bdrv_get_parent_name() and callers GRAPH_RDLOCK
      block: Mark bdrv_amend_options() and callers GRAPH_RDLOCK
      qcow2: Mark qcow2_signal_corruption() and callers GRAPH_RDLOCK
      qcow2: Mark qcow2_inactivate() and callers GRAPH_RDLOCK
      qcow2: Mark check_constraints_on_bitmap() GRAPH_RDLOCK
      block: Mark bdrv_op_is_blocked() and callers GRAPH_RDLOCK
      block: Mark bdrv_apply_auto_read_only() and callers GRAPH_RDLOCK
      block: Mark bdrv_get_specific_info() and callers GRAPH_RDLOCK
      block: Protect bs->parents with graph_lock
      block: Protect bs->children with graph_lock
      block: Add assertion for bdrv_graph_wrlock()

Paolo Bonzini (4):
      block: rename the bdrv_co_block_status static function
      block: complete public block status API
      block: switch to co_wrapper for bdrv_is_allocated_*
      block: convert more bdrv_is_allocated* and bdrv_block_status* calls to coroutine versions

From: Paolo Bonzini <pbonzini@redhat.com>

bdrv_block_status exists as a wrapper for bdrv_block_status_above, but
the name of the (hypothetical) coroutine version, bdrv_co_block_status,
is squatted by a random static function.  Rename it to
bdrv_co_do_block_status.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20230904100306.156197-2-pbonzini@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/io.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ int bdrv_flush_all(void)
  * set to the host mapping and BDS corresponding to the guest offset.
  */
 static int coroutine_fn GRAPH_RDLOCK
-bdrv_co_block_status(BlockDriverState *bs, bool want_zero,
-                     int64_t offset, int64_t bytes,
-                     int64_t *pnum, int64_t *map, BlockDriverState **file)
+bdrv_co_do_block_status(BlockDriverState *bs, bool want_zero,
+                        int64_t offset, int64_t bytes,
+                        int64_t *pnum, int64_t *map, BlockDriverState **file)
 {
     int64_t total_size;
     int64_t n; /* bytes */
@@ -XXX,XX +XXX,XX @@ bdrv_co_block_status(BlockDriverState *bs, bool want_zero,
 
     if (ret & BDRV_BLOCK_RAW) {
         assert(ret & BDRV_BLOCK_OFFSET_VALID && local_file);
-        ret = bdrv_co_block_status(local_file, want_zero, local_map,
-                                   *pnum, pnum, &local_map, &local_file);
+        ret = bdrv_co_do_block_status(local_file, want_zero, local_map,
+                                      *pnum, pnum, &local_map, &local_file);
         goto out;
     }
 
@@ -XXX,XX +XXX,XX @@ bdrv_co_block_status(BlockDriverState *bs, bool want_zero,
         int64_t file_pnum;
         int ret2;
 
-        ret2 = bdrv_co_block_status(local_file, want_zero, local_map,
-                                    *pnum, &file_pnum, NULL, NULL);
+        ret2 = bdrv_co_do_block_status(local_file, want_zero, local_map,
+                                       *pnum, &file_pnum, NULL, NULL);
         if (ret2 >= 0) {
             /* Ignore errors.  This is just providing extra information, it
              * is useful but not necessary.
@@ -XXX,XX +XXX,XX @@ bdrv_co_common_block_status_above(BlockDriverState *bs,
         return 0;
     }
 
-    ret = bdrv_co_block_status(bs, want_zero, offset, bytes, pnum, map, file);
+    ret = bdrv_co_do_block_status(bs, want_zero, offset, bytes, pnum,
+                                  map, file);
     ++*depth;
     if (ret < 0 || *pnum == 0 || ret & BDRV_BLOCK_ALLOCATED || bs == base) {
         return ret;
@@ -XXX,XX +XXX,XX @@ bdrv_co_common_block_status_above(BlockDriverState *bs,
     for (p = bdrv_filter_or_cow_bs(bs); include_base || p != base;
          p = bdrv_filter_or_cow_bs(p))
     {
-        ret = bdrv_co_block_status(p, want_zero, offset, bytes, pnum, map,
-                                   file);
+        ret = bdrv_co_do_block_status(p, want_zero, offset, bytes, pnum,
+                                      map, file);
         ++*depth;
         if (ret < 0) {
             return ret;
-- 
2.41.0

From: Paolo Bonzini <pbonzini@redhat.com>

Include both coroutine and non-coroutine versions, the latter being
co_wrapper_mixed_bdrv_rdlock of the former.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20230904100306.156197-3-pbonzini@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block-io.h | 17 +++++++++++------
 block/io.c               | 18 +++++-------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/include/block/block-io.h b/include/block/block-io.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -XXX,XX +XXX,XX @@ int coroutine_fn GRAPH_RDLOCK bdrv_co_zone_append(BlockDriverState *bs,
                                                   BdrvRequestFlags flags);
 
 bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs);
-int bdrv_block_status(BlockDriverState *bs, int64_t offset,
-                      int64_t bytes, int64_t *pnum, int64_t *map,
-                      BlockDriverState **file);
+
+int coroutine_fn GRAPH_RDLOCK
+bdrv_co_block_status(BlockDriverState *bs, int64_t offset, int64_t bytes,
+                     int64_t *pnum, int64_t *map, BlockDriverState **file);
+int co_wrapper_mixed_bdrv_rdlock
+bdrv_block_status(BlockDriverState *bs, int64_t offset, int64_t bytes,
+                  int64_t *pnum, int64_t *map, BlockDriverState **file);
 
 int coroutine_fn GRAPH_RDLOCK
 bdrv_co_block_status_above(BlockDriverState *bs, BlockDriverState *base,
                            int64_t offset, int64_t bytes, int64_t *pnum,
                            int64_t *map, BlockDriverState **file);
-int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
-                            int64_t offset, int64_t bytes, int64_t *pnum,
-                            int64_t *map, BlockDriverState **file);
+int co_wrapper_mixed_bdrv_rdlock
+bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
+                        int64_t offset, int64_t bytes, int64_t *pnum,
+                        int64_t *map, BlockDriverState **file);
 
 int coroutine_fn GRAPH_RDLOCK
 bdrv_co_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,
                                              bytes, pnum, map, file, NULL);
 }
 
-int bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
-                            int64_t offset, int64_t bytes, int64_t *pnum,
-                            int64_t *map, BlockDriverState **file)
+int coroutine_fn bdrv_co_block_status(BlockDriverState *bs, int64_t offset,
+                                      int64_t bytes, int64_t *pnum,
+                                      int64_t *map, BlockDriverState **file)
 {
     IO_CODE();
-    return bdrv_common_block_status_above(bs, base, false, true, offset, bytes,
-                                          pnum, map, file, NULL);
-}
-
-int bdrv_block_status(BlockDriverState *bs, int64_t offset, int64_t bytes,
-                      int64_t *pnum, int64_t *map, BlockDriverState **file)
-{
-    IO_CODE();
-    return bdrv_block_status_above(bs, bdrv_filter_or_cow_bs(bs),
-                                   offset, bytes, pnum, map, file);
+    return bdrv_co_block_status_above(bs, bdrv_filter_or_cow_bs(bs),
+                                      offset, bytes, pnum, map, file);
 }
 
 /*
-- 
2.41.0

From: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20230904100306.156197-4-pbonzini@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block-io.h | 12 +++++----
 block/io.c               | 53 ++++++----------------------------------
 2 files changed, 14 insertions(+), 51 deletions(-)

diff --git a/include/block/block-io.h b/include/block/block-io.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -XXX,XX +XXX,XX @@ bdrv_block_status_above(BlockDriverState *bs, BlockDriverState *base,
 int coroutine_fn GRAPH_RDLOCK
 bdrv_co_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
                      int64_t *pnum);
-int bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
-                      int64_t *pnum);
+int co_wrapper_mixed_bdrv_rdlock
+bdrv_is_allocated(BlockDriverState *bs, int64_t offset,
+                  int64_t bytes, int64_t *pnum);
 
 int coroutine_fn GRAPH_RDLOCK
 bdrv_co_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
                            bool include_base, int64_t offset, int64_t bytes,
                            int64_t *pnum);
-int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
-                            bool include_base, int64_t offset, int64_t bytes,
-                            int64_t *pnum);
+int co_wrapper_mixed_bdrv_rdlock
+bdrv_is_allocated_above(BlockDriverState *bs, BlockDriverState *base,
+                        bool include_base, int64_t offset,
+                        int64_t bytes, int64_t *pnum);
 
 int coroutine_fn GRAPH_RDLOCK
 bdrv_co_is_zero_fast(BlockDriverState *bs, int64_t offset, int64_t bytes);
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t offset,
     return !!(ret & BDRV_BLOCK_ALLOCATED);
 }
 
-int bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,
-                      int64_t *pnum)
-{
-    int ret;
-    int64_t dummy;
-    IO_CODE();
-
-    ret = bdrv_common_block_status_above(bs, bs, true, false, offset,
-                                         bytes, pnum ? pnum : &dummy, NULL,
-                                         NULL, NULL);
-    if (ret < 0) {
-        return ret;
-    }
-    return !!(ret & BDRV_BLOCK_ALLOCATED);
-}
-
-/* See bdrv_is_allocated_above for documentation */
-int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
-                                            BlockDriverState *base,
-                                            bool include_base, int64_t offset,
-                                            int64_t bytes, int64_t *pnum)
-{
-    int depth;
-    int ret;
-    IO_CODE();
-
-    ret = bdrv_co_common_block_status_above(top, base, include_base, false,
-                                            offset, bytes, pnum, NULL, NULL,
-                                            &depth);
-    if (ret < 0) {
-        return ret;
-    }
-
-    if (ret & BDRV_BLOCK_ALLOCATED) {
-        return depth;
-    }
-    return 0;
-}
-
 /*
  * Given an image chain: ... -> [BASE] -> [INTER1] -> [INTER2] -> [TOP]
  *
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top,
  * words, the result is not necessarily the maximum possible range);
  * but 'pnum' will only be 0 when end of file is reached.
  */
-int bdrv_is_allocated_above(BlockDriverState *top,
-                            BlockDriverState *base,
-                            bool include_base, int64_t offset,
-                            int64_t bytes, int64_t *pnum)
+int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *bs,
+                                            BlockDriverState *base,
+                                            bool include_base, int64_t offset,
+                                            int64_t bytes, int64_t *pnum)
 {
     int depth;
     int ret;
     IO_CODE();
 
-    ret = bdrv_common_block_status_above(top, base, include_base, false,
-                                         offset, bytes, pnum, NULL, NULL,
-                                         &depth);
+    ret = bdrv_co_common_block_status_above(bs, base, include_base, false,
+                                            offset, bytes, pnum, NULL, NULL,
+                                            &depth);
     if (ret < 0) {
         return ret;
     }
-- 
2.41.0

From: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20230904100306.156197-5-pbonzini@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/copy-before-write.c |  2 +-
 block/copy-on-read.c      |  8 ++++----
 block/io.c                |  6 +++---
 block/mirror.c            | 10 +++++-----
 block/qcow2.c             |  5 +++--
 block/replication.c       |  8 ++++----
 block/stream.c            |  8 ++++----
 block/vvfat.c             | 18 +++++++++---------
 8 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index XXXXXXX..XXXXXXX 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -XXX,XX +XXX,XX @@ cbw_co_snapshot_block_status(BlockDriverState *bs,
         return -EACCES;
     }
 
-    ret = bdrv_block_status(child->bs, offset, cur_bytes, pnum, map, file);
+    ret = bdrv_co_block_status(child->bs, offset, cur_bytes, pnum, map, file);
     if (child == s->target) {
         /*
          * We refer to s->target only for areas that we've written to it.
diff --git a/block/copy-on-read.c b/block/copy-on-read.c
index XXXXXXX..XXXXXXX 100644
--- a/block/copy-on-read.c
+++ b/block/copy-on-read.c
@@ -XXX,XX +XXX,XX @@ cor_co_preadv_part(BlockDriverState *bs, int64_t offset, int64_t bytes,
         local_flags = flags;
 
         /* In case of failure, try to copy-on-read anyway */
-        ret = bdrv_is_allocated(bs->file->bs, offset, bytes, &n);
+        ret = bdrv_co_is_allocated(bs->file->bs, offset, bytes, &n);
         if (ret <= 0) {
-            ret = bdrv_is_allocated_above(bdrv_backing_chain_next(bs->file->bs),
-                                          state->bottom_bs, true, offset,
-                                          n, &n);
+            ret = bdrv_co_is_allocated_above(bdrv_backing_chain_next(bs->file->bs),
+                                             state->bottom_bs, true, offset,
+                                             n, &n);
             if (ret > 0 || ret < 0) {
                 local_flags |= BDRV_REQ_COPY_ON_READ;
             }
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ bdrv_co_do_copy_on_readv(BdrvChild *child, int64_t offset, int64_t bytes,
             ret = 1; /* "already allocated", so nothing will be copied */
             pnum = MIN(align_bytes, max_transfer);
         } else {
-            ret = bdrv_is_allocated(bs, align_offset,
-                                    MIN(align_bytes, max_transfer), &pnum);
+            ret = bdrv_co_is_allocated(bs, align_offset,
+                                       MIN(align_bytes, max_transfer), &pnum);
             if (ret < 0) {
                 /*
                  * Safe to treat errors in querying allocation as if
@@ -XXX,XX +XXX,XX @@ bdrv_aligned_preadv(BdrvChild *child, BdrvTrackedRequest *req,
         /* The flag BDRV_REQ_COPY_ON_READ has reached its addressee */
         flags &= ~BDRV_REQ_COPY_ON_READ;
 
-        ret = bdrv_is_allocated(bs, offset, bytes, &pnum);
+        ret = bdrv_co_is_allocated(bs, offset, bytes, &pnum);
         if (ret < 0) {
             goto out;
         }
diff --git a/block/mirror.c b/block/mirror.c
index XXXXXXX..XXXXXXX 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn mirror_iteration(MirrorBlockJob *s)
 
         assert(!(offset % s->granularity));
         WITH_GRAPH_RDLOCK_GUARD() {
-            ret = bdrv_block_status_above(source, NULL, offset,
-                                        nb_chunks * s->granularity,
-                                        &io_bytes, NULL, NULL);
+            ret = bdrv_co_block_status_above(source, NULL, offset,
+                                             nb_chunks * s->granularity,
+                                             &io_bytes, NULL, NULL);
         }
         if (ret < 0) {
             io_bytes = MIN(nb_chunks * s->granularity, max_io_bytes);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
         }
 
         WITH_GRAPH_RDLOCK_GUARD() {
-            ret = bdrv_is_allocated_above(bs, s->base_overlay, true, offset,
-                                          bytes, &count);
+            ret = bdrv_co_is_allocated_above(bs, s->base_overlay, true, offset,
+                                             bytes, &count);
         }
         if (ret < 0) {
             return ret;
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ finish:
 }
 
 
-static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes)
+static bool coroutine_fn GRAPH_RDLOCK
+is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes)
 {
     int64_t nr;
     int res;
@@ -XXX,XX +XXX,XX @@ static bool is_zero(BlockDriverState *bs, int64_t offset, int64_t bytes)
      * backing file. So, we need a loop.
      */
     do {
-        res = bdrv_block_status_above(bs, NULL, offset, bytes, &nr, NULL, NULL);
+        res = bdrv_co_block_status_above(bs, NULL, offset, bytes, &nr, NULL, NULL);
         offset += nr;
         bytes -= nr;
     } while (res >= 0 && (res & BDRV_BLOCK_ZERO) && nr && bytes);
diff --git a/block/replication.c b/block/replication.c
index XXXXXXX..XXXXXXX 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -XXX,XX +XXX,XX @@ replication_co_writev(BlockDriverState *bs, int64_t sector_num,
     while (remaining_sectors > 0) {
         int64_t count;
 
-        ret = bdrv_is_allocated_above(top->bs, base->bs, false,
-                                      sector_num * BDRV_SECTOR_SIZE,
-                                      remaining_sectors * BDRV_SECTOR_SIZE,
-                                      &count);
+        ret = bdrv_co_is_allocated_above(top->bs, base->bs, false,
+                                         sector_num * BDRV_SECTOR_SIZE,
+                                         remaining_sectors * BDRV_SECTOR_SIZE,
+                                         &count);
         if (ret < 0) {
             goto out1;
         }
diff --git a/block/stream.c b/block/stream.c
index XXXXXXX..XXXXXXX 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn stream_run(Job *job, Error **errp)
         copy = false;
 
         WITH_GRAPH_RDLOCK_GUARD() {
-            ret = bdrv_is_allocated(unfiltered_bs, offset, STREAM_CHUNK, &n);
+            ret = bdrv_co_is_allocated(unfiltered_bs, offset, STREAM_CHUNK, &n);
             if (ret == 1) {
                 /* Allocated in the top, no need to copy.  */
             } else if (ret >= 0) {
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn stream_run(Job *job, Error **errp)
                  * Copy if allocated in the intermediate images.  Limit to the
                  * known-unallocated area [offset, offset+n*BDRV_SECTOR_SIZE).
                  */
-                ret = bdrv_is_allocated_above(bdrv_cow_bs(unfiltered_bs),
-                                            s->base_overlay, true,
-                                            offset, n, &n);
+                ret = bdrv_co_is_allocated_above(bdrv_cow_bs(unfiltered_bs),
+                                                 s->base_overlay, true,
+                                                 offset, n, &n);
                 /* Finish early if end of backing file has been reached */
                 if (ret == 0 && n == 0) {
                     n = len - offset;
diff --git a/block/vvfat.c b/block/vvfat.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ vvfat_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sector
         if (s->qcow) {
             int64_t n;
             int ret;
-            ret = bdrv_is_allocated(s->qcow->bs, sector_num * BDRV_SECTOR_SIZE,
-                                    (nb_sectors - i) * BDRV_SECTOR_SIZE, &n);
+            ret = bdrv_co_is_allocated(s->qcow->bs, sector_num * BDRV_SECTOR_SIZE,
+                                       (nb_sectors - i) * BDRV_SECTOR_SIZE, &n);
             if (ret < 0) {
                 return ret;
             }
@@ -XXX,XX +XXX,XX @@ cluster_was_modified(BDRVVVFATState *s, uint32_t cluster_num)
     }
 
     for (i = 0; !was_modified && i < s->sectors_per_cluster; i++) {
-        was_modified = bdrv_is_allocated(s->qcow->bs,
-                                         (cluster2sector(s, cluster_num) +
-                                          i) * BDRV_SECTOR_SIZE,
-                                         BDRV_SECTOR_SIZE, NULL);
+        was_modified = bdrv_co_is_allocated(s->qcow->bs,
+                                            (cluster2sector(s, cluster_num) +
+                                             i) * BDRV_SECTOR_SIZE,
+                                            BDRV_SECTOR_SIZE, NULL);
     }
 
     /*
@@ -XXX,XX +XXX,XX @@ get_cluster_count_for_direntry(BDRVVVFATState* s, direntry_t* direntry, const ch
                 for (i = 0; i < s->sectors_per_cluster; i++) {
                     int res;
 
-                    res = bdrv_is_allocated(s->qcow->bs,
-                                            (offs + i) * BDRV_SECTOR_SIZE,
-                                            BDRV_SECTOR_SIZE, NULL);
+                    res = bdrv_co_is_allocated(s->qcow->bs,
+                                               (offs + i) * BDRV_SECTOR_SIZE,
+                                               BDRV_SECTOR_SIZE, NULL);
                     if (res < 0) {
                         return -1;
                     }
-- 
2.41.0

AIO callbacks are effectively coroutine_mixed_fn. If AIO requests don't
return immediately, their callback is called from the request coroutine.
This means that in AIO callbacks, we can't call no_coroutine_fns such as
bdrv_graph_wrlock(). Unfortunately test-bdrv-drain does so.

Change the test to use a BH to drop out of coroutine context, and add
coroutine_mixed_fn and no_coroutine_fn markers to clarify the context
each function runs in.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-2-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/unit/test-bdrv-drain.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/test-bdrv-drain.c
+++ b/tests/unit/test-bdrv-drain.c
@@ -XXX,XX +XXX,XX @@ struct detach_by_parent_data {
 };
 static struct detach_by_parent_data detach_by_parent_data;
 
-static void detach_indirect_bh(void *opaque)
+static void no_coroutine_fn detach_indirect_bh(void *opaque)
 {
     struct detach_by_parent_data *data = opaque;
 
@@ -XXX,XX +XXX,XX @@ static void detach_indirect_bh(void *opaque)
     bdrv_graph_wrunlock();
 }
 
-static void detach_by_parent_aio_cb(void *opaque, int ret)
+static void coroutine_mixed_fn detach_by_parent_aio_cb(void *opaque, int ret)
 {
     struct detach_by_parent_data *data = &detach_by_parent_data;
 
     g_assert_cmpint(ret, ==, 0);
     if (data->by_parent_cb) {
         bdrv_inc_in_flight(data->child_b->bs);
-        detach_indirect_bh(data);
+        aio_bh_schedule_oneshot(qemu_get_current_aio_context(),
+                                detach_indirect_bh, &detach_by_parent_data);
     }
 }
 
-- 
2.41.0

Add a new wrapper type for GRAPH_RDLOCK functions that should be called
from coroutine context.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-3-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block-common.h       |  7 +++++--
 scripts/block-coroutine-wrapper.py | 10 +++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/include/block/block-common.h b/include/block/block-common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-common.h
+++ b/include/block/block-common.h
@@ -XXX,XX +XXX,XX @@
  * function. The coroutine yields after scheduling the BH and is reentered when
  * the wrapped function returns.
  *
- * A no_co_wrapper_bdrv_wrlock function is a no_co_wrapper function that
- * automatically takes the graph wrlock when calling the wrapped function.
+ * A no_co_wrapper_bdrv_rdlock function is a no_co_wrapper function that
+ * automatically takes the graph rdlock when calling the wrapped function. In
+ * the same way, no_co_wrapper_bdrv_wrlock functions automatically take the
+ * graph wrlock.
  *
  * If the first parameter of the function is a BlockDriverState, BdrvChild or
  * BlockBackend pointer, the AioContext lock for it is taken in the wrapper.
  */
 #define no_co_wrapper
+#define no_co_wrapper_bdrv_rdlock
 #define no_co_wrapper_bdrv_wrlock
 
 #include "block/blockjob.h"
diff --git a/scripts/block-coroutine-wrapper.py b/scripts/block-coroutine-wrapper.py
index XXXXXXX..XXXXXXX 100644
--- a/scripts/block-coroutine-wrapper.py
+++ b/scripts/block-coroutine-wrapper.py
@@ -XXX,XX +XXX,XX @@ def __init__(self, wrapper_type: str, return_type: str, name: str,
                 raise ValueError(f"Invalid no_co function name: {self.name}")
             if not self.create_only_co:
                 raise ValueError(f"no_co function can't be mixed: {self.name}")
-            if self.graph_rdlock:
-                raise ValueError(f"no_co function can't be rdlock: {self.name}")
+            if self.graph_rdlock and self.graph_wrlock:
+                raise ValueError("function can't be both rdlock and wrlock: "
+                                 f"{self.name}")
             self.target_name = f'{subsystem}_{subname}'
 
         self.ctx = self.gen_ctx()
@@ -XXX,XX +XXX,XX @@ def gen_no_co_wrapper(func: FuncDecl) -> str:
 
     graph_lock=''
     graph_unlock=''
-    if func.graph_wrlock:
+    if func.graph_rdlock:
+        graph_lock='    bdrv_graph_rdlock_main_loop();'
+        graph_unlock='    bdrv_graph_rdunlock_main_loop();'
+    elif func.graph_wrlock:
         graph_lock='    bdrv_graph_wrlock(NULL);'
         graph_unlock='    bdrv_graph_wrunlock();'
 
-- 
2.41.0

The function reads the parents list, so it needs to hold the graph lock.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-4-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void bdrv_activate_all(Error **errp)
     }
 }
 
-static bool bdrv_has_bds_parent(BlockDriverState *bs, bool only_active)
+static bool GRAPH_RDLOCK
+bdrv_has_bds_parent(BlockDriverState *bs, bool only_active)
 {
     BdrvChild *parent;
     GLOBAL_STATE_CODE();
@@ -XXX,XX +XXX,XX @@ static bool bdrv_has_bds_parent(BlockDriverState *bs, bool only_active)
     return false;
 }
 
-static int bdrv_inactivate_recurse(BlockDriverState *bs)
+static int GRAPH_RDLOCK bdrv_inactivate_recurse(BlockDriverState *bs)
 {
     BdrvChild *child, *parent;
     int ret;
     uint64_t cumulative_perms, cumulative_shared_perms;
 
     GLOBAL_STATE_CODE();
-    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (!bs->drv) {
         return -ENOMEDIUM;
@@ -XXX,XX +XXX,XX @@ int bdrv_inactivate_all(void)
     GSList *aio_ctxs = NULL, *ctx;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
         AioContext *aio_context = bdrv_get_aio_context(bs);
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_first_blk() and bdrv_is_root_node() need to hold a reader lock
for the graph. These functions are the only functions in block-backend.c
that access the parent list of a node.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-5-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block-global-state.h          |  9 +++++----
 include/sysemu/block-backend-global-state.h |  4 ++--
 block.c                                     |  1 +
 block/block-backend.c                       |  6 +++++-
 block/export/export.c                       |  4 ++++
 block/io.c                                  |  1 +
 block/monitor/block-hmp-cmds.c              |  2 ++
 block/qapi-sysemu.c                         |  2 ++
 block/replication.c                         | 10 ++++++++--
 block/snapshot.c                            | 15 +++++++++++----
 blockdev.c                                  |  5 +++++
 migration/block.c                           |  2 ++
 migration/migration-hmp-cmds.c              |  2 ++
 tests/unit/test-block-iothread.c            |  3 +++
 14 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -XXX,XX +XXX,XX @@ BlockDriverState * GRAPH_RDLOCK
 check_to_replace_node(BlockDriverState *parent_bs, const char *node_name,
                       Error **errp);
 
-int no_coroutine_fn bdrv_activate(BlockDriverState *bs, Error **errp);
+int no_coroutine_fn GRAPH_RDLOCK
+bdrv_activate(BlockDriverState *bs, Error **errp);
 
-int coroutine_fn no_co_wrapper
+int coroutine_fn no_co_wrapper_bdrv_rdlock
 bdrv_co_activate(BlockDriverState *bs, Error **errp);
 
 void bdrv_activate_all(Error **errp);
@@ -XXX,XX +XXX,XX @@ typedef struct BdrvNextIterator {
     BlockDriverState *bs;
 } BdrvNextIterator;
 
-BlockDriverState *bdrv_first(BdrvNextIterator *it);
-BlockDriverState *bdrv_next(BdrvNextIterator *it);
+BlockDriverState * GRAPH_RDLOCK bdrv_first(BdrvNextIterator *it);
+BlockDriverState * GRAPH_RDLOCK bdrv_next(BdrvNextIterator *it);
 void bdrv_next_cleanup(BdrvNextIterator *it);
 
 BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs);
diff --git a/include/sysemu/block-backend-global-state.h b/include/sysemu/block-backend-global-state.h
index XXXXXXX..XXXXXXX 100644
--- a/include/sysemu/block-backend-global-state.h
+++ b/include/sysemu/block-backend-global-state.h
@@ -XXX,XX +XXX,XX @@ BlockBackend *blk_by_public(BlockBackendPublic *public);
 void blk_remove_bs(BlockBackend *blk);
 int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs, Error **errp);
 int blk_replace_bs(BlockBackend *blk, BlockDriverState *new_bs, Error **errp);
-bool bdrv_has_blk(BlockDriverState *bs);
-bool bdrv_is_root_node(BlockDriverState *bs);
+bool GRAPH_RDLOCK bdrv_has_blk(BlockDriverState *bs);
+bool GRAPH_RDLOCK bdrv_is_root_node(BlockDriverState *bs);
 int GRAPH_UNLOCKED blk_set_perm(BlockBackend *blk, uint64_t perm,
                                 uint64_t shared_perm, Error **errp);
 void blk_get_perm(BlockBackend *blk, uint64_t *perm, uint64_t *shared_perm);
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void bdrv_activate_all(Error **errp)
     BdrvNextIterator it;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
         AioContext *aio_context = bdrv_get_aio_context(bs);
diff --git a/block/block-backend.c b/block/block-backend.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -XXX,XX +XXX,XX @@ BlockDriverState *blk_bs(BlockBackend *blk)
     return blk->root ? blk->root->bs : NULL;
 }
 
-static BlockBackend *bdrv_first_blk(BlockDriverState *bs)
+static BlockBackend * GRAPH_RDLOCK bdrv_first_blk(BlockDriverState *bs)
 {
     BdrvChild *child;
 
     GLOBAL_STATE_CODE();
+    assert_bdrv_graph_readable();
 
     QLIST_FOREACH(child, &bs->parents, next_parent) {
         if (child->klass == &child_root) {
@@ -XXX,XX +XXX,XX @@ bool bdrv_is_root_node(BlockDriverState *bs)
     BdrvChild *c;
 
     GLOBAL_STATE_CODE();
+    assert_bdrv_graph_readable();
+
     QLIST_FOREACH(c, &bs->parents, next_parent) {
         if (c->klass != &child_root) {
             return false;
@@ -XXX,XX +XXX,XX @@ void blk_activate(BlockBackend *blk, Error **errp)
     if (qemu_in_coroutine()) {
         bdrv_co_activate(bs, errp);
     } else {
+        GRAPH_RDLOCK_GUARD_MAINLOOP();
         bdrv_activate(bs, errp);
     }
 }
diff --git a/block/export/export.c b/block/export/export.c
index XXXXXXX..XXXXXXX 100644
--- a/block/export/export.c
+++ b/block/export/export.c
@@ -XXX,XX +XXX,XX @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
     uint64_t perm;
     int ret;
 
+    GLOBAL_STATE_CODE();
+
     if (!id_wellformed(export->id)) {
         error_setg(errp, "Invalid block export id");
         return NULL;
@@ -XXX,XX +XXX,XX @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
      * access since the export could be available before migration handover.
      * ctx was acquired in the caller.
      */
+    bdrv_graph_rdlock_main_loop();
     bdrv_activate(bs, NULL);
+    bdrv_graph_rdunlock_main_loop();
 
     perm = BLK_PERM_CONSISTENT_READ;
     if (export->writable) {
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ int bdrv_flush_all(void)
     int result = 0;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     /*
      * bdrv queue is managed by record/replay,
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index XXXXXXX..XXXXXXX 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -XXX,XX +XXX,XX @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
     SnapshotEntry *snapshot_entry;
     Error *err = NULL;
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     bs = bdrv_all_find_vmstate_bs(NULL, false, NULL, &err);
     if (!bs) {
         error_report_err(err);
diff --git a/block/qapi-sysemu.c b/block/qapi-sysemu.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qapi-sysemu.c
+++ b/block/qapi-sysemu.c
@@ -XXX,XX +XXX,XX @@ static void blockdev_insert_medium(const char *device, const char *id,
     BlockBackend *blk;
     BlockDriverState *bs;
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     blk = qmp_get_blk(device, id, errp);
     if (!blk) {
         return;
diff --git a/block/replication.c b/block/replication.c
index XXXXXXX..XXXXXXX 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
     Error *local_err = NULL;
     BackupPerf perf = { .use_copy_range = true, .max_workers = 1 };
 
+    GLOBAL_STATE_CODE();
+
     aio_context = bdrv_get_aio_context(bs);
     aio_context_acquire(aio_context);
     s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
             return;
         }
 
+        bdrv_graph_rdlock_main_loop();
         secondary_disk = hidden_disk->bs->backing;
         if (!secondary_disk->bs || !bdrv_has_blk(secondary_disk->bs)) {
             error_setg(errp, "The secondary disk doesn't have block backend");
+            bdrv_graph_rdunlock_main_loop();
             aio_context_release(aio_context);
             return;
         }
+        bdrv_graph_rdunlock_main_loop();
 
         /* verify the length */
         active_length = bdrv_getlength(active_disk->bs);
@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
             return;
         }
 
-        bdrv_graph_wrunlock();
-
         /* start backup job now */
         error_setg(&s->blocker,
                    "Block device is in use by internal backup job");
@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
         if (!top_bs || !bdrv_is_root_node(top_bs) ||
             !check_top_bs(top_bs, bs)) {
             error_setg(errp, "No top_bs or it is invalid");
+            bdrv_graph_wrunlock();
             reopen_backing_file(bs, false, NULL);
             aio_context_release(aio_context);
             return;
@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
         bdrv_op_block_all(top_bs, s->blocker);
         bdrv_op_unblock(top_bs, BLOCK_OP_TYPE_DATAPLANE, s->blocker);
 
+        bdrv_graph_wrunlock();
+
         s->backup_job = backup_job_create(
                                 NULL, s->secondary_disk->bs, s->hidden_disk->bs,
                                 0, MIRROR_SYNC_MODE_NONE, NULL, 0, false, NULL,
diff --git a/block/snapshot.c b/block/snapshot.c
index XXXXXXX..XXXXXXX 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs,
 }
 
 
-static int bdrv_all_get_snapshot_devices(bool has_devices, strList *devices,
-                                         GList **all_bdrvs,
-                                         Error **errp)
+static int GRAPH_RDLOCK
+bdrv_all_get_snapshot_devices(bool has_devices, strList *devices,
+                              GList **all_bdrvs, Error **errp)
 {
     g_autoptr(GList) bdrvs = NULL;
 
@@ -XXX,XX +XXX,XX @@ static int bdrv_all_get_snapshot_devices(bool has_devices, strList *devices,
 }
 
 
-static bool bdrv_all_snapshots_includes_bs(BlockDriverState *bs)
+static bool GRAPH_RDLOCK bdrv_all_snapshots_includes_bs(BlockDriverState *bs)
 {
     if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
         return false;
@@ -XXX,XX +XXX,XX @@ bool bdrv_all_can_snapshot(bool has_devices, strList *devices,
     GList *iterbdrvs;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
         return false;
@@ -XXX,XX +XXX,XX @@ int bdrv_all_delete_snapshot(const char *name,
     GList *iterbdrvs;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
         return -1;
@@ -XXX,XX +XXX,XX @@ int bdrv_all_goto_snapshot(const char *name,
     GList *iterbdrvs;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
         return -1;
@@ -XXX,XX +XXX,XX @@ int bdrv_all_has_snapshot(const char *name,
     GList *iterbdrvs;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
         return -1;
@@ -XXX,XX +XXX,XX @@ int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
 {
     g_autoptr(GList) bdrvs = NULL;
     GList *iterbdrvs;
+
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
         return -1;
@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_all_find_vmstate_bs(const char *vmstate_bs,
     GList *iterbdrvs;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
         return NULL;
diff --git a/blockdev.c b/blockdev.c
index XXXXXXX..XXXXXXX 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ static BlockDriverState *qmp_get_root_bs(const char *name, Error **errp)
     BlockDriverState *bs;
     AioContext *aio_context;
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     bs = bdrv_lookup_bs(name, name, errp);
     if (bs == NULL) {
         return NULL;
@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_del(const char *node_name, Error **errp)
     BlockDriverState *bs;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     bs = bdrv_find_node(node_name);
     if (!bs) {
@@ -XXX,XX +XXX,XX @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread,
     AioContext *new_context;
     BlockDriverState *bs;
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     bs = bdrv_find_node(node_name);
     if (!bs) {
         error_setg(errp, "Failed to find node with node-name='%s'", node_name);
diff --git a/migration/block.c b/migration/block.c
index XXXXXXX..XXXXXXX 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -XXX,XX +XXX,XX @@ static int init_blk_migration(QEMUFile *f)
     Error *local_err = NULL;
     int ret;
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     block_mig_state.submitted = 0;
     block_mig_state.read_done = 0;
     block_mig_state.transferred = 0;
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
index XXXXXXX..XXXXXXX 100644
--- a/migration/migration-hmp-cmds.c
+++ b/migration/migration-hmp-cmds.c
@@ -XXX,XX +XXX,XX @@ static void vm_completion(ReadLineState *rs, const char *str)
     BlockDriverState *bs;
     BdrvNextIterator it;
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     len = strlen(str);
     readline_set_completion_index(rs, len);
 
diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/test-block-iothread.c
+++ b/tests/unit/test-block-iothread.c
@@ -XXX,XX +XXX,XX @@ static void test_sync_op_check(BdrvChild *c)
 
 static void test_sync_op_activate(BdrvChild *c)
 {
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     /* Early success: Image is not inactive */
     bdrv_activate(c->bs, NULL);
 }
-- 
2.41.0

From: Emanuele Giuseppe Esposito <eesposit@redhat.com>

Draining recursively traverses the graph, therefore we need to make sure
that also such accesses to the graph are protected by the graph rdlock.

There are 3 different drain callers to consider:
1. drain in the main loop: no issue at all, rdlock is nop.
2. drain in an iothread: rdlock only works in main loop or coroutines,
   so disallow it.
3. drain in a coroutine (regardless of AioContext): the drain mechanism
   takes care of scheduling a BH in the bs->aio_context that will
   then take care of perform the actual draining. This is wrong,
   because as pointed in (2) if bs->aio_context is an iothread then
   rdlock won't work. Therefore change bdrv_co_yield_to_drain to
   schedule the BH in the main loop.

Caller (2) also implies that we need to modify test-bdrv-drain.c to
disallow draining in the iothreads.

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: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-6-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block-io.h         | 23 ++++++++++++++++++-----
 include/block/block_int-common.h |  6 +++---
 block.c                          |  6 +++---
 block/io.c                       | 32 ++++++++++++++++++++++++++++----
 tests/unit/test-bdrv-drain.c     |  4 ++--
 5 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/include/block/block-io.h b/include/block/block-io.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -XXX,XX +XXX,XX @@ bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
  *
  * Begin a quiesced section for the parent of @c.
  */
-void bdrv_parent_drained_begin_single(BdrvChild *c);
+void GRAPH_RDLOCK bdrv_parent_drained_begin_single(BdrvChild *c);
 
 /**
  * bdrv_parent_drained_poll_single:
@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_begin_single(BdrvChild *c);
  * Returns true if there is any pending activity to cease before @c can be
  * called quiesced, false otherwise.
  */
-bool bdrv_parent_drained_poll_single(BdrvChild *c);
+bool GRAPH_RDLOCK bdrv_parent_drained_poll_single(BdrvChild *c);
 
 /**
  * bdrv_parent_drained_end_single:
  *
  * End a quiesced section for the parent of @c.
  */
-void bdrv_parent_drained_end_single(BdrvChild *c);
+void GRAPH_RDLOCK bdrv_parent_drained_end_single(BdrvChild *c);
 
 /**
  * bdrv_drain_poll:
@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_end_single(BdrvChild *c);
  *
  * This is part of bdrv_drained_begin.
  */
-bool bdrv_drain_poll(BlockDriverState *bs, BdrvChild *ignore_parent,
-                     bool ignore_bds_parents);
+bool GRAPH_RDLOCK
+bdrv_drain_poll(BlockDriverState *bs, BdrvChild *ignore_parent,
+                bool ignore_bds_parents);
 
 /**
  * bdrv_drained_begin:
@@ -XXX,XX +XXX,XX @@ bool bdrv_drain_poll(BlockDriverState *bs, BdrvChild *ignore_parent,
  * Begin a quiesced section for exclusive access to the BDS, by disabling
  * external request sources including NBD server, block jobs, and device model.
  *
+ * This function can only be invoked by the main loop or a coroutine
+ * (regardless of the AioContext where it is running).
+ * If the coroutine is running in an Iothread AioContext, this function will
+ * just schedule a BH to run in the main loop.
+ * However, it cannot be directly called by an Iothread.
+ *
  * This function can be recursive.
  */
 void bdrv_drained_begin(BlockDriverState *bs);
@@ -XXX,XX +XXX,XX @@ void bdrv_do_drained_begin_quiesce(BlockDriverState *bs, BdrvChild *parent);
  * bdrv_drained_end:
  *
  * End a quiescent section started by bdrv_drained_begin().
+ *
+ * This function can only be invoked by the main loop or a coroutine
+ * (regardless of the AioContext where it is running).
+ * If the coroutine is running in an Iothread AioContext, this function will
+ * just schedule a BH to run in the main loop.
+ * However, it cannot be directly called by an Iothread.
  */
 void bdrv_drained_end(BlockDriverState *bs);
 
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -XXX,XX +XXX,XX @@ struct BdrvChildClass {
      * Note that this can be nested. If drained_begin() was called twice, new
      * I/O is allowed only after drained_end() was called twice, too.
      */
-    void (*drained_begin)(BdrvChild *child);
-    void (*drained_end)(BdrvChild *child);
+    void GRAPH_RDLOCK_PTR (*drained_begin)(BdrvChild *child);
+    void GRAPH_RDLOCK_PTR (*drained_end)(BdrvChild *child);
 
     /*
      * Returns whether the parent has pending requests for the child. This
      * callback is polled after .drained_begin() has been called until all
      * activity on the child has stopped.
      */
-    bool (*drained_poll)(BdrvChild *child);
+    bool GRAPH_RDLOCK_PTR (*drained_poll)(BdrvChild *child);
 
     /*
      * Notifies the parent that the filename of its child has changed (e.g.
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static char *bdrv_child_get_parent_desc(BdrvChild *c)
     return g_strdup_printf("node '%s'", bdrv_get_node_name(parent));
 }
 
-static void bdrv_child_cb_drained_begin(BdrvChild *child)
+static void GRAPH_RDLOCK bdrv_child_cb_drained_begin(BdrvChild *child)
 {
     BlockDriverState *bs = child->opaque;
     bdrv_do_drained_begin_quiesce(bs, NULL);
 }
 
-static bool bdrv_child_cb_drained_poll(BdrvChild *child)
+static bool GRAPH_RDLOCK bdrv_child_cb_drained_poll(BdrvChild *child)
 {
     BlockDriverState *bs = child->opaque;
     return bdrv_drain_poll(bs, NULL, false);
 }
 
-static void bdrv_child_cb_drained_end(BdrvChild *child)
+static void GRAPH_RDLOCK bdrv_child_cb_drained_end(BdrvChild *child)
 {
     BlockDriverState *bs = child->opaque;
     bdrv_drained_end(bs);
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ static void bdrv_parent_cb_resize(BlockDriverState *bs);
 static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,
     int64_t offset, int64_t bytes, BdrvRequestFlags flags);
 
-static void bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore)
+static void GRAPH_RDLOCK
+bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore)
 {
     BdrvChild *c, *next;
+    IO_OR_GS_CODE();
+    assert_bdrv_graph_readable();
 
     QLIST_FOREACH_SAFE(c, &bs->parents, next_parent, next) {
         if (c == ignore) {
@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_end_single(BdrvChild *c)
     }
 }
 
-static void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore)
+static void GRAPH_RDLOCK
+bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore)
 {
     BdrvChild *c;
+    IO_OR_GS_CODE();
+    assert_bdrv_graph_readable();
 
     QLIST_FOREACH(c, &bs->parents, next_parent) {
         if (c == ignore) {
@@ -XXX,XX +XXX,XX @@ static void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore)
 
 bool bdrv_parent_drained_poll_single(BdrvChild *c)
 {
+    IO_OR_GS_CODE();
+
     if (c->klass->drained_poll) {
         return c->klass->drained_poll(c);
     }
     return false;
 }
 
-static bool bdrv_parent_drained_poll(BlockDriverState *bs, BdrvChild *ignore,
-                                     bool ignore_bds_parents)
+static bool GRAPH_RDLOCK
+bdrv_parent_drained_poll(BlockDriverState *bs, BdrvChild *ignore,
+                         bool ignore_bds_parents)
 {
     BdrvChild *c, *next;
     bool busy = false;
+    IO_OR_GS_CODE();
+    assert_bdrv_graph_readable();
 
     QLIST_FOREACH_SAFE(c, &bs->parents, next_parent, next) {
         if (c == ignore || (ignore_bds_parents && c->klass->parent_is_bds)) {
@@ -XXX,XX +XXX,XX @@ void bdrv_parent_drained_begin_single(BdrvChild *c)
     c->quiesced_parent = true;
 
     if (c->klass->drained_begin) {
+        /* called with rdlock taken, but it doesn't really need it. */
         c->klass->drained_begin(c);
     }
 }
@@ -XXX,XX +XXX,XX @@ bool bdrv_drain_poll(BlockDriverState *bs, BdrvChild *ignore_parent,
 static bool bdrv_drain_poll_top_level(BlockDriverState *bs,
                                       BdrvChild *ignore_parent)
 {
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     return bdrv_drain_poll(bs, ignore_parent, false);
 }
 
@@ -XXX,XX +XXX,XX @@ static void bdrv_do_drained_begin(BlockDriverState *bs, BdrvChild *parent,
 
     /* Stop things in parent-to-child order */
     if (qatomic_fetch_inc(&bs->quiesce_counter) == 0) {
+        GRAPH_RDLOCK_GUARD_MAINLOOP();
         bdrv_parent_drained_begin(bs, parent);
         if (bs->drv && bs->drv->bdrv_drain_begin) {
             bs->drv->bdrv_drain_begin(bs);
@@ -XXX,XX +XXX,XX @@ static void bdrv_do_drained_end(BlockDriverState *bs, BdrvChild *parent)
         bdrv_co_yield_to_drain(bs, false, parent, false);
         return;
     }
+
+    /* At this point, we should be always running in the main loop. */
+    GLOBAL_STATE_CODE();
     assert(bs->quiesce_counter > 0);
     GLOBAL_STATE_CODE();
 
     /* Re-enable things in child-to-parent order */
     old_quiesce_counter = qatomic_fetch_dec(&bs->quiesce_counter);
     if (old_quiesce_counter == 1) {
+        GRAPH_RDLOCK_GUARD_MAINLOOP();
         if (bs->drv && bs->drv->bdrv_drain_end) {
             bs->drv->bdrv_drain_end(bs);
         }
@@ -XXX,XX +XXX,XX @@ void bdrv_drain(BlockDriverState *bs)
 static void bdrv_drain_assert_idle(BlockDriverState *bs)
 {
     BdrvChild *child, *next;
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     assert(qatomic_read(&bs->in_flight) == 0);
     QLIST_FOREACH_SAFE(child, &bs->children, next, next) {
@@ -XXX,XX +XXX,XX @@ static bool bdrv_drain_all_poll(void)
 {
     BlockDriverState *bs = NULL;
     bool result = false;
+
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     /* bdrv_drain_poll() can't make changes to the graph and we are holding the
      * main AioContext lock, so iterating bdrv_next_all_states() is safe. */
diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/test-bdrv-drain.c
+++ b/tests/unit/test-bdrv-drain.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_mixed_fn detach_by_parent_aio_cb(void *opaque, int ret)
     }
 }
 
-static void detach_by_driver_cb_drained_begin(BdrvChild *child)
+static void GRAPH_RDLOCK detach_by_driver_cb_drained_begin(BdrvChild *child)
 {
     struct detach_by_parent_data *data = &detach_by_parent_data;
 
@@ -XXX,XX +XXX,XX @@ static BdrvChildClass detach_by_driver_cb_class;
  *     state is messed up, but if it is only polled in the single
  *     BDRV_POLL_WHILE() at the end of the drain, this should work fine.
  */
-static void test_detach_indirect(bool by_parent_cb)
+static void TSA_NO_TSA test_detach_indirect(bool by_parent_cb)
 {
     BlockBackend *blk;
     BlockDriverState *parent_a, *parent_b, *a, *b, *c;
-- 
2.41.0

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

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-7-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/io.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@
 /* Maximum bounce buffer for copy-on-read and write zeroes, in bytes */
 #define MAX_BOUNCE_BUFFER (32768 << BDRV_SECTOR_BITS)
 
-static void bdrv_parent_cb_resize(BlockDriverState *bs);
+static void coroutine_fn GRAPH_RDLOCK
+bdrv_parent_cb_resize(BlockDriverState *bs);
+
 static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,
     int64_t offset, int64_t bytes, BdrvRequestFlags flags);
 
@@ -XXX,XX +XXX,XX @@ bdrv_co_write_req_prepare(BdrvChild *child, int64_t offset, int64_t bytes,
     }
 }
 
-static inline void coroutine_fn
+static inline void coroutine_fn GRAPH_RDLOCK
 bdrv_co_write_req_finish(BdrvChild *child, int64_t offset, int64_t bytes,
                          BdrvTrackedRequest *req, int ret)
 {
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_copy_range(BdrvChild *src, int64_t src_offset,
                                    bytes, read_flags, write_flags);
 }
 
-static void bdrv_parent_cb_resize(BlockDriverState *bs)
+static void coroutine_fn GRAPH_RDLOCK
+bdrv_parent_cb_resize(BlockDriverState *bs)
 {
     BdrvChild *c;
+
+    assert_bdrv_graph_readable();
+
     QLIST_FOREACH(c, &bs->parents, next_parent) {
         if (c->klass->resize) {
             c->klass->resize(c);
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_snapshot_fallback() need to hold a reader lock for the graph
because it accesses the children list of a node.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-8-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block_int-common.h | 18 ++++++++--------
 include/block/snapshot.h         | 24 +++++++++++++---------
 block/snapshot.c                 | 35 ++++++++++++++++++++++++++------
 blockdev.c                       |  9 ++++++++
 qemu-img.c                       |  5 +++++
 5 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
 
     int GRAPH_RDLOCK_PTR (*bdrv_inactivate)(BlockDriverState *bs);
 
-    int (*bdrv_snapshot_create)(BlockDriverState *bs,
-                                QEMUSnapshotInfo *sn_info);
-    int (*bdrv_snapshot_goto)(BlockDriverState *bs,
-                              const char *snapshot_id);
-    int (*bdrv_snapshot_delete)(BlockDriverState *bs,
-                                const char *snapshot_id,
-                                const char *name,
-                                Error **errp);
+    int GRAPH_RDLOCK_PTR (*bdrv_snapshot_create)(
+        BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
+
+    int GRAPH_UNLOCKED_PTR (*bdrv_snapshot_goto)(
+        BlockDriverState *bs, const char *snapshot_id);
+
+    int GRAPH_RDLOCK_PTR (*bdrv_snapshot_delete)(
+        BlockDriverState *bs, const char *snapshot_id, const char *name,
+        Error **errp);
+
     int (*bdrv_snapshot_list)(BlockDriverState *bs,
                               QEMUSnapshotInfo **psn_info);
     int (*bdrv_snapshot_load_tmp)(BlockDriverState *bs,
diff --git a/include/block/snapshot.h b/include/block/snapshot.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/snapshot.h
+++ b/include/block/snapshot.h
@@ -XXX,XX +XXX,XX @@
 #ifndef SNAPSHOT_H
 #define SNAPSHOT_H
 
+#include "block/graph-lock.h"
 #include "qapi/qapi-builtin-types.h"
 
 #define SNAPSHOT_OPT_BASE       "snapshot."
@@ -XXX,XX +XXX,XX @@ bool bdrv_snapshot_find_by_id_and_name(BlockDriverState *bs,
                                        const char *name,
                                        QEMUSnapshotInfo *sn_info,
                                        Error **errp);
-int bdrv_can_snapshot(BlockDriverState *bs);
-int bdrv_snapshot_create(BlockDriverState *bs,
-                         QEMUSnapshotInfo *sn_info);
-int bdrv_snapshot_goto(BlockDriverState *bs,
-                       const char *snapshot_id,
-                       Error **errp);
-int bdrv_snapshot_delete(BlockDriverState *bs,
-                         const char *snapshot_id,
-                         const char *name,
-                         Error **errp);
+
+int GRAPH_RDLOCK bdrv_can_snapshot(BlockDriverState *bs);
+
+int GRAPH_RDLOCK
+bdrv_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
+
+int GRAPH_UNLOCKED
+bdrv_snapshot_goto(BlockDriverState *bs, const char *snapshot_id, Error **errp);
+
+int GRAPH_RDLOCK
+bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id,
+                     const char *name, Error **errp);
+
 int bdrv_snapshot_list(BlockDriverState *bs,
                        QEMUSnapshotInfo **psn_info);
 int bdrv_snapshot_load_tmp(BlockDriverState *bs,
diff --git a/block/snapshot.c b/block/snapshot.c
index XXXXXXX..XXXXXXX 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -XXX,XX +XXX,XX @@ bool bdrv_snapshot_find_by_id_and_name(BlockDriverState *bs,
  * back if the given BDS does not support snapshots.
  * Return NULL if there is no BDS to (safely) fall back to.
  */
-static BdrvChild *bdrv_snapshot_fallback_child(BlockDriverState *bs)
+static BdrvChild * GRAPH_RDLOCK
+bdrv_snapshot_fallback_child(BlockDriverState *bs)
 {
     BdrvChild *fallback = bdrv_primary_child(bs);
     BdrvChild *child;
 
+    GLOBAL_STATE_CODE();
+    assert_bdrv_graph_readable();
+
     /* We allow fallback only to primary child */
     if (!fallback) {
         return NULL;
@@ -XXX,XX +XXX,XX @@ static BdrvChild *bdrv_snapshot_fallback_child(BlockDriverState *bs)
     return fallback;
 }
 
-static BlockDriverState *bdrv_snapshot_fallback(BlockDriverState *bs)
+static BlockDriverState * GRAPH_RDLOCK
+bdrv_snapshot_fallback(BlockDriverState *bs)
 {
+    GLOBAL_STATE_CODE();
     return child_bs(bdrv_snapshot_fallback_child(bs));
 }
 
@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_goto(BlockDriverState *bs,
         return ret;
     }
 
+    bdrv_graph_rdlock_main_loop();
     fallback = bdrv_snapshot_fallback_child(bs);
+    bdrv_graph_rdunlock_main_loop();
+
     if (fallback) {
         QDict *options;
         QDict *file_options;
@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_delete(BlockDriverState *bs,
 int bdrv_snapshot_list(BlockDriverState *bs,
                        QEMUSnapshotInfo **psn_info)
 {
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     BlockDriver *drv = bs->drv;
     BlockDriverState *fallback_bs = bdrv_snapshot_fallback(bs);
 
-    GLOBAL_STATE_CODE();
     if (!drv) {
         return -ENOMEDIUM;
     }
@@ -XXX,XX +XXX,XX @@ bdrv_all_get_snapshot_devices(bool has_devices, strList *devices,
 
 static bool GRAPH_RDLOCK bdrv_all_snapshots_includes_bs(BlockDriverState *bs)
 {
+    GLOBAL_STATE_CODE();
+    assert_bdrv_graph_readable();
+
     if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
         return false;
     }
@@ -XXX,XX +XXX,XX @@ int bdrv_all_goto_snapshot(const char *name,
 {
     g_autoptr(GList) bdrvs = NULL;
     GList *iterbdrvs;
+    int ret;
 
     GLOBAL_STATE_CODE();
-    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
-    if (bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp) < 0) {
+    bdrv_graph_rdlock_main_loop();
+    ret = bdrv_all_get_snapshot_devices(has_devices, devices, &bdrvs, errp);
+    bdrv_graph_rdunlock_main_loop();
+
+    if (ret < 0) {
         return -1;
     }
 
@@ -XXX,XX +XXX,XX @@ int bdrv_all_goto_snapshot(const char *name,
         BlockDriverState *bs = iterbdrvs->data;
         AioContext *ctx = bdrv_get_aio_context(bs);
         int ret = 0;
+        bool all_snapshots_includes_bs;
 
         aio_context_acquire(ctx);
-        if (devices || bdrv_all_snapshots_includes_bs(bs)) {
+        bdrv_graph_rdlock_main_loop();
+        all_snapshots_includes_bs = bdrv_all_snapshots_includes_bs(bs);
+        bdrv_graph_rdunlock_main_loop();
+
+        if (devices || all_snapshots_includes_bs) {
             ret = bdrv_snapshot_goto(bs, name, errp);
         }
         aio_context_release(ctx);
diff --git a/blockdev.c b/blockdev.c
index XXXXXXX..XXXXXXX 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ SnapshotInfo *qmp_blockdev_snapshot_delete_internal_sync(const char *device,
     SnapshotInfo *info = NULL;
     int ret;
 
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     bs = qmp_get_root_bs(device, errp);
     if (!bs) {
         return NULL;
@@ -XXX,XX +XXX,XX @@ static void internal_snapshot_action(BlockdevSnapshotInternal *internal,
     AioContext *aio_context;
     int ret1;
 
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     tran_add(tran, &internal_snapshot_drv, state);
 
     device = internal->device;
@@ -XXX,XX +XXX,XX @@ static void internal_snapshot_abort(void *opaque)
     AioContext *aio_context;
     Error *local_error = NULL;
 
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     if (!state->created) {
         return;
     }
diff --git a/qemu-img.c b/qemu-img.c
index XXXXXXX..XXXXXXX 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -XXX,XX +XXX,XX @@ static int img_snapshot(int argc, char **argv)
         sn.date_sec = rt / G_USEC_PER_SEC;
         sn.date_nsec = (rt % G_USEC_PER_SEC) * 1000;
 
+        bdrv_graph_rdlock_main_loop();
         ret = bdrv_snapshot_create(bs, &sn);
+        bdrv_graph_rdunlock_main_loop();
+
         if (ret) {
             error_report("Could not create snapshot '%s': %s",
                 snapshot_name, strerror(-ret));
@@ -XXX,XX +XXX,XX @@ static int img_snapshot(int argc, char **argv)
         break;
 
     case SNAPSHOT_DELETE:
+        bdrv_graph_rdlock_main_loop();
         ret = bdrv_snapshot_find(bs, &sn, snapshot_name);
         if (ret < 0) {
             error_report("Could not delete snapshot '%s': snapshot not "
@@ -XXX,XX +XXX,XX @@ static int img_snapshot(int argc, char **argv)
                 ret = 1;
             }
         }
+        bdrv_graph_rdunlock_main_loop();
         break;
     }
 
-- 
2.41.0

Reopen isn't easy with respect to locking because many of its functions
need to iterate the graph, some change it, and then you get some drains
in the middle where you can't hold any locks.

Therefore just documents most of the functions to be unlocked, and take
locks internally before accessing the graph.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-9-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block_int-common.h | 13 +++++---
 block.c                          | 57 ++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
                                 Error **errp);
 
     /* For handling image reopen for split or non-split files. */
-    int (*bdrv_reopen_prepare)(BDRVReopenState *reopen_state,
-                               BlockReopenQueue *queue, Error **errp);
-    void (*bdrv_reopen_commit)(BDRVReopenState *reopen_state);
-    void (*bdrv_reopen_commit_post)(BDRVReopenState *reopen_state);
-    void (*bdrv_reopen_abort)(BDRVReopenState *reopen_state);
+    int GRAPH_UNLOCKED_PTR (*bdrv_reopen_prepare)(
+        BDRVReopenState *reopen_state, BlockReopenQueue *queue, Error **errp);
+    void GRAPH_UNLOCKED_PTR (*bdrv_reopen_commit)(
+        BDRVReopenState *reopen_state);
+    void GRAPH_UNLOCKED_PTR (*bdrv_reopen_commit_post)(
+        BDRVReopenState *reopen_state);
+    void GRAPH_UNLOCKED_PTR (*bdrv_reopen_abort)(
+        BDRVReopenState *reopen_state);
     void (*bdrv_join_options)(QDict *options, QDict *old_options);
 
     int GRAPH_UNLOCKED_PTR (*bdrv_open)(
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static int bdrv_reset_options_allowed(BlockDriverState *bs,
 /*
  * Returns true if @child can be reached recursively from @bs
  */
-static bool bdrv_recurse_has_child(BlockDriverState *bs,
-                                   BlockDriverState *child)
+static bool GRAPH_RDLOCK
+bdrv_recurse_has_child(BlockDriverState *bs, BlockDriverState *child)
 {
     BdrvChild *c;
 
@@ -XXX,XX +XXX,XX @@ static bool bdrv_recurse_has_child(BlockDriverState *bs,
  *
  * To be called with bs->aio_context locked.
  */
-static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
-                                                 BlockDriverState *bs,
-                                                 QDict *options,
-                                                 const BdrvChildClass *klass,
-                                                 BdrvChildRole role,
-                                                 bool parent_is_format,
-                                                 QDict *parent_options,
-                                                 int parent_flags,
-                                                 bool keep_old_opts)
+static BlockReopenQueue * GRAPH_RDLOCK
+bdrv_reopen_queue_child(BlockReopenQueue *bs_queue, BlockDriverState *bs,
+                        QDict *options, const BdrvChildClass *klass,
+                        BdrvChildRole role, bool parent_is_format,
+                        QDict *parent_options, int parent_flags,
+                        bool keep_old_opts)
 {
     assert(bs != NULL);
 
@@ -XXX,XX +XXX,XX @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
 
     GLOBAL_STATE_CODE();
 
+    /*
+     * Strictly speaking, draining is illegal under GRAPH_RDLOCK. We know that
+     * we've been called with bdrv_graph_rdlock_main_loop(), though, so it's ok
+     * in practice.
+     */
     bdrv_drained_begin(bs);
 
     if (bs_queue == NULL) {
@@ -XXX,XX +XXX,XX @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue,
                                     QDict *options, bool keep_old_opts)
 {
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     return bdrv_reopen_queue_child(bs_queue, bs, options, NULL, 0, false,
                                    NULL, 0, keep_old_opts);
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only,
  * Callers must make sure that their AioContext locking is still correct after
  * this.
  */
-static int bdrv_reopen_parse_file_or_backing(BDRVReopenState *reopen_state,
-                                             bool is_backing, Transaction *tran,
-                                             Error **errp)
+static int GRAPH_UNLOCKED
+bdrv_reopen_parse_file_or_backing(BDRVReopenState *reopen_state,
+                                  bool is_backing, Transaction *tran,
+                                  Error **errp)
 {
     BlockDriverState *bs = reopen_state->bs;
     BlockDriverState *new_child_bs;
@@ -XXX,XX +XXX,XX @@ static int bdrv_reopen_parse_file_or_backing(BDRVReopenState *reopen_state,
     QObject *value;
     const char *str;
     AioContext *ctx, *old_ctx;
+    bool has_child;
     int ret;
 
     GLOBAL_STATE_CODE();
@@ -XXX,XX +XXX,XX @@ static int bdrv_reopen_parse_file_or_backing(BDRVReopenState *reopen_state,
         new_child_bs = bdrv_lookup_bs(NULL, str, errp);
         if (new_child_bs == NULL) {
             return -EINVAL;
-        } else if (bdrv_recurse_has_child(new_child_bs, bs)) {
+        }
+
+        bdrv_graph_rdlock_main_loop();
+        has_child = bdrv_recurse_has_child(new_child_bs, bs);
+        bdrv_graph_rdunlock_main_loop();
+
+        if (has_child) {
             error_setg(errp, "Making '%s' a %s child of '%s' would create a "
                        "cycle", str, child_name, bs->node_name);
             return -EINVAL;
@@ -XXX,XX +XXX,XX @@ static int bdrv_reopen_parse_file_or_backing(BDRVReopenState *reopen_state,
  * After calling this function, the transaction @change_child_tran may only be
  * completed while holding a writer lock for the graph.
  */
-static int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
-                               BlockReopenQueue *queue,
-                               Transaction *change_child_tran, Error **errp)
+static int GRAPH_UNLOCKED
+bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
+                    Transaction *change_child_tran, Error **errp)
 {
     int ret = -1;
     int old_flags;
@@ -XXX,XX +XXX,XX @@ static int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
     if (qdict_size(reopen_state->options)) {
         const QDictEntry *entry = qdict_first(reopen_state->options);
 
+        GRAPH_RDLOCK_GUARD_MAINLOOP();
+
         do {
             QObject *new = entry->value;
             QObject *old = qdict_get(reopen_state->bs->options, entry->key);
@@ -XXX,XX +XXX,XX @@ error:
  * makes them final by swapping the staging BlockDriverState contents into
  * the active BlockDriverState contents.
  */
-static void bdrv_reopen_commit(BDRVReopenState *reopen_state)
+static void GRAPH_UNLOCKED bdrv_reopen_commit(BDRVReopenState *reopen_state)
 {
     BlockDriver *drv;
     BlockDriverState *bs;
@@ -XXX,XX +XXX,XX @@ static void bdrv_reopen_commit(BDRVReopenState *reopen_state)
         drv->bdrv_reopen_commit(reopen_state);
     }
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     /* set BDS specific flags now */
     qobject_unref(bs->explicit_options);
     qobject_unref(bs->options);
@@ -XXX,XX +XXX,XX @@ static void bdrv_reopen_commit(BDRVReopenState *reopen_state)
     qdict_del(bs->explicit_options, "backing");
     qdict_del(bs->options, "backing");
 
-    bdrv_graph_rdlock_main_loop();
     bdrv_refresh_limits(bs, NULL, NULL);
-    bdrv_graph_rdunlock_main_loop();
     bdrv_refresh_total_sectors(bs, bs->total_sectors);
 }
 
@@ -XXX,XX +XXX,XX @@ static void bdrv_reopen_commit(BDRVReopenState *reopen_state)
  * Abort the reopen, and delete and free the staged changes in
  * reopen_state
  */
-static void bdrv_reopen_abort(BDRVReopenState *reopen_state)
+static void GRAPH_UNLOCKED bdrv_reopen_abort(BDRVReopenState *reopen_state)
 {
     BlockDriver *drv;
 
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_get_xdbg_block_graph() need to hold a reader lock for the graph
because it accesses the children list of a node.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-10-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block-global-state.h | 2 +-
 blockdev.c                         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -XXX,XX +XXX,XX @@ int bdrv_has_zero_init_1(BlockDriverState *bs);
 int bdrv_has_zero_init(BlockDriverState *bs);
 BlockDriverState *bdrv_find_node(const char *node_name);
 BlockDeviceInfoList *bdrv_named_nodes_list(bool flat, Error **errp);
-XDbgBlockGraph *bdrv_get_xdbg_block_graph(Error **errp);
+XDbgBlockGraph * GRAPH_RDLOCK bdrv_get_xdbg_block_graph(Error **errp);
 BlockDriverState *bdrv_lookup_bs(const char *device,
                                  const char *node_name,
                                  Error **errp);
diff --git a/blockdev.c b/blockdev.c
index XXXXXXX..XXXXXXX 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ BlockDeviceInfoList *qmp_query_named_block_nodes(bool has_flat,
 
 XDbgBlockGraph *qmp_x_debug_query_block_graph(Error **errp)
 {
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     return bdrv_get_xdbg_block_graph(errp);
 }
 
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_refresh_filename() need to hold a reader lock for the graph
because it accesses the children list of a node.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-11-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/vhdx.h                       |  5 +--
 include/block/block-global-state.h |  9 ++++--
 include/block/block_int-common.h   |  8 ++---
 include/block/qapi.h               | 16 ++++------
 block.c                            | 23 +++++++++++---
 block/nfs.c                        |  2 +-
 block/qapi.c                       | 11 ++++---
 block/raw-format.c                 |  2 ++
 block/vhdx.c                       |  4 +++
 block/vmdk.c                       | 51 +++++++++++++++++++-----------
 blockdev.c                         | 13 ++++++++
 qemu-img.c                         |  4 +++
 12 files changed, 101 insertions(+), 47 deletions(-)

diff --git a/block/vhdx.h b/block/vhdx.h
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx.h
+++ b/block/vhdx.h
@@ -XXX,XX +XXX,XX @@ uint32_t vhdx_checksum_calc(uint32_t crc, uint8_t *buf, size_t size,
 
 bool vhdx_checksum_is_valid(uint8_t *buf, size_t size, int crc_offset);
 
-int vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s, bool *flushed,
-                   Error **errp);
+int GRAPH_RDLOCK
+vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s, bool *flushed,
+               Error **errp);
 
 int coroutine_fn GRAPH_RDLOCK
 vhdx_log_write_and_flush(BlockDriverState *bs, BDRVVHDXState *s,
diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_set_read_only(BlockDriverState *bs, bool read_only,
                               Error **errp);
 BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
                                           const char *backing_file);
-void bdrv_refresh_filename(BlockDriverState *bs);
+void GRAPH_RDLOCK bdrv_refresh_filename(BlockDriverState *bs);
 
 void GRAPH_RDLOCK
 bdrv_refresh_limits(BlockDriverState *bs, Transaction *tran, Error **errp);
@@ -XXX,XX +XXX,XX @@ void bdrv_next_cleanup(BdrvNextIterator *it);
 BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs);
 void bdrv_iterate_format(void (*it)(void *opaque, const char *name),
                          void *opaque, bool read_only);
-char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp);
-char *bdrv_dirname(BlockDriverState *bs, Error **errp);
+
+char * GRAPH_RDLOCK
+bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp);
+
+char * GRAPH_RDLOCK bdrv_dirname(BlockDriverState *bs, Error **errp);
 
 void bdrv_img_create(const char *filename, const char *fmt,
                      const char *base_filename, const char *base_fmt,
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
      * Refreshes the bs->exact_filename field. If that is impossible,
      * bs->exact_filename has to be left empty.
      */
-    void (*bdrv_refresh_filename)(BlockDriverState *bs);
+    void GRAPH_RDLOCK_PTR (*bdrv_refresh_filename)(BlockDriverState *bs);
 
     /*
      * Gathers the open options for all children into @target.
@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
      * block driver which implements it is probably doing something
      * shady regarding its runtime option structure.
      */
-    void (*bdrv_gather_child_options)(BlockDriverState *bs, QDict *target,
-                                      bool backing_overridden);
+    void GRAPH_RDLOCK_PTR (*bdrv_gather_child_options)(
+        BlockDriverState *bs, QDict *target, bool backing_overridden);
 
     /*
      * Returns an allocated string which is the directory name of this BDS: It
      * will be used to make relative filenames absolute by prepending this
      * function's return value to them.
      */
-    char *(*bdrv_dirname)(BlockDriverState *bs, Error **errp);
+    char * GRAPH_RDLOCK_PTR (*bdrv_dirname)(BlockDriverState *bs, Error **errp);
 
     /*
      * This informs the driver that we are no longer interested in the result
diff --git a/include/block/qapi.h b/include/block/qapi.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/qapi.h
+++ b/include/block/qapi.h
@@ -XXX,XX +XXX,XX @@
 #include "block/snapshot.h"
 #include "qapi/qapi-types-block-core.h"
 
-BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
-                                        BlockDriverState *bs,
-                                        bool flat,
-                                        Error **errp);
+BlockDeviceInfo * GRAPH_RDLOCK
+bdrv_block_device_info(BlockBackend *blk, BlockDriverState *bs,
+                       bool flat, Error **errp);
+
 int bdrv_query_snapshot_info_list(BlockDriverState *bs,
                                   SnapshotInfoList **p_list,
                                   Error **errp);
-void bdrv_query_image_info(BlockDriverState *bs,
-                           ImageInfo **p_info,
-                           bool flat,
-                           bool skip_implicit_filters,
-                           Error **errp);
+void GRAPH_RDLOCK
+bdrv_query_image_info(BlockDriverState *bs, ImageInfo **p_info, bool flat,
+                      bool skip_implicit_filters, Error **errp);
 void GRAPH_RDLOCK
 bdrv_query_block_graph_info(BlockDriverState *bs, BlockGraphInfo **p_info,
                             Error **errp);
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ char *bdrv_get_full_backing_filename_from_filename(const char *backed,
  * setting @errp.  In all other cases, NULL will only be returned with
  * @errp set.
  */
-static char *bdrv_make_absolute_filename(BlockDriverState *relative_to,
-                                         const char *filename, Error **errp)
+static char * GRAPH_RDLOCK
+bdrv_make_absolute_filename(BlockDriverState *relative_to,
+                            const char *filename, Error **errp)
 {
     char *dir, *full_name;
 
@@ -XXX,XX +XXX,XX @@ static void bdrv_temp_snapshot_options(int *child_flags, QDict *child_options,
     *child_flags &= ~BDRV_O_NATIVE_AIO;
 }
 
-static void bdrv_backing_attach(BdrvChild *c)
+static void GRAPH_WRLOCK bdrv_backing_attach(BdrvChild *c)
 {
     BlockDriverState *parent = c->opaque;
     BlockDriverState *backing_hd = c->bs;
@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
     }
 
     if (file != NULL) {
+        bdrv_graph_rdlock_main_loop();
         bdrv_refresh_filename(blk_bs(file));
+        bdrv_graph_rdunlock_main_loop();
+
         filename = blk_bs(file)->filename;
     } else {
         /*
@@ -XXX,XX +XXX,XX @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options,
             implicit_backing = !strcmp(bs->auto_backing_file, bs->backing_file);
         }
 
+        bdrv_graph_rdlock_main_loop();
         backing_filename = bdrv_get_full_backing_filename(bs, &local_err);
+        bdrv_graph_rdunlock_main_loop();
+
         if (local_err) {
             ret = -EINVAL;
             error_propagate(errp, local_err);
@@ -XXX,XX +XXX,XX @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options,
     }
 
     if (implicit_backing) {
+        bdrv_graph_rdlock_main_loop();
         bdrv_refresh_filename(backing_hd);
+        bdrv_graph_rdunlock_main_loop();
         pstrcpy(bs->auto_backing_file, sizeof(bs->auto_backing_file),
                 backing_hd->filename);
     }
@@ -XXX,XX +XXX,XX @@ bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
             if (local_err != NULL) {
                 error_propagate(errp, local_err);
             } else {
+                bdrv_graph_rdlock_main_loop();
                 bdrv_refresh_filename(reopen_state->bs);
+                bdrv_graph_rdunlock_main_loop();
                 error_setg(errp, "failed while preparing to reopen image '%s'",
                            reopen_state->bs->filename);
             }
@@ -XXX,XX +XXX,XX @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base,
 
     bdrv_ref(top);
     bdrv_drained_begin(base);
+    bdrv_graph_rdlock_main_loop();
 
     if (!top->drv || !base->drv) {
         goto exit;
@@ -XXX,XX +XXX,XX @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base,
         backing_file_str = base->filename;
     }
 
-    bdrv_graph_rdlock_main_loop();
     QLIST_FOREACH(c, &top->parents, next_parent) {
         updated_children = g_slist_prepend(updated_children, c);
     }
-    bdrv_graph_rdunlock_main_loop();
 
     /*
      * It seems correct to pass detach_subchain=true here, but it triggers
@@ -XXX,XX +XXX,XX @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base,
 
     ret = 0;
 exit:
+    bdrv_graph_rdunlock_main_loop();
     bdrv_drained_end(base);
     bdrv_unref(top);
     return ret;
@@ -XXX,XX +XXX,XX @@ BlockDeviceInfoList *bdrv_named_nodes_list(bool flat,
     BlockDriverState *bs;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     list = NULL;
     QTAILQ_FOREACH(bs, &graph_bdrv_states, node_list) {
@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
     BlockDriverState *bs_below;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (!bs || !bs->drv || !backing_file) {
         return NULL;
diff --git a/block/nfs.c b/block/nfs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -XXX,XX +XXX,XX @@ static void nfs_refresh_filename(BlockDriverState *bs)
     }
 }
 
-static char *nfs_dirname(BlockDriverState *bs, Error **errp)
+static char * GRAPH_RDLOCK nfs_dirname(BlockDriverState *bs, Error **errp)
 {
     NFSClient *client = bs->opaque;
 
diff --git a/block/qapi.c b/block/qapi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -XXX,XX +XXX,XX @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs,
  * Helper function for other query info functions.  Store information about @bs
  * in @info, setting @errp on error.
  */
-static void bdrv_do_query_node_info(BlockDriverState *bs,
-                                    BlockNodeInfo *info,
-                                    Error **errp)
+static void GRAPH_RDLOCK
+bdrv_do_query_node_info(BlockDriverState *bs, BlockNodeInfo *info, Error **errp)
 {
     int64_t size;
     const char *backing_filename;
@@ -XXX,XX +XXX,XX @@ fail:
 }
 
 /* @p_info will be set only on success. */
-static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info,
-                            Error **errp)
+static void GRAPH_RDLOCK
+bdrv_query_info(BlockBackend *blk, BlockInfo **p_info, Error **errp)
 {
     BlockInfo *info = g_malloc0(sizeof(*info));
     BlockDriverState *bs = blk_bs(blk);
@@ -XXX,XX +XXX,XX @@ BlockInfoList *qmp_query_block(Error **errp)
     BlockBackend *blk;
     Error *local_err = NULL;
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) {
         BlockInfoList *info;
 
diff --git a/block/raw-format.c b/block/raw-format.c
index XXXXXXX..XXXXXXX 100644
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -XXX,XX +XXX,XX @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags,
                                    BDRV_REQ_ZERO_WRITE;
 
     if (bs->probed && !bdrv_is_read_only(bs)) {
+        bdrv_graph_rdlock_main_loop();
         bdrv_refresh_filename(bs->file->bs);
+        bdrv_graph_rdunlock_main_loop();
         fprintf(stderr,
                 "WARNING: Image format was not specified for '%s' and probing "
                 "guessed raw.\n"
diff --git a/block/vhdx.c b/block/vhdx.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -XXX,XX +XXX,XX @@ static int vhdx_open(BlockDriverState *bs, QDict *options, int flags,
     uint64_t signature;
     Error *local_err = NULL;
 
+    GLOBAL_STATE_CODE();
+
     ret = bdrv_open_file_child(NULL, options, "file", bs, errp);
     if (ret < 0) {
         return ret;
     }
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     s->bat = NULL;
     s->first_visible_write = true;
 
diff --git a/block/vmdk.c b/block/vmdk.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -XXX,XX +XXX,XX @@ static int vmdk_add_extent(BlockDriverState *bs,
     return 0;
 }
 
-static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent,
-                            Error **errp)
+static int GRAPH_RDLOCK
+vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent, Error **errp)
 {
     int ret;
     size_t l1_size;
@@ -XXX,XX +XXX,XX @@ static int vmdk_init_tables(BlockDriverState *bs, VmdkExtent *extent,
     return ret;
 }
 
-static int vmdk_open_vmfs_sparse(BlockDriverState *bs,
-                                 BdrvChild *file,
-                                 int flags, Error **errp)
+static int GRAPH_RDLOCK
+vmdk_open_vmfs_sparse(BlockDriverState *bs, BdrvChild *file, int flags,
+                      Error **errp)
 {
     int ret;
     uint32_t magic;
@@ -XXX,XX +XXX,XX @@ static int check_se_sparse_volatile_header(VMDKSESparseVolatileHeader *header,
     return 0;
 }
 
-static int vmdk_open_se_sparse(BlockDriverState *bs,
-                               BdrvChild *file,
-                               int flags, Error **errp)
+static int GRAPH_RDLOCK
+vmdk_open_se_sparse(BlockDriverState *bs, BdrvChild *file, int flags,
+                    Error **errp)
 {
     int ret;
     VMDKSESparseConstHeader const_header;
@@ -XXX,XX +XXX,XX @@ static char *vmdk_read_desc(BdrvChild *file, uint64_t desc_offset, Error **errp)
     return buf;
 }
 
-static int vmdk_open_vmdk4(BlockDriverState *bs,
-                           BdrvChild *file,
-                           int flags, QDict *options, Error **errp)
+static int GRAPH_RDLOCK
+vmdk_open_vmdk4(BlockDriverState *bs, BdrvChild *file, int flags,
+                QDict *options, Error **errp)
 {
     int ret;
     uint32_t magic;
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_description(const char *desc, const char *opt_name,
 }
 
 /* Open an extent file and append to bs array */
-static int vmdk_open_sparse(BlockDriverState *bs, BdrvChild *file, int flags,
-                            char *buf, QDict *options, Error **errp)
+static int GRAPH_RDLOCK
+vmdk_open_sparse(BlockDriverState *bs, BdrvChild *file, int flags,
+                 char *buf, QDict *options, Error **errp)
 {
     uint32_t magic;
 
@@ -XXX,XX +XXX,XX @@ static const char *next_line(const char *s)
     return s;
 }
 
-static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
-                              QDict *options, Error **errp)
+static int GRAPH_RDLOCK
+vmdk_parse_extents(const char *desc, BlockDriverState *bs, QDict *options,
+                   Error **errp)
 {
     int ret;
     int matches;
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
     char extent_opt_prefix[32];
     Error *local_err = NULL;
 
+    GLOBAL_STATE_CODE();
+
     for (p = desc; *p; p = next_line(p)) {
         /* parse extent line in one of below formats:
          *
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
             ret = vmdk_add_extent(bs, extent_file, true, sectors,
                             0, 0, 0, 0, 0, &extent, errp);
             if (ret < 0) {
+                bdrv_graph_rdunlock_main_loop();
                 bdrv_graph_wrlock(NULL);
                 bdrv_unref_child(bs, extent_file);
                 bdrv_graph_wrunlock();
+                bdrv_graph_rdlock_main_loop();
                 goto out;
             }
             extent->flat_start_offset = flat_offset << 9;
@@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
             }
             g_free(buf);
             if (ret) {
+                bdrv_graph_rdunlock_main_loop();
                 bdrv_graph_wrlock(NULL);
                 bdrv_unref_child(bs, extent_file);
                 bdrv_graph_wrunlock();
+                bdrv_graph_rdlock_main_loop();
                 goto out;
             }
             extent = &s->extents[s->num_extents - 1];
         } else if (!strcmp(type, "SESPARSE")) {
             ret = vmdk_open_se_sparse(bs, extent_file, bs->open_flags, errp);
             if (ret) {
+                bdrv_graph_rdunlock_main_loop();
                 bdrv_graph_wrlock(NULL);
                 bdrv_unref_child(bs, extent_file);
                 bdrv_graph_wrunlock();
+                bdrv_graph_rdlock_main_loop();
                 goto out;
             }
             extent = &s->extents[s->num_extents - 1];
         } else {
             error_setg(errp, "Unsupported extent type '%s'", type);
+            bdrv_graph_rdunlock_main_loop();
             bdrv_graph_wrlock(NULL);
             bdrv_unref_child(bs, extent_file);
             bdrv_graph_wrunlock();
+            bdrv_graph_rdlock_main_loop();
             ret = -ENOTSUP;
             goto out;
         }
@@ -XXX,XX +XXX,XX @@ out:
     return ret;
 }
 
-static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf,
-                               QDict *options, Error **errp)
+static int GRAPH_RDLOCK
+vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf, QDict *options,
+                    Error **errp)
 {
     int ret;
     char ct[128];
@@ -XXX,XX +XXX,XX @@ static int vmdk_has_zero_init(BlockDriverState *bs)
     return 1;
 }
 
-static VmdkExtentInfo *vmdk_get_extent_info(VmdkExtent *extent)
+static VmdkExtentInfo * GRAPH_RDLOCK vmdk_get_extent_info(VmdkExtent *extent)
 {
     VmdkExtentInfo *info = g_new0(VmdkExtentInfo, 1);
 
@@ -XXX,XX +XXX,XX @@ static ImageInfoSpecific *vmdk_get_specific_info(BlockDriverState *bs,
     ImageInfoSpecific *spec_info = g_new0(ImageInfoSpecific, 1);
     VmdkExtentInfoList **tail;
 
+    assume_graph_lock(); /* FIXME */
+
     *spec_info = (ImageInfoSpecific){
         .type = IMAGE_INFO_SPECIFIC_KIND_VMDK,
         .u = {
diff --git a/blockdev.c b/blockdev.c
index XXXXXXX..XXXXXXX 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ static void drive_backup_action(DriveBackup *backup,
     bool set_backing_hd = false;
     int ret;
 
+    GLOBAL_STATE_CODE();
+
     tran_add(tran, &drive_backup_drv, state);
 
     if (!backup->has_mode) {
@@ -XXX,XX +XXX,XX @@ static void drive_backup_action(DriveBackup *backup,
             BlockDriverState *explicit_backing =
                 bdrv_skip_implicit_filters(source);
 
+            bdrv_graph_rdlock_main_loop();
             bdrv_refresh_filename(explicit_backing);
+            bdrv_graph_rdunlock_main_loop();
+
             bdrv_img_create(backup->target, format,
                             explicit_backing->filename,
                             explicit_backing->drv->format_name, NULL,
@@ -XXX,XX +XXX,XX @@ void qmp_block_stream(const char *job_id, const char *device,
     Error *local_err = NULL;
     int job_flags = JOB_DEFAULT;
 
+    GLOBAL_STATE_CODE();
+
     if (base && base_node) {
         error_setg(errp, "'base' and 'base-node' cannot be specified "
                    "at the same time");
@@ -XXX,XX +XXX,XX @@ void qmp_block_stream(const char *job_id, const char *device,
             goto out;
         }
         assert(bdrv_get_aio_context(base_bs) == aio_context);
+
+        bdrv_graph_rdlock_main_loop();
         bdrv_refresh_filename(base_bs);
+        bdrv_graph_rdunlock_main_loop();
     }
 
     if (bottom) {
@@ -XXX,XX +XXX,XX @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
             break;
         case NEW_IMAGE_MODE_ABSOLUTE_PATHS:
             /* create new image with backing file */
+            bdrv_graph_rdlock_main_loop();
             bdrv_refresh_filename(explicit_backing);
+            bdrv_graph_rdunlock_main_loop();
+
             bdrv_img_create(arg->target, format,
                             explicit_backing->filename,
                             explicit_backing->drv->format_name,
diff --git a/qemu-img.c b/qemu-img.c
index XXXXXXX..XXXXXXX 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -XXX,XX +XXX,XX @@ static int get_block_status(BlockDriverState *bs, int64_t offset,
     has_offset = !!(ret & BDRV_BLOCK_OFFSET_VALID);
 
     if (file && has_offset) {
+        bdrv_graph_rdlock_main_loop();
         bdrv_refresh_filename(file);
+        bdrv_graph_rdunlock_main_loop();
         filename = file->filename;
     }
 
@@ -XXX,XX +XXX,XX @@ static int img_rebase(int argc, char **argv)
                 qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
             }
 
+            bdrv_graph_rdlock_main_loop();
             bdrv_refresh_filename(bs);
+            bdrv_graph_rdunlock_main_loop();
             overlay_filename = bs->exact_filename[0] ? bs->exact_filename
                                                      : bs->filename;
             out_real_path =
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_primary_child() need to hold a reader lock for the graph
because it accesses the children list of a node.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-12-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block_int-io.h |  5 +++--
 block.c                      | 11 ++++++++++-
 block/snapshot.c             |  3 +++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/include/block/block_int-io.h b/include/block/block_int-io.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int-io.h
+++ b/include/block/block_int-io.h
@@ -XXX,XX +XXX,XX @@ bdrv_refresh_total_sectors(BlockDriverState *bs, int64_t hint);
 BdrvChild *bdrv_cow_child(BlockDriverState *bs);
 BdrvChild *bdrv_filter_child(BlockDriverState *bs);
 BdrvChild *bdrv_filter_or_cow_child(BlockDriverState *bs);
-BdrvChild *bdrv_primary_child(BlockDriverState *bs);
+BdrvChild * GRAPH_RDLOCK bdrv_primary_child(BlockDriverState *bs);
 BlockDriverState *bdrv_skip_filters(BlockDriverState *bs);
 BlockDriverState *bdrv_backing_chain_next(BlockDriverState *bs);
 
@@ -XXX,XX +XXX,XX @@ static inline BlockDriverState *bdrv_filter_or_cow_bs(BlockDriverState *bs)
     return child_bs(bdrv_filter_or_cow_child(bs));
 }
 
-static inline BlockDriverState *bdrv_primary_bs(BlockDriverState *bs)
+static inline BlockDriverState * GRAPH_RDLOCK
+bdrv_primary_bs(BlockDriverState *bs)
 {
     IO_CODE();
     return child_bs(bdrv_primary_child(bs));
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void coroutine_fn bdrv_co_debug_event(BlockDriverState *bs, BlkdebugEvent event)
     bs->drv->bdrv_co_debug_event(bs, event);
 }
 
-static BlockDriverState *bdrv_find_debug_node(BlockDriverState *bs)
+static BlockDriverState * GRAPH_RDLOCK
+bdrv_find_debug_node(BlockDriverState *bs)
 {
     GLOBAL_STATE_CODE();
     while (bs && bs->drv && !bs->drv->bdrv_debug_breakpoint) {
@@ -XXX,XX +XXX,XX @@ int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
                           const char *tag)
 {
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     bs = bdrv_find_debug_node(bs);
     if (bs) {
         return bs->drv->bdrv_debug_breakpoint(bs, event, tag);
@@ -XXX,XX +XXX,XX @@ int bdrv_debug_breakpoint(BlockDriverState *bs, const char *event,
 int bdrv_debug_remove_breakpoint(BlockDriverState *bs, const char *tag)
 {
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     bs = bdrv_find_debug_node(bs);
     if (bs) {
         return bs->drv->bdrv_debug_remove_breakpoint(bs, tag);
@@ -XXX,XX +XXX,XX @@ int bdrv_debug_remove_breakpoint(BlockDriverState *bs, const char *tag)
 int bdrv_debug_resume(BlockDriverState *bs, const char *tag)
 {
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     while (bs && (!bs->drv || !bs->drv->bdrv_debug_resume)) {
         bs = bdrv_primary_bs(bs);
     }
@@ -XXX,XX +XXX,XX @@ int bdrv_debug_resume(BlockDriverState *bs, const char *tag)
 bool bdrv_debug_is_suspended(BlockDriverState *bs, const char *tag)
 {
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     while (bs && bs->drv && !bs->drv->bdrv_debug_is_suspended) {
         bs = bdrv_primary_bs(bs);
     }
diff --git a/block/snapshot.c b/block/snapshot.c
index XXXXXXX..XXXXXXX 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_goto(BlockDriverState *bs,
          * respective option (with the qdict_put_str() call above).
          * Assert that .bdrv_open() has attached the right BDS as primary child.
          */
+        bdrv_graph_rdlock_main_loop();
         assert(bdrv_primary_bs(bs) == fallback_bs);
+        bdrv_graph_rdunlock_main_loop();
+
         bdrv_unref(fallback_bs);
         return ret;
     }
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_get_parent_name() need to hold a reader lock for the graph
because it accesses the parents list of a node.

diff --git a/block/qcow2.h b/block/qcow2.h
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -XXX,XX +XXX,XX @@ int coroutine_fn qcow2_truncate_bitmaps_check(BlockDriverState *bs, Error **errp
 bool qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
                                           bool release_stored, Error **errp);
 int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp);
-bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
-                                                      const char *name,
-                                                      uint32_t granularity,
-                                                      Error **errp);
+bool coroutine_fn GRAPH_RDLOCK
+qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *name,
+                                    uint32_t granularity, Error **errp);
 int coroutine_fn qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs,
                                                          const char *name,
                                                          Error **errp);
diff --git a/include/block/block-io.h b/include/block/block-io.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -XXX,XX +XXX,XX @@ const char *bdrv_get_format_name(BlockDriverState *bs);
 
 bool bdrv_supports_compressed_writes(BlockDriverState *bs);
 const char *bdrv_get_node_name(const BlockDriverState *bs);
-const char *bdrv_get_device_name(const BlockDriverState *bs);
-const char *bdrv_get_device_or_node_name(const BlockDriverState *bs);
+
+const char * GRAPH_RDLOCK
+bdrv_get_device_name(const BlockDriverState *bs);
+
+const char * GRAPH_RDLOCK
+bdrv_get_device_or_node_name(const BlockDriverState *bs);
 
 int coroutine_fn GRAPH_RDLOCK
 bdrv_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
diff --git a/include/block/block_int-io.h b/include/block/block_int-io.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int-io.h
+++ b/include/block/block_int-io.h
@@ -XXX,XX +XXX,XX @@ BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size,
  */
 void bdrv_wakeup(BlockDriverState *bs);
 
-const char *bdrv_get_parent_name(const BlockDriverState *bs);
+const char * GRAPH_RDLOCK bdrv_get_parent_name(const BlockDriverState *bs);
 bool blk_dev_has_tray(BlockBackend *blk);
 bool blk_dev_is_tray_open(BlockBackend *blk);
 
diff --git a/include/block/qapi.h b/include/block/qapi.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/qapi.h
+++ b/include/block/qapi.h
@@ -XXX,XX +XXX,XX @@ BlockDeviceInfo * GRAPH_RDLOCK
 bdrv_block_device_info(BlockBackend *blk, BlockDriverState *bs,
                        bool flat, Error **errp);
 
-int bdrv_query_snapshot_info_list(BlockDriverState *bs,
-                                  SnapshotInfoList **p_list,
-                                  Error **errp);
+int GRAPH_RDLOCK
+bdrv_query_snapshot_info_list(BlockDriverState *bs,
+                              SnapshotInfoList **p_list,
+                              Error **errp);
 void GRAPH_RDLOCK
 bdrv_query_image_info(BlockDriverState *bs, ImageInfo **p_info, bool flat,
                       bool skip_implicit_filters, Error **errp);
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ bool bdrv_is_read_only(BlockDriverState *bs)
     return !(bs->open_flags & BDRV_O_RDWR);
 }
 
-static int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,
-                                  bool ignore_allow_rdw, Error **errp)
+static int GRAPH_RDLOCK
+bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,
+                       bool ignore_allow_rdw, Error **errp)
 {
     IO_CODE();
 
@@ -XXX,XX +XXX,XX @@ int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
     int ret = 0;
     IO_CODE();
 
+    assume_graph_lock(); /* FIXME */
+
     if (!(bs->open_flags & BDRV_O_RDWR)) {
         return 0;
     }
@@ -XXX,XX +XXX,XX @@ bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
      * to r/w. Attempting to set to r/w may fail if either BDRV_O_ALLOW_RDWR is
      * not set, or if the BDS still has copy_on_read enabled */
     read_only = !(reopen_state->flags & BDRV_O_RDWR);
+
+    bdrv_graph_rdlock_main_loop();
     ret = bdrv_can_set_read_only(reopen_state->bs, read_only, true, &local_err);
+    bdrv_graph_rdunlock_main_loop();
     if (local_err) {
         error_propagate(errp, local_err);
         goto error;
@@ -XXX,XX +XXX,XX @@ bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
     } else {
         /* It is currently mandatory to have a bdrv_reopen_prepare()
          * handler for each supported drv. */
+        bdrv_graph_rdlock_main_loop();
         error_setg(errp, "Block format '%s' used by node '%s' "
                    "does not support reopening files", drv->format_name,
                    bdrv_get_device_or_node_name(reopen_state->bs));
+        bdrv_graph_rdunlock_main_loop();
         ret = -1;
         goto error;
     }
@@ -XXX,XX +XXX,XX @@ bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp)
 {
     BdrvOpBlocker *blocker;
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     assert((int) op >= 0 && op < BLOCK_OP_TYPE_MAX);
     if (!QLIST_EMPTY(&bs->op_blockers[op])) {
         blocker = QLIST_FIRST(&bs->op_blockers[op]);
diff --git a/block/backup.c b/block/backup.c
index XXXXXXX..XXXXXXX 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -XXX,XX +XXX,XX @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     assert(bs);
     assert(target);
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     /* QMP interface protects us from these cases */
     assert(sync_mode != MIRROR_SYNC_MODE_INCREMENTAL);
diff --git a/block/parallels.c b/block/parallels.c
index XXXXXXX..XXXXXXX 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -XXX,XX +XXX,XX @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
         bitmap_new(DIV_ROUND_UP(s->header_size, s->bat_dirty_block));
 
     /* Disable migration until bdrv_activate method is added */
+    bdrv_graph_rdlock_main_loop();
     error_setg(&s->migration_blocker, "The Parallels format used by node '%s' "
                "does not support live migration",
                bdrv_get_device_or_node_name(bs));
+    bdrv_graph_rdunlock_main_loop();
+
     ret = migrate_add_blocker(s->migration_blocker, errp);
     if (ret < 0) {
         error_setg(errp, "Migration blocker error");
diff --git a/block/qcow.c b/block/qcow.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -XXX,XX +XXX,XX @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     /* Disable migration when qcow images are used */
+    bdrv_graph_rdlock_main_loop();
     error_setg(&s->migration_blocker, "The qcow format used by node '%s' "
                "does not support live migration",
                bdrv_get_device_or_node_name(bs));
+    bdrv_graph_rdunlock_main_loop();
+
     ret = migrate_add_blocker(s->migration_blocker, errp);
     if (ret < 0) {
         error_free(s->migration_blocker);
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -XXX,XX +XXX,XX @@ static int check_constraints_on_bitmap(BlockDriverState *bs,
     int64_t len = bdrv_getlength(bs);
     int64_t bitmap_bytes;
 
+    assume_graph_lock(); /* FIXME */
+
     assert(granularity > 0);
     assert((granularity & (granularity - 1)) == 0);
 
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static int qcow2_inactivate(BlockDriverState *bs)
     int ret, result = 0;
     Error *local_err = NULL;
 
+    assume_graph_lock(); /* FIXME */
+
     qcow2_store_persistent_dirty_bitmaps(bs, true, &local_err);
     if (local_err != NULL) {
         result = -EINVAL;
@@ -XXX,XX +XXX,XX @@ void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
     char *message;
     va_list ap;
 
+    assume_graph_lock(); /* FIXME */
+
     fatal = fatal && bdrv_is_writable(bs);
 
     if (s->signaled_corruption &&
diff --git a/block/quorum.c b/block/quorum.c
index XXXXXXX..XXXXXXX 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -XXX,XX +XXX,XX @@ static void quorum_report_bad(QuorumOpType type, uint64_t offset,
                                       end_sector - start_sector);
 }
 
-static void quorum_report_failure(QuorumAIOCB *acb)
+static void GRAPH_RDLOCK quorum_report_failure(QuorumAIOCB *acb)
 {
     const char *reference = bdrv_get_device_or_node_name(acb->bs);
     int64_t start_sector = acb->offset / BDRV_SECTOR_SIZE;
@@ -XXX,XX +XXX,XX @@ static void quorum_report_failure(QuorumAIOCB *acb)
 
 static int quorum_vote_error(QuorumAIOCB *acb);
 
-static bool quorum_has_too_much_io_failed(QuorumAIOCB *acb)
+static bool GRAPH_RDLOCK quorum_has_too_much_io_failed(QuorumAIOCB *acb)
 {
     BDRVQuorumState *s = acb->bs->opaque;
 
diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_reopen_prepare(BDRVReopenState *state,
     BDRVRBDState *s = state->bs->opaque;
     int ret = 0;
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     if (s->snap && state->flags & BDRV_O_RDWR) {
         error_setg(errp,
                    "Cannot change node '%s' to r/w when using RBD snapshot",
diff --git a/block/snapshot.c b/block/snapshot.c
index XXXXXXX..XXXXXXX 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_load_tmp(BlockDriverState *bs,
     BlockDriver *drv = bs->drv;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (!drv) {
         error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs));
@@ -XXX,XX +XXX,XX @@ int bdrv_all_goto_snapshot(const char *name,
         }
         aio_context_release(ctx);
         if (ret < 0) {
+            bdrv_graph_rdlock_main_loop();
             error_prepend(errp, "Could not load snapshot '%s' on '%s': ",
                           name, bdrv_get_device_or_node_name(bs));
+            bdrv_graph_rdunlock_main_loop();
             return -1;
         }
 
diff --git a/block/vdi.c b/block/vdi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -XXX,XX +XXX,XX @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     /* Disable migration when vdi images are used */
+    bdrv_graph_rdlock_main_loop();
     error_setg(&s->migration_blocker, "The vdi format used by node '%s' "
                "does not support live migration",
                bdrv_get_device_or_node_name(bs));
+    bdrv_graph_rdunlock_main_loop();
+
     ret = migrate_add_blocker(s->migration_blocker, errp);
     if (ret < 0) {
         error_free(s->migration_blocker);
diff --git a/block/vpc.c b/block/vpc.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -XXX,XX +XXX,XX @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     /* Disable migration when VHD images are used */
+    bdrv_graph_rdlock_main_loop();
     error_setg(&s->migration_blocker, "The vpc format used by node '%s' "
                "does not support live migration",
                bdrv_get_device_or_node_name(bs));
+    bdrv_graph_rdunlock_main_loop();
+
     ret = migrate_add_blocker(s->migration_blocker, errp);
     if (ret < 0) {
         error_free(s->migration_blocker);
diff --git a/block/vvfat.c b/block/vvfat.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
     QemuOpts *opts;
     int ret;
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
 #ifdef DEBUG
     vvv = s;
 #endif
diff --git a/blockjob.c b/blockjob.c
index XXXXXXX..XXXXXXX 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -XXX,XX +XXX,XX @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
     BlockJob *job;
     int ret;
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (job_id == NULL && !(flags & JOB_INTERNAL)) {
         job_id = bdrv_get_device_name(bs);
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_amend_options() need to hold a reader lock for the graph. This
removes an assume_graph_lock() call in crypto's implementation.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-14-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block-global-state.h |  8 ++++----
 include/block/block_int-common.h   | 10 ++++------
 block/crypto.c                     |  4 +---
 qemu-img.c                         |  7 +++++++
 4 files changed, 16 insertions(+), 13 deletions(-)

This adds GRAPH_RDLOCK annotations to declare that callers of
qcow2_signal_corruption() need to hold a reader lock for the graph
because it calls bdrv_get_node_name(), which accesses the parents list
of a node.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-15-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.h                      | 180 +++++++++++++++++------------
 include/block/block-global-state.h |   2 +-
 include/block/block_int-common.h   |   2 +-
 block.c                            |   3 +-
 block/block-backend.c              |   2 +
 block/qcow2-bitmap.c               |  31 ++---
 block/qcow2-cache.c                |  11 +-
 block/qcow2-cluster.c              |  62 +++++-----
 block/qcow2-refcount.c             |  80 ++++++-------
 block/qcow2.c                      |  61 +++++-----
 block/replication.c                |   8 +-
 11 files changed, 250 insertions(+), 192 deletions(-)

diff --git a/block/qcow2.h b/block/qcow2.h
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -XXX,XX +XXX,XX @@ int qcow2_mark_dirty(BlockDriverState *bs);
 int qcow2_mark_corrupt(BlockDriverState *bs);
 int qcow2_update_header(BlockDriverState *bs);
 
-void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
-                             int64_t size, const char *message_format, ...)
-                             G_GNUC_PRINTF(5, 6);
+void GRAPH_RDLOCK
+qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
+                        int64_t size, const char *message_format, ...)
+                        G_GNUC_PRINTF(5, 6);
 
 int qcow2_validate_table(BlockDriverState *bs, uint64_t offset,
                          uint64_t entries, size_t entry_len,
@@ -XXX,XX +XXX,XX @@ int qcow2_validate_table(BlockDriverState *bs, uint64_t offset,
 int coroutine_fn GRAPH_RDLOCK qcow2_refcount_init(BlockDriverState *bs);
 void qcow2_refcount_close(BlockDriverState *bs);
 
-int qcow2_get_refcount(BlockDriverState *bs, int64_t cluster_index,
-                       uint64_t *refcount);
+int GRAPH_RDLOCK qcow2_get_refcount(BlockDriverState *bs, int64_t cluster_index,
+                                    uint64_t *refcount);
 
-int qcow2_update_cluster_refcount(BlockDriverState *bs, int64_t cluster_index,
-                                  uint64_t addend, bool decrease,
-                                  enum qcow2_discard_type type);
+int GRAPH_RDLOCK
+qcow2_update_cluster_refcount(BlockDriverState *bs, int64_t cluster_index,
+                              uint64_t addend, bool decrease,
+                              enum qcow2_discard_type type);
 
-int64_t qcow2_refcount_area(BlockDriverState *bs, uint64_t offset,
-                            uint64_t additional_clusters, bool exact_size,
-                            int new_refblock_index,
-                            uint64_t new_refblock_offset);
+int64_t GRAPH_RDLOCK
+qcow2_refcount_area(BlockDriverState *bs, uint64_t offset,
+                    uint64_t additional_clusters, bool exact_size,
+                    int new_refblock_index,
+                    uint64_t new_refblock_offset);
 
-int64_t qcow2_alloc_clusters(BlockDriverState *bs, uint64_t size);
-int64_t coroutine_fn qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset,
-                                             int64_t nb_clusters);
-int64_t coroutine_fn GRAPH_RDLOCK qcow2_alloc_bytes(BlockDriverState *bs, int size);
-void qcow2_free_clusters(BlockDriverState *bs,
-                          int64_t offset, int64_t size,
-                          enum qcow2_discard_type type);
-void qcow2_free_any_cluster(BlockDriverState *bs, uint64_t l2_entry,
-                            enum qcow2_discard_type type);
+int64_t GRAPH_RDLOCK
+qcow2_alloc_clusters(BlockDriverState *bs, uint64_t size);
 
-int qcow2_update_snapshot_refcount(BlockDriverState *bs,
-    int64_t l1_table_offset, int l1_size, int addend);
+int64_t GRAPH_RDLOCK coroutine_fn
+qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset,
+                        int64_t nb_clusters);
 
-int qcow2_flush_caches(BlockDriverState *bs);
-int qcow2_write_caches(BlockDriverState *bs);
+int64_t coroutine_fn GRAPH_RDLOCK qcow2_alloc_bytes(BlockDriverState *bs, int size);
+void GRAPH_RDLOCK qcow2_free_clusters(BlockDriverState *bs,
+                                      int64_t offset, int64_t size,
+                                      enum qcow2_discard_type type);
+void GRAPH_RDLOCK
+qcow2_free_any_cluster(BlockDriverState *bs, uint64_t l2_entry,
+                       enum qcow2_discard_type type);
+
+int GRAPH_RDLOCK
+qcow2_update_snapshot_refcount(BlockDriverState *bs, int64_t l1_table_offset,
+                               int l1_size, int addend);
+
+int GRAPH_RDLOCK qcow2_flush_caches(BlockDriverState *bs);
+int GRAPH_RDLOCK qcow2_write_caches(BlockDriverState *bs);
 int coroutine_fn qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
                                        BdrvCheckMode fix);
 
@@ -XXX,XX +XXX,XX @@ void qcow2_process_discards(BlockDriverState *bs, int ret);
 
 int qcow2_check_metadata_overlap(BlockDriverState *bs, int ign, int64_t offset,
                                  int64_t size);
-int qcow2_pre_write_overlap_check(BlockDriverState *bs, int ign, int64_t offset,
-                                  int64_t size, bool data_file);
+int GRAPH_RDLOCK
+qcow2_pre_write_overlap_check(BlockDriverState *bs, int ign, int64_t offset,
+                              int64_t size, bool data_file);
+
 int coroutine_fn qcow2_inc_refcounts_imrt(BlockDriverState *bs, BdrvCheckResult *res,
                                           void **refcount_table,
                                           int64_t *refcount_table_size,
                                           int64_t offset, int64_t size);
 
-int qcow2_change_refcount_order(BlockDriverState *bs, int refcount_order,
-                                BlockDriverAmendStatusCB *status_cb,
-                                void *cb_opaque, Error **errp);
+int GRAPH_RDLOCK
+qcow2_change_refcount_order(BlockDriverState *bs, int refcount_order,
+                            BlockDriverAmendStatusCB *status_cb,
+                            void *cb_opaque, Error **errp);
 int coroutine_fn GRAPH_RDLOCK qcow2_shrink_reftable(BlockDriverState *bs);
-int64_t coroutine_fn qcow2_get_last_cluster(BlockDriverState *bs, int64_t size);
+
+int64_t coroutine_fn GRAPH_RDLOCK
+qcow2_get_last_cluster(BlockDriverState *bs, int64_t size);
 
 int coroutine_fn GRAPH_RDLOCK
 qcow2_detect_metadata_preallocation(BlockDriverState *bs);
 
 /* qcow2-cluster.c functions */
-int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
-                        bool exact_size);
+int GRAPH_RDLOCK
+qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, bool exact_size);
 
 int coroutine_fn GRAPH_RDLOCK
 qcow2_shrink_l1_table(BlockDriverState *bs, uint64_t max_size);
 
-int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index);
+int GRAPH_RDLOCK qcow2_write_l1_entry(BlockDriverState *bs, int l1_index);
 int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num,
                           uint8_t *buf, int nb_sectors, bool enc, Error **errp);
 
-int qcow2_get_host_offset(BlockDriverState *bs, uint64_t offset,
-                          unsigned int *bytes, uint64_t *host_offset,
-                          QCow2SubclusterType *subcluster_type);
-int coroutine_fn qcow2_alloc_host_offset(BlockDriverState *bs, uint64_t offset,
-                                         unsigned int *bytes,
-                                         uint64_t *host_offset, QCowL2Meta **m);
+int GRAPH_RDLOCK
+qcow2_get_host_offset(BlockDriverState *bs, uint64_t offset,
+                      unsigned int *bytes, uint64_t *host_offset,
+                      QCow2SubclusterType *subcluster_type);
+
+int coroutine_fn GRAPH_RDLOCK
+qcow2_alloc_host_offset(BlockDriverState *bs, uint64_t offset,
+                        unsigned int *bytes, uint64_t *host_offset,
+                        QCowL2Meta **m);
+
 int coroutine_fn GRAPH_RDLOCK
 qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs, uint64_t offset,
                                       int compressed_size, uint64_t *host_offset);
@@ -XXX,XX +XXX,XX @@ void qcow2_parse_compressed_l2_entry(BlockDriverState *bs, uint64_t l2_entry,
 int coroutine_fn GRAPH_RDLOCK
 qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m);
 
-void coroutine_fn qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m);
-int qcow2_cluster_discard(BlockDriverState *bs, uint64_t offset,
-                          uint64_t bytes, enum qcow2_discard_type type,
-                          bool full_discard);
+void coroutine_fn GRAPH_RDLOCK
+qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m);
+
+int GRAPH_RDLOCK
+qcow2_cluster_discard(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
+                      enum qcow2_discard_type type, bool full_discard);
 
 int coroutine_fn GRAPH_RDLOCK
 qcow2_subcluster_zeroize(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
                          int flags);
 
-int qcow2_expand_zero_clusters(BlockDriverState *bs,
-                               BlockDriverAmendStatusCB *status_cb,
-                               void *cb_opaque);
+int GRAPH_RDLOCK
+qcow2_expand_zero_clusters(BlockDriverState *bs,
+                           BlockDriverAmendStatusCB *status_cb,
+                           void *cb_opaque);
 
 /* qcow2-snapshot.c functions */
-int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
-int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id);
-int qcow2_snapshot_delete(BlockDriverState *bs,
-                          const char *snapshot_id,
-                          const char *name,
-                          Error **errp);
+int GRAPH_RDLOCK
+qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
+
+int GRAPH_RDLOCK
+qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id);
+
+int GRAPH_RDLOCK
+qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id,
+                          const char *name, Error **errp);
+
 int qcow2_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab);
 int qcow2_snapshot_load_tmp(BlockDriverState *bs,
                             const char *snapshot_id,
@@ -XXX,XX +XXX,XX @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs,
 void qcow2_free_snapshots(BlockDriverState *bs);
 int coroutine_fn GRAPH_RDLOCK
 qcow2_read_snapshots(BlockDriverState *bs, Error **errp);
-int qcow2_write_snapshots(BlockDriverState *bs);
+int GRAPH_RDLOCK qcow2_write_snapshots(BlockDriverState *bs);
 
 int coroutine_fn GRAPH_RDLOCK
 qcow2_check_read_snapshot_table(BlockDriverState *bs, BdrvCheckResult *result,
                                 BdrvCheckMode fix);
 
-int coroutine_fn qcow2_check_fix_snapshot_table(BlockDriverState *bs,
-                                                BdrvCheckResult *result,
-                                                BdrvCheckMode fix);
+int coroutine_fn GRAPH_RDLOCK
+qcow2_check_fix_snapshot_table(BlockDriverState *bs, BdrvCheckResult *result,
+                               BdrvCheckMode fix);
 
 /* qcow2-cache.c functions */
 Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables,
@@ -XXX,XX +XXX,XX @@ Qcow2Cache *qcow2_cache_create(BlockDriverState *bs, int num_tables,
 int qcow2_cache_destroy(Qcow2Cache *c);
 
 void qcow2_cache_entry_mark_dirty(Qcow2Cache *c, void *table);
-int qcow2_cache_flush(BlockDriverState *bs, Qcow2Cache *c);
-int qcow2_cache_write(BlockDriverState *bs, Qcow2Cache *c);
-int qcow2_cache_set_dependency(BlockDriverState *bs, Qcow2Cache *c,
-    Qcow2Cache *dependency);
+int GRAPH_RDLOCK qcow2_cache_flush(BlockDriverState *bs, Qcow2Cache *c);
+int GRAPH_RDLOCK qcow2_cache_write(BlockDriverState *bs, Qcow2Cache *c);
+int GRAPH_RDLOCK qcow2_cache_set_dependency(BlockDriverState *bs, Qcow2Cache *c,
+                                            Qcow2Cache *dependency);
 void qcow2_cache_depends_on_flush(Qcow2Cache *c);
 
 void qcow2_cache_clean_unused(Qcow2Cache *c);
-int qcow2_cache_empty(BlockDriverState *bs, Qcow2Cache *c);
+int GRAPH_RDLOCK qcow2_cache_empty(BlockDriverState *bs, Qcow2Cache *c);
+
+int GRAPH_RDLOCK
+qcow2_cache_get(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
+                void **table);
+
+int GRAPH_RDLOCK
+qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
+                      void **table);
 
-int qcow2_cache_get(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
-    void **table);
-int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
-    void **table);
 void qcow2_cache_put(Qcow2Cache *c, void **table);
 void *qcow2_cache_is_table_offset(Qcow2Cache *c, uint64_t offset);
 void qcow2_cache_discard(Qcow2Cache *c, void *table);
@@ -XXX,XX +XXX,XX @@ bool coroutine_fn GRAPH_RDLOCK
 qcow2_load_dirty_bitmaps(BlockDriverState *bs, bool *header_updated, Error **errp);
 bool qcow2_get_bitmap_info_list(BlockDriverState *bs,
                                 Qcow2BitmapInfoList **info_list, Error **errp);
-int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp);
+int GRAPH_RDLOCK qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp);
+int GRAPH_RDLOCK qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp);
 int coroutine_fn qcow2_truncate_bitmaps_check(BlockDriverState *bs, Error **errp);
-bool qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
-                                          bool release_stored, Error **errp);
-int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp);
+
+bool GRAPH_RDLOCK
+qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, bool release_stored,
+                                     Error **errp);
+
 bool coroutine_fn GRAPH_RDLOCK
 qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *name,
                                     uint32_t granularity, Error **errp);
-int coroutine_fn qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs,
-                                                         const char *name,
-                                                         Error **errp);
+
+int coroutine_fn GRAPH_RDLOCK
+qcow2_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *name,
+                                        Error **errp);
+
 bool qcow2_supports_persistent_dirty_bitmap(BlockDriverState *bs);
 uint64_t qcow2_get_persistent_dirty_bitmap_size(BlockDriverState *bs,
                                                 uint32_t cluster_size);
diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -XXX,XX +XXX,XX @@ void GRAPH_RDLOCK
 bdrv_refresh_limits(BlockDriverState *bs, Transaction *tran, Error **errp);
 
 int bdrv_commit(BlockDriverState *bs);
-int bdrv_make_empty(BdrvChild *c, Error **errp);
+int GRAPH_RDLOCK bdrv_make_empty(BdrvChild *c, Error **errp);
 int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file,
                              const char *backing_fmt, bool warn);
 void bdrv_register(BlockDriver *bdrv);
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
         BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
         bool force, Error **errp);
 
-    int (*bdrv_make_empty)(BlockDriverState *bs);
+    int GRAPH_RDLOCK_PTR (*bdrv_make_empty)(BlockDriverState *bs);
 
     /*
      * Refreshes the bs->exact_filename field. If that is impossible,
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp)
 {
     BdrvOpBlocker *blocker;
     GLOBAL_STATE_CODE();
-    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
+    assume_graph_lock(); /* FIXME */
 
     assert((int) op >= 0 && op < BLOCK_OP_TYPE_MAX);
     if (!QLIST_EMPTY(&bs->op_blockers[op])) {
diff --git a/block/block-backend.c b/block/block-backend.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -XXX,XX +XXX,XX @@ const BdrvChild *blk_root(BlockBackend *blk)
 int blk_make_empty(BlockBackend *blk, Error **errp)
 {
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     if (!blk_is_available(blk)) {
         error_setg(errp, "No medium inserted");
         return -ENOMEDIUM;
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -XXX,XX +XXX,XX @@ static int check_constraints_on_bitmap(BlockDriverState *bs,
     return 0;
 }
 
-static void clear_bitmap_table(BlockDriverState *bs, uint64_t *bitmap_table,
-                               uint32_t bitmap_table_size)
+static void GRAPH_RDLOCK
+clear_bitmap_table(BlockDriverState *bs, uint64_t *bitmap_table,
+                   uint32_t bitmap_table_size)
 {
     BDRVQcow2State *s = bs->opaque;
     int i;
@@ -XXX,XX +XXX,XX @@ fail:
     return ret;
 }
 
-static int free_bitmap_clusters(BlockDriverState *bs, Qcow2BitmapTable *tb)
+static int GRAPH_RDLOCK
+free_bitmap_clusters(BlockDriverState *bs, Qcow2BitmapTable *tb)
 {
     int ret;
     uint64_t *bitmap_table;
@@ -XXX,XX +XXX,XX @@ out:
  * Store bitmap list to qcow2 image as a bitmap directory.
  * Everything is checked.
  */
-static int bitmap_list_store(BlockDriverState *bs, Qcow2BitmapList *bm_list,
-                             uint64_t *offset, uint64_t *size, bool in_place)
+static int GRAPH_RDLOCK
+bitmap_list_store(BlockDriverState *bs, Qcow2BitmapList *bm_list,
+                  uint64_t *offset, uint64_t *size, bool in_place)
 {
     int ret;
     uint8_t *dir;
@@ -XXX,XX +XXX,XX @@ fail:
  * Bitmap List end
  */
 
-static int update_ext_header_and_dir_in_place(BlockDriverState *bs,
-                                              Qcow2BitmapList *bm_list)
+static int GRAPH_RDLOCK
+update_ext_header_and_dir_in_place(BlockDriverState *bs,
+                                   Qcow2BitmapList *bm_list)
 {
     BDRVQcow2State *s = bs->opaque;
     int ret;
@@ -XXX,XX +XXX,XX @@ static int update_ext_header_and_dir_in_place(BlockDriverState *bs,
      */
 }
 
-static int update_ext_header_and_dir(BlockDriverState *bs,
-                                     Qcow2BitmapList *bm_list)
+static int GRAPH_RDLOCK
+update_ext_header_and_dir(BlockDriverState *bs, Qcow2BitmapList *bm_list)
 {
     BDRVQcow2State *s = bs->opaque;
     int ret;
@@ -XXX,XX +XXX,XX @@ out:
 /* store_bitmap_data()
  * Store bitmap to image, filling bitmap table accordingly.
  */
-static uint64_t *store_bitmap_data(BlockDriverState *bs,
-                                   BdrvDirtyBitmap *bitmap,
-                                   uint32_t *bitmap_table_size, Error **errp)
+static uint64_t * GRAPH_RDLOCK
+store_bitmap_data(BlockDriverState *bs, BdrvDirtyBitmap *bitmap,
+                  uint32_t *bitmap_table_size, Error **errp)
 {
     int ret;
     BDRVQcow2State *s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ fail:
  * Store bm->dirty_bitmap to qcow2.
  * Set bm->table_offset and bm->table_size accordingly.
  */
-static int store_bitmap(BlockDriverState *bs, Qcow2Bitmap *bm, Error **errp)
+static int GRAPH_RDLOCK
+store_bitmap(BlockDriverState *bs, Qcow2Bitmap *bm, Error **errp)
 {
     int ret;
     uint64_t *tb;
diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-cache.c
+++ b/block/qcow2-cache.c
@@ -XXX,XX +XXX,XX @@ int qcow2_cache_destroy(Qcow2Cache *c)
     return 0;
 }
 
-static int qcow2_cache_flush_dependency(BlockDriverState *bs, Qcow2Cache *c)
+static int GRAPH_RDLOCK
+qcow2_cache_flush_dependency(BlockDriverState *bs, Qcow2Cache *c)
 {
     int ret;
 
@@ -XXX,XX +XXX,XX @@ static int qcow2_cache_flush_dependency(BlockDriverState *bs, Qcow2Cache *c)
     return 0;
 }
 
-static int qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i)
+static int GRAPH_RDLOCK
+qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i)
 {
     BDRVQcow2State *s = bs->opaque;
     int ret = 0;
@@ -XXX,XX +XXX,XX @@ int qcow2_cache_empty(BlockDriverState *bs, Qcow2Cache *c)
     return 0;
 }
 
-static int qcow2_cache_do_get(BlockDriverState *bs, Qcow2Cache *c,
-    uint64_t offset, void **table, bool read_from_disk)
+static int GRAPH_RDLOCK
+qcow2_cache_do_get(BlockDriverState *bs, Qcow2Cache *c, uint64_t offset,
+                   void **table, bool read_from_disk)
 {
     BDRVQcow2State *s = bs->opaque;
     int i;
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -XXX,XX +XXX,XX @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
  * the cache is used; otherwise the L2 slice is loaded from the image
  * file.
  */
-static int l2_load(BlockDriverState *bs, uint64_t offset,
-                   uint64_t l2_offset, uint64_t **l2_slice)
+static int GRAPH_RDLOCK
+l2_load(BlockDriverState *bs, uint64_t offset,
+        uint64_t l2_offset, uint64_t **l2_slice)
 {
     BDRVQcow2State *s = bs->opaque;
     int start_of_slice = l2_entry_size(s) *
@@ -XXX,XX +XXX,XX @@ int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index)
  *
  */
 
-static int l2_allocate(BlockDriverState *bs, int l1_index)
+static int GRAPH_RDLOCK l2_allocate(BlockDriverState *bs, int l1_index)
 {
     BDRVQcow2State *s = bs->opaque;
     uint64_t old_l2_offset;
@@ -XXX,XX +XXX,XX @@ fail:
  *
  * Returns 0 on success, -errno in failure case
  */
-static int get_cluster_table(BlockDriverState *bs, uint64_t offset,
-                             uint64_t **new_l2_slice,
-                             int *new_l2_index)
+static int GRAPH_RDLOCK
+get_cluster_table(BlockDriverState *bs, uint64_t offset,
+                  uint64_t **new_l2_slice, int *new_l2_index)
 {
     BDRVQcow2State *s = bs->opaque;
     unsigned int l2_index;
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m)
  *
  * Returns 0 on success, -errno on failure.
  */
-static int coroutine_fn calculate_l2_meta(BlockDriverState *bs,
-                                          uint64_t host_cluster_offset,
-                                          uint64_t guest_offset, unsigned bytes,
-                                          uint64_t *l2_slice, QCowL2Meta **m,
-                                          bool keep_old)
+static int coroutine_fn GRAPH_RDLOCK
+calculate_l2_meta(BlockDriverState *bs, uint64_t host_cluster_offset,
+                  uint64_t guest_offset, unsigned bytes, uint64_t *l2_slice,
+                  QCowL2Meta **m, bool keep_old)
 {
     BDRVQcow2State *s = bs->opaque;
     int sc_index, l2_index = offset_to_l2_slice_index(s, guest_offset);
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn handle_dependencies(BlockDriverState *bs,
  *
  *  -errno: in error cases
  */
-static int coroutine_fn handle_copied(BlockDriverState *bs,
-    uint64_t guest_offset, uint64_t *host_offset, uint64_t *bytes,
-    QCowL2Meta **m)
+static int coroutine_fn GRAPH_RDLOCK
+handle_copied(BlockDriverState *bs, uint64_t guest_offset,
+              uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
 {
     BDRVQcow2State *s = bs->opaque;
     int l2_index;
@@ -XXX,XX +XXX,XX @@ out:
  * function has been waiting for another request and the allocation must be
  * restarted, but the whole request should not be failed.
  */
-static int coroutine_fn do_alloc_cluster_offset(BlockDriverState *bs,
-                                                uint64_t guest_offset,
-                                                uint64_t *host_offset,
-                                                uint64_t *nb_clusters)
+static int coroutine_fn GRAPH_RDLOCK
+do_alloc_cluster_offset(BlockDriverState *bs, uint64_t guest_offset,
+                        uint64_t *host_offset, uint64_t *nb_clusters)
 {
     BDRVQcow2State *s = bs->opaque;
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn do_alloc_cluster_offset(BlockDriverState *bs,
  *
  *  -errno: in error cases
  */
-static int coroutine_fn handle_alloc(BlockDriverState *bs,
-    uint64_t guest_offset, uint64_t *host_offset, uint64_t *bytes,
-    QCowL2Meta **m)
+static int coroutine_fn GRAPH_RDLOCK
+handle_alloc(BlockDriverState *bs, uint64_t guest_offset,
+             uint64_t *host_offset, uint64_t *bytes, QCowL2Meta **m)
 {
     BDRVQcow2State *s = bs->opaque;
     int l2_index;
@@ -XXX,XX +XXX,XX @@ again:
  * all clusters in the same L2 slice) and returns the number of discarded
  * clusters.
  */
-static int discard_in_l2_slice(BlockDriverState *bs, uint64_t offset,
-                               uint64_t nb_clusters,
-                               enum qcow2_discard_type type, bool full_discard)
+static int GRAPH_RDLOCK
+discard_in_l2_slice(BlockDriverState *bs, uint64_t offset, uint64_t nb_clusters,
+                    enum qcow2_discard_type type, bool full_discard)
 {
     BDRVQcow2State *s = bs->opaque;
     uint64_t *l2_slice;
@@ -XXX,XX +XXX,XX @@ fail:
  * all clusters in the same L2 slice) and returns the number of zeroed
  * clusters.
  */
-static int coroutine_fn
+static int coroutine_fn GRAPH_RDLOCK
 zero_in_l2_slice(BlockDriverState *bs, uint64_t offset,
                  uint64_t nb_clusters, int flags)
 {
@@ -XXX,XX +XXX,XX @@ zero_in_l2_slice(BlockDriverState *bs, uint64_t offset,
     return nb_clusters;
 }
 
-static int coroutine_fn
+static int coroutine_fn GRAPH_RDLOCK
 zero_l2_subclusters(BlockDriverState *bs, uint64_t offset,
                     unsigned nb_subclusters)
 {
@@ -XXX,XX +XXX,XX @@ fail:
  * status_cb(). l1_entries contains the total number of L1 entries and
  * *visited_l1_entries counts all visited L1 entries.
  */
-static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table,
-                                      int l1_size, int64_t *visited_l1_entries,
-                                      int64_t l1_entries,
-                                      BlockDriverAmendStatusCB *status_cb,
-                                      void *cb_opaque)
+static int GRAPH_RDLOCK
+expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table,
+                           int l1_size, int64_t *visited_l1_entries,
+                           int64_t l1_entries,
+                           BlockDriverAmendStatusCB *status_cb,
+                           void *cb_opaque)
 {
     BDRVQcow2State *s = bs->opaque;
     bool is_active_l1 = (l1_table == s->l1_table);
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -XXX,XX +XXX,XX @@ static void set_refcount_ro6(void *refcount_array, uint64_t index,
 }
 
 
-static int load_refcount_block(BlockDriverState *bs,
-                               int64_t refcount_block_offset,
-                               void **refcount_block)
+static int GRAPH_RDLOCK
+load_refcount_block(BlockDriverState *bs, int64_t refcount_block_offset,
+                    void **refcount_block)
 {
     BDRVQcow2State *s = bs->opaque;
 
@@ -XXX,XX +XXX,XX @@ static int in_same_refcount_block(BDRVQcow2State *s, uint64_t offset_a,
  *
  * Returns 0 on success or -errno in error case
  */
-static int alloc_refcount_block(BlockDriverState *bs,
-                                int64_t cluster_index, void **refcount_block)
+static int GRAPH_RDLOCK
+alloc_refcount_block(BlockDriverState *bs, int64_t cluster_index,
+                     void **refcount_block)
 {
     BDRVQcow2State *s = bs->opaque;
     unsigned int refcount_table_index;
@@ -XXX,XX +XXX,XX @@ found:
 /* XXX: cache several refcount block clusters ? */
 /* @addend is the absolute value of the addend; if @decrease is set, @addend
  * will be subtracted from the current refcount, otherwise it will be added */
-static int update_refcount(BlockDriverState *bs,
-                           int64_t offset,
-                           int64_t length,
-                           uint64_t addend,
-                           bool decrease,
-                           enum qcow2_discard_type type)
+static int GRAPH_RDLOCK
+update_refcount(BlockDriverState *bs, int64_t offset, int64_t length,
+                uint64_t addend, bool decrease, enum qcow2_discard_type type)
 {
     BDRVQcow2State *s = bs->opaque;
     int64_t start, last, cluster_offset;
@@ -XXX,XX +XXX,XX @@ int qcow2_update_cluster_refcount(BlockDriverState *bs,
 
 
 /* return < 0 if error */
-static int64_t alloc_clusters_noref(BlockDriverState *bs, uint64_t size,
-                                    uint64_t max)
+static int64_t GRAPH_RDLOCK
+alloc_clusters_noref(BlockDriverState *bs, uint64_t size, uint64_t max)
 {
     BDRVQcow2State *s = bs->opaque;
     uint64_t i, nb_clusters, refcount;
@@ -XXX,XX +XXX,XX @@ calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
  * Compares the actual reference count for each cluster in the image against the
  * refcount as reported by the refcount structures on-disk.
  */
-static void coroutine_fn
+static void coroutine_fn GRAPH_RDLOCK
 compare_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
                   BdrvCheckMode fix, bool *rebuild,
                   int64_t *highest_cluster,
@@ -XXX,XX +XXX,XX @@ int qcow2_pre_write_overlap_check(BlockDriverState *bs, int ign, int64_t offset,
  *
  * @allocated should be set to true if a new cluster has been allocated.
  */
-typedef int (RefblockFinishOp)(BlockDriverState *bs, uint64_t **reftable,
-                               uint64_t reftable_index, uint64_t *reftable_size,
-                               void *refblock, bool refblock_empty,
-                               bool *allocated, Error **errp);
+typedef int /* GRAPH_RDLOCK_PTR */
+    (RefblockFinishOp)(BlockDriverState *bs, uint64_t **reftable,
+                       uint64_t reftable_index, uint64_t *reftable_size,
+                       void *refblock, bool refblock_empty,
+                       bool *allocated, Error **errp);
 
 /**
  * This "operation" for walk_over_reftable() allocates the refblock on disk (if
  * it is not empty) and inserts its offset into the new reftable. The size of
  * this new reftable is increased as required.
  */
-static int alloc_refblock(BlockDriverState *bs, uint64_t **reftable,
-                          uint64_t reftable_index, uint64_t *reftable_size,
-                          void *refblock, bool refblock_empty, bool *allocated,
-                          Error **errp)
+static int GRAPH_RDLOCK
+alloc_refblock(BlockDriverState *bs, uint64_t **reftable,
+               uint64_t reftable_index, uint64_t *reftable_size,
+               void *refblock, bool refblock_empty, bool *allocated,
+               Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     int64_t offset;
@@ -XXX,XX +XXX,XX @@ static int alloc_refblock(BlockDriverState *bs, uint64_t **reftable,
  * offset specified by the new reftable's entry. It does not modify the new
  * reftable or change any refcounts.
  */
-static int flush_refblock(BlockDriverState *bs, uint64_t **reftable,
-                          uint64_t reftable_index, uint64_t *reftable_size,
-                          void *refblock, bool refblock_empty, bool *allocated,
-                          Error **errp)
+static int GRAPH_RDLOCK
+flush_refblock(BlockDriverState *bs, uint64_t **reftable,
+               uint64_t reftable_index, uint64_t *reftable_size,
+               void *refblock, bool refblock_empty, bool *allocated,
+               Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     int64_t offset;
@@ -XXX,XX +XXX,XX @@ static int flush_refblock(BlockDriverState *bs, uint64_t **reftable,
  *
  * @allocated is set to true if a new cluster has been allocated.
  */
-static int walk_over_reftable(BlockDriverState *bs, uint64_t **new_reftable,
-                              uint64_t *new_reftable_index,
-                              uint64_t *new_reftable_size,
-                              void *new_refblock, int new_refblock_size,
-                              int new_refcount_bits,
-                              RefblockFinishOp *operation, bool *allocated,
-                              Qcow2SetRefcountFunc *new_set_refcount,
-                              BlockDriverAmendStatusCB *status_cb,
-                              void *cb_opaque, int index, int total,
-                              Error **errp)
+static int GRAPH_RDLOCK
+walk_over_reftable(BlockDriverState *bs, uint64_t **new_reftable,
+                   uint64_t *new_reftable_index,
+                   uint64_t *new_reftable_size,
+                   void *new_refblock, int new_refblock_size,
+                   int new_refcount_bits,
+                   RefblockFinishOp *operation, bool *allocated,
+                   Qcow2SetRefcountFunc *new_set_refcount,
+                   BlockDriverAmendStatusCB *status_cb,
+                   void *cb_opaque, int index, int total,
+                   Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     uint64_t reftable_index;
@@ -XXX,XX +XXX,XX @@ done:
     return ret;
 }
 
-static int64_t coroutine_fn get_refblock_offset(BlockDriverState *bs,
-                                                uint64_t offset)
+static int64_t coroutine_fn GRAPH_RDLOCK
+get_refblock_offset(BlockDriverState *bs, uint64_t offset)
 {
     BDRVQcow2State *s = bs->opaque;
     uint32_t index = offset_to_reftable_index(s, offset);
@@ -XXX,XX +XXX,XX @@ static int64_t coroutine_fn get_refblock_offset(BlockDriverState *bs,
     return covering_refblock_offset;
 }
 
-static int coroutine_fn
+static int coroutine_fn GRAPH_RDLOCK
 qcow2_discard_refcount_block(BlockDriverState *bs, uint64_t discard_block_offs)
 {
     BDRVQcow2State *s = bs->opaque;
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ int qcow2_mark_dirty(BlockDriverState *bs)
  * function when there are no pending requests, it does not guard against
  * concurrent requests dirtying the image.
  */
-static int qcow2_mark_clean(BlockDriverState *bs)
+static int GRAPH_RDLOCK qcow2_mark_clean(BlockDriverState *bs)
 {
     BDRVQcow2State *s = bs->opaque;
 
@@ -XXX,XX +XXX,XX @@ int qcow2_mark_corrupt(BlockDriverState *bs)
  * Marks the image as consistent, i.e., unsets the corrupt bit, and flushes
  * before if necessary.
  */
-static int coroutine_fn qcow2_mark_consistent(BlockDriverState *bs)
+static int coroutine_fn GRAPH_RDLOCK
+qcow2_mark_consistent(BlockDriverState *bs)
 {
     BDRVQcow2State *s = bs->opaque;
 
@@ -XXX,XX +XXX,XX @@ typedef struct Qcow2ReopenState {
     QCryptoBlockOpenOptions *crypto_opts; /* Disk encryption runtime options */
 } Qcow2ReopenState;
 
-static int qcow2_update_options_prepare(BlockDriverState *bs,
-                                        Qcow2ReopenState *r,
-                                        QDict *options, int flags,
-                                        Error **errp)
+static int GRAPH_RDLOCK
+qcow2_update_options_prepare(BlockDriverState *bs, Qcow2ReopenState *r,
+                             QDict *options, int flags, Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     QemuOpts *opts = NULL;
@@ -XXX,XX +XXX,XX @@ static void qcow2_update_options_abort(BlockDriverState *bs,
     qapi_free_QCryptoBlockOpenOptions(r->crypto_opts);
 }
 
-static int coroutine_fn
+static int coroutine_fn GRAPH_RDLOCK
 qcow2_update_options(BlockDriverState *bs, QDict *options, int flags,
                      Error **errp)
 {
@@ -XXX,XX +XXX,XX @@ static void qcow2_refresh_limits(BlockDriverState *bs, Error **errp)
     bs->bl.pdiscard_alignment = s->cluster_size;
 }
 
-static int qcow2_reopen_prepare(BDRVReopenState *state,
-                                BlockReopenQueue *queue, Error **errp)
+static int GRAPH_UNLOCKED
+qcow2_reopen_prepare(BDRVReopenState *state,BlockReopenQueue *queue,
+                     Error **errp)
 {
     BDRVQcow2State *s = state->bs->opaque;
     Qcow2ReopenState *r;
     int ret;
 
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     r = g_new0(Qcow2ReopenState, 1);
     state->opaque = r;
 
@@ -XXX,XX +XXX,XX @@ static void qcow2_reopen_commit(BDRVReopenState *state)
 
 static void qcow2_reopen_commit_post(BDRVReopenState *state)
 {
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     if (state->flags & BDRV_O_RDWR) {
         Error *local_err = NULL;
 
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int64_t bytes,
     return ret;
 }
 
-static coroutine_fn int qcow2_co_pdiscard(BlockDriverState *bs,
-                                          int64_t offset, int64_t bytes)
+static int coroutine_fn GRAPH_RDLOCK
+qcow2_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes)
 {
     int ret;
     BDRVQcow2State *s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ fail:
     return ret;
 }
 
-static int make_completely_empty(BlockDriverState *bs)
+static int GRAPH_RDLOCK make_completely_empty(BlockDriverState *bs)
 {
     BDRVQcow2State *s = bs->opaque;
     Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ fail:
     return ret;
 }
 
-static int qcow2_make_empty(BlockDriverState *bs)
+static int GRAPH_RDLOCK qcow2_make_empty(BlockDriverState *bs)
 {
     BDRVQcow2State *s = bs->opaque;
     uint64_t offset, end_offset;
@@ -XXX,XX +XXX,XX @@ static int qcow2_make_empty(BlockDriverState *bs)
     return ret;
 }
 
-static coroutine_fn int qcow2_co_flush_to_os(BlockDriverState *bs)
+static coroutine_fn GRAPH_RDLOCK int qcow2_co_flush_to_os(BlockDriverState *bs)
 {
     BDRVQcow2State *s = bs->opaque;
     int ret;
@@ -XXX,XX +XXX,XX @@ qcow2_co_load_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
     return bs->drv->bdrv_co_preadv_part(bs, offset, qiov->size, qiov, 0, 0);
 }
 
-static int qcow2_has_compressed_clusters(BlockDriverState *bs)
+static int GRAPH_RDLOCK qcow2_has_compressed_clusters(BlockDriverState *bs)
 {
     int64_t offset = 0;
     int64_t bytes = bdrv_getlength(bs);
@@ -XXX,XX +XXX,XX @@ static int qcow2_has_compressed_clusters(BlockDriverState *bs)
  * Downgrades an image's version. To achieve this, any incompatible features
  * have to be removed.
  */
-static int qcow2_downgrade(BlockDriverState *bs, int target_version,
-                           BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
-                           Error **errp)
+static int GRAPH_RDLOCK
+qcow2_downgrade(BlockDriverState *bs, int target_version,
+                BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
+                Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     int current_version = s->qcow_version;
@@ -XXX,XX +XXX,XX @@ static int qcow2_downgrade(BlockDriverState *bs, int target_version,
  * features of older versions, some things may have to be presented
  * differently.
  */
-static int qcow2_upgrade(BlockDriverState *bs, int target_version,
-                         BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
-                         Error **errp)
+static int GRAPH_RDLOCK
+qcow2_upgrade(BlockDriverState *bs, int target_version,
+              BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
+              Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     bool need_snapshot_update;
@@ -XXX,XX +XXX,XX @@ static void qcow2_amend_helper_cb(BlockDriverState *bs,
                              info->original_cb_opaque);
 }
 
-static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,
-                               BlockDriverAmendStatusCB *status_cb,
-                               void *cb_opaque,
-                               bool force,
-                               Error **errp)
+static int GRAPH_RDLOCK
+qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,
+                    BlockDriverAmendStatusCB *status_cb, void *cb_opaque,
+                    bool force, Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     int old_version = s->qcow_version, new_version = old_version;
@@ -XXX,XX +XXX,XX @@ void qcow2_signal_corruption(BlockDriverState *bs, bool fatal, int64_t offset,
     char *message;
     va_list ap;
 
-    assume_graph_lock(); /* FIXME */
-
     fatal = fatal && bdrv_is_writable(bs);
 
     if (s->signaled_corruption &&
diff --git a/block/replication.c b/block/replication.c
index XXXXXXX..XXXXXXX 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -XXX,XX +XXX,XX @@ out:
     return ret;
 }
 
-static void secondary_do_checkpoint(BlockDriverState *bs, Error **errp)
+static void GRAPH_UNLOCKED
+secondary_do_checkpoint(BlockDriverState *bs, Error **errp)
 {
     BDRVReplicationState *s = bs->opaque;
     BdrvChild *active_disk = bs->file;
     Error *local_err = NULL;
     int ret;
 
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     if (!s->backup_job) {
         error_setg(errp, "Backup job was cancelled unexpectedly");
         return;
@@ -XXX,XX +XXX,XX @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
         /* Must be true, or the bdrv_getlength() calls would have failed */
         assert(active_disk->bs->drv && hidden_disk->bs->drv);
 
+        bdrv_graph_rdlock_main_loop();
         if (!active_disk->bs->drv->bdrv_make_empty ||
             !hidden_disk->bs->drv->bdrv_make_empty) {
             error_setg(errp,
                        "Active disk or hidden disk doesn't support make_empty");
             aio_context_release(aio_context);
+            bdrv_graph_rdunlock_main_loop();
             return;
         }
+        bdrv_graph_rdunlock_main_loop();
 
         /* reopen the backing file in r/w mode */
         reopen_backing_file(bs, true, &local_err);
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
qcow2_inactivate() need to hold a reader lock for the graph because it
calls bdrv_get_device_or_node_name(), which accesses the parents list of
a node.

qcow2_do_close() is a bit strange because it is called from different
contexts. If close_data_file = true, we know that we were called from
non-coroutine main loop context (more specifically, we're coming from
qcow2_close()) and can safely drop the reader lock temporarily with
bdrv_graph_rdunlock_main_loop() and acquire the writer lock.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-16-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ fail_nometa:
     return ret;
 }
 
-static int qcow2_inactivate(BlockDriverState *bs)
+static int GRAPH_RDLOCK qcow2_inactivate(BlockDriverState *bs)
 {
     BDRVQcow2State *s = bs->opaque;
     int ret, result = 0;
     Error *local_err = NULL;
 
-    assume_graph_lock(); /* FIXME */
-
     qcow2_store_persistent_dirty_bitmaps(bs, true, &local_err);
     if (local_err != NULL) {
         result = -EINVAL;
@@ -XXX,XX +XXX,XX @@ static int qcow2_inactivate(BlockDriverState *bs)
     return result;
 }
 
-static void qcow2_do_close(BlockDriverState *bs, bool close_data_file)
+static void coroutine_mixed_fn GRAPH_RDLOCK
+qcow2_do_close(BlockDriverState *bs, bool close_data_file)
 {
     BDRVQcow2State *s = bs->opaque;
     qemu_vfree(s->l1_table);
@@ -XXX,XX +XXX,XX @@ static void qcow2_do_close(BlockDriverState *bs, bool close_data_file)
     g_free(s->image_backing_format);
 
     if (close_data_file && has_data_file(bs)) {
+        GLOBAL_STATE_CODE();
+        bdrv_graph_rdunlock_main_loop();
         bdrv_graph_wrlock(NULL);
         bdrv_unref_child(bs, s->data_file);
         bdrv_graph_wrunlock();
         s->data_file = NULL;
+        bdrv_graph_rdlock_main_loop();
     }
 
     qcow2_refcount_close(bs);
     qcow2_free_snapshots(bs);
 }
 
-static void qcow2_close(BlockDriverState *bs)
+static void GRAPH_UNLOCKED qcow2_close(BlockDriverState *bs)
 {
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     qcow2_do_close(bs, true);
 }
 
-- 
2.41.0

It still has an assume_graph_lock() call, but all of its callers are now
properly annotated to hold the graph lock. Update the function to be
GRAPH_RDLOCK as well and remove the assume_graph_lock().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-17-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2-bitmap.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -XXX,XX +XXX,XX @@ static int64_t get_bitmap_bytes_needed(int64_t len, uint32_t granularity)
     return DIV_ROUND_UP(num_bits, 8);
 }
 
-static int check_constraints_on_bitmap(BlockDriverState *bs,
-                                       const char *name,
-                                       uint32_t granularity,
-                                       Error **errp)
+static int GRAPH_RDLOCK
+check_constraints_on_bitmap(BlockDriverState *bs, const char *name,
+                            uint32_t granularity, Error **errp)
 {
     BDRVQcow2State *s = bs->opaque;
     int granularity_bits = ctz32(granularity);
     int64_t len = bdrv_getlength(bs);
     int64_t bitmap_bytes;
 
-    assume_graph_lock(); /* FIXME */
-
     assert(granularity > 0);
     assert((granularity & (granularity - 1)) == 0);
 
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_op_is_blocked() need to hold a reader lock for the graph
because it calls bdrv_get_device_or_node_name(), which accesses the
parents list of a node.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-18-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block-global-state.h |  4 +++-
 block.c                            |  2 --
 block/block-backend.c              |  1 +
 block/commit.c                     |  1 +
 block/monitor/block-hmp-cmds.c     |  3 +++
 block/qapi-sysemu.c                |  9 +++++++--
 blockdev.c                         | 15 +++++++++++++++
 7 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -XXX,XX +XXX,XX @@ bdrv_attach_child(BlockDriverState *parent_bs,
                   BdrvChildRole child_role,
                   Error **errp);
 
-bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp);
+bool GRAPH_RDLOCK
+bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp);
+
 void bdrv_op_block(BlockDriverState *bs, BlockOpType op, Error *reason);
 void bdrv_op_unblock(BlockDriverState *bs, BlockOpType op, Error *reason);
 void bdrv_op_block_all(BlockDriverState *bs, Error *reason);
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ bool bdrv_op_is_blocked(BlockDriverState *bs, BlockOpType op, Error **errp)
     BdrvOpBlocker *blocker;
     GLOBAL_STATE_CODE();
 
-    assume_graph_lock(); /* FIXME */
-
     assert((int) op >= 0 && op < BLOCK_OP_TYPE_MAX);
     if (!QLIST_EMPTY(&bs->op_blockers[op])) {
         blocker = QLIST_FIRST(&bs->op_blockers[op]);
diff --git a/block/block-backend.c b/block/block-backend.c
index XXXXXXX..XXXXXXX 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -XXX,XX +XXX,XX @@ bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op, Error **errp)
 {
     BlockDriverState *bs = blk_bs(blk);
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (!bs) {
         return false;
diff --git a/block/commit.c b/block/commit.c
index XXXXXXX..XXXXXXX 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -XXX,XX +XXX,XX @@ int bdrv_commit(BlockDriverState *bs)
     Error *local_err = NULL;
 
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
 
     if (!drv)
         return -ENOMEDIUM;
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index XXXXXXX..XXXXXXX 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -XXX,XX +XXX,XX @@ void hmp_drive_del(Monitor *mon, const QDict *qdict)
     AioContext *aio_context;
     Error *local_err = NULL;
 
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     bs = bdrv_find_node(id);
     if (bs) {
         qmp_blockdev_del(id, &local_err);
diff --git a/block/qapi-sysemu.c b/block/qapi-sysemu.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qapi-sysemu.c
+++ b/block/qapi-sysemu.c
@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_close_tray(const char *device,
     }
 }
 
-static void blockdev_remove_medium(const char *device, const char *id,
-                                   Error **errp)
+static void GRAPH_UNLOCKED
+blockdev_remove_medium(const char *device, const char *id, Error **errp)
 {
     BlockBackend *blk;
     BlockDriverState *bs;
     AioContext *aio_context;
     bool has_attached_device;
 
+    GLOBAL_STATE_CODE();
+
     blk = qmp_get_blk(device, id, errp);
     if (!blk) {
         return;
@@ -XXX,XX +XXX,XX @@ static void blockdev_remove_medium(const char *device, const char *id,
     aio_context = bdrv_get_aio_context(bs);
     aio_context_acquire(aio_context);
 
+    bdrv_graph_rdlock_main_loop();
     if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_EJECT, errp)) {
+        bdrv_graph_rdunlock_main_loop();
         goto out;
     }
+    bdrv_graph_rdunlock_main_loop();
 
     blk_remove_bs(blk);
 
diff --git a/blockdev.c b/blockdev.c
index XXXXXXX..XXXXXXX 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -XXX,XX +XXX,XX @@ static void drive_backup_action(DriveBackup *backup,
     }
 
     /* Early check to avoid creating target */
+    bdrv_graph_rdlock_main_loop();
     if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKUP_SOURCE, errp)) {
+        bdrv_graph_rdunlock_main_loop();
         goto out;
     }
+    bdrv_graph_rdunlock_main_loop();
 
     flags = bs->open_flags | BDRV_O_RDWR;
 
@@ -XXX,XX +XXX,XX @@ void coroutine_fn qmp_block_resize(const char *device, const char *node_name,
         return;
     }
 
+    bdrv_graph_co_rdlock();
     if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_RESIZE, NULL)) {
         error_setg(errp, QERR_DEVICE_IN_USE, device);
+        bdrv_graph_co_rdunlock();
         return;
     }
+    bdrv_graph_co_rdunlock();
 
     blk = blk_co_new_with_bs(bs, BLK_PERM_RESIZE, BLK_PERM_ALL, errp);
     if (!blk) {
@@ -XXX,XX +XXX,XX @@ void qmp_block_stream(const char *job_id, const char *device,
      * Check for op blockers in the whole chain between bs and base (or bottom)
      */
     iter_end = bottom ? bdrv_filter_or_cow_bs(bottom_bs) : base_bs;
+    bdrv_graph_rdlock_main_loop();
     for (iter = bs; iter && iter != iter_end;
          iter = bdrv_filter_or_cow_bs(iter))
     {
         if (bdrv_op_is_blocked(iter, BLOCK_OP_TYPE_STREAM, errp)) {
+            bdrv_graph_rdunlock_main_loop();
             goto out;
         }
     }
+    bdrv_graph_rdunlock_main_loop();
 
     /* if we are streaming the entire chain, the result will have no backing
      * file, and specifying one is therefore an error */
@@ -XXX,XX +XXX,XX @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
     }
 
     /* Early check to avoid creating target */
+    bdrv_graph_rdlock_main_loop();
     if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_MIRROR_SOURCE, errp)) {
+        bdrv_graph_rdunlock_main_loop();
         return;
     }
+    bdrv_graph_rdunlock_main_loop();
 
     aio_context = bdrv_get_aio_context(bs);
     aio_context_acquire(aio_context);
@@ -XXX,XX +XXX,XX @@ void qmp_change_backing_file(const char *device,
 
     /* even though we are not necessarily operating on bs, we need it to
      * determine if block ops are currently prohibited on the chain */
+    bdrv_graph_rdlock_main_loop();
     if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_CHANGE, errp)) {
+        bdrv_graph_rdunlock_main_loop();
         goto out;
     }
+    bdrv_graph_rdunlock_main_loop();
 
     /* final sanity check */
     if (!bdrv_chain_contains(bs, image_bs)) {
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_apply_auto_read_only() need to hold a reader lock for the graph
because it calls bdrv_can_set_read_only(), which indirectly accesses the
parents list of a node.

diff --git a/include/block/block-io.h b/include/block/block-io.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -XXX,XX +XXX,XX @@ bdrv_is_allocated_above(BlockDriverState *bs, BlockDriverState *base,
 int coroutine_fn GRAPH_RDLOCK
 bdrv_co_is_zero_fast(BlockDriverState *bs, int64_t offset, int64_t bytes);
 
-int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
-                              Error **errp);
+int GRAPH_RDLOCK
+bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
+                          Error **errp);
+
 bool bdrv_is_read_only(BlockDriverState *bs);
 bool bdrv_is_writable(BlockDriverState *bs);
 bool bdrv_is_sg(BlockDriverState *bs);
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,
     int ret = 0;
     IO_CODE();
 
-    assume_graph_lock(); /* FIXME */
-
     if (!(bs->open_flags & BDRV_O_RDWR)) {
         return 0;
     }
@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
 
     if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, ro)) {
         if (!ro && bdrv_is_whitelisted(drv, true)) {
+            bdrv_graph_rdlock_main_loop();
             ret = bdrv_apply_auto_read_only(bs, NULL, NULL);
+            bdrv_graph_rdunlock_main_loop();
         } else {
             ret = -ENOTSUP;
         }
diff --git a/block/bochs.c b/block/bochs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
     int ret;
 
     /* No write support yet */
+    bdrv_graph_rdlock_main_loop();
     ret = bdrv_apply_auto_read_only(bs, NULL, errp);
+    bdrv_graph_rdunlock_main_loop();
     if (ret < 0) {
         return ret;
     }
diff --git a/block/cloop.c b/block/cloop.c
index XXXXXXX..XXXXXXX 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
     uint32_t offsets_size, max_compressed_block_size = 1, i;
     int ret;
 
+    bdrv_graph_rdlock_main_loop();
     ret = bdrv_apply_auto_read_only(bs, NULL, errp);
+    bdrv_graph_rdunlock_main_loop();
     if (ret < 0) {
         return ret;
     }
diff --git a/block/curl.c b/block/curl.c
index XXXXXXX..XXXXXXX 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -XXX,XX +XXX,XX @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
     const char *protocol_delimiter;
     int ret;
 
+    bdrv_graph_rdlock_main_loop();
     ret = bdrv_apply_auto_read_only(bs, "curl driver does not support writes",
                                     errp);
+    bdrv_graph_rdunlock_main_loop();
     if (ret < 0) {
         return ret;
     }
diff --git a/block/dmg.c b/block/dmg.c
index XXXXXXX..XXXXXXX 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
     int64_t offset;
     int ret;
 
+    bdrv_graph_rdlock_main_loop();
     ret = bdrv_apply_auto_read_only(bs, NULL, errp);
+    bdrv_graph_rdunlock_main_loop();
     if (ret < 0) {
         return ret;
     }
diff --git a/block/gluster.c b/block/gluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_open(BlockDriverState *bs,  QDict *options,
     if (ret == -EACCES || ret == -EROFS) {
         /* Try to degrade to read-only, but if it doesn't work, still use the
          * normal error message. */
+        bdrv_graph_rdlock_main_loop();
         if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
             open_flags = (open_flags & ~O_RDWR) | O_RDONLY;
             s->fd = glfs_open(s->glfs, gconf->path, open_flags);
             ret = s->fd ? 0 : -errno;
         }
+        bdrv_graph_rdunlock_main_loop();
     }
 
     s->supports_seek_data = qemu_gluster_test_seek(s->fd);
diff --git a/block/iscsi.c b/block/iscsi.c
index XXXXXXX..XXXXXXX 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -XXX,XX +XXX,XX @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
     /* Check the write protect flag of the LUN if we want to write */
     if (iscsilun->type == TYPE_DISK && (flags & BDRV_O_RDWR) &&
         iscsilun->write_protected) {
+        bdrv_graph_rdlock_main_loop();
         ret = bdrv_apply_auto_read_only(bs, "LUN is write protected", errp);
+        bdrv_graph_rdunlock_main_loop();
         if (ret < 0) {
             goto out;
         }
diff --git a/block/nbd.c b/block/nbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -XXX,XX +XXX,XX @@ static bool nbd_client_will_reconnect(BDRVNBDState *s)
  * Return failure if the server's advertised options are incompatible with the
  * client's needs.
  */
-static int nbd_handle_updated_info(BlockDriverState *bs, Error **errp)
+static int coroutine_fn GRAPH_RDLOCK
+nbd_handle_updated_info(BlockDriverState *bs, Error **errp)
 {
     BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
     int ret;
diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
     /* If we are using an rbd snapshot, we must be r/o, otherwise
      * leave as-is */
     if (s->snap != NULL) {
+        bdrv_graph_rdlock_main_loop();
         r = bdrv_apply_auto_read_only(bs, "rbd snapshots are read-only", errp);
+        bdrv_graph_rdunlock_main_loop();
         if (r < 0) {
             goto failed_post_open;
         }
-- 
2.41.0

This adds GRAPH_RDLOCK annotations to declare that callers of
bdrv_get_specific_info() need to hold a reader lock for the graph.
This removes an assume_graph_lock() call in vmdk's implementation.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-20-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block-io.h         | 5 +++--
 include/block/block_int-common.h | 4 ++--
 block/vmdk.c                     | 6 ++----
 qemu-io-cmds.c                   | 3 +++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/block/block-io.h b/include/block/block-io.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block-io.h
+++ b/include/block/block-io.h
@@ -XXX,XX +XXX,XX @@ bdrv_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
 int co_wrapper_mixed_bdrv_rdlock
 bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);
 
-ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,
-                                          Error **errp);
+ImageInfoSpecific * GRAPH_RDLOCK
+bdrv_get_specific_info(BlockDriverState *bs, Error **errp);
+
 BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs);
 void bdrv_round_to_subclusters(BlockDriverState *bs,
                                int64_t offset, int64_t bytes,
diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
     int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_get_info)(
         BlockDriverState *bs, BlockDriverInfo *bdi);
 
-    ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs,
-                                                 Error **errp);
+    ImageInfoSpecific * GRAPH_RDLOCK_PTR (*bdrv_get_specific_info)(
+        BlockDriverState *bs, Error **errp);
     BlockStatsSpecific *(*bdrv_get_specific_stats)(BlockDriverState *bs);
 
     int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_save_vmstate)(
diff --git a/block/vmdk.c b/block/vmdk.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -XXX,XX +XXX,XX @@ vmdk_co_check(BlockDriverState *bs, BdrvCheckResult *result, BdrvCheckMode fix)
     return ret;
 }
 
-static ImageInfoSpecific *vmdk_get_specific_info(BlockDriverState *bs,
-                                                 Error **errp)
+static ImageInfoSpecific * GRAPH_RDLOCK
+vmdk_get_specific_info(BlockDriverState *bs, Error **errp)
 {
     int i;
     BDRVVmdkState *s = bs->opaque;
     ImageInfoSpecific *spec_info = g_new0(ImageInfoSpecific, 1);
     VmdkExtentInfoList **tail;
 
-    assume_graph_lock(); /* FIXME */
-
     *spec_info = (ImageInfoSpecific){
         .type = IMAGE_INFO_SPECIFIC_KIND_VMDK,
         .u = {
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index XXXXXXX..XXXXXXX 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -XXX,XX +XXX,XX @@ static int info_f(BlockBackend *blk, int argc, char **argv)
     char s1[64], s2[64];
     int ret;
 
+    GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     if (bs->drv && bs->drv->format_name) {
         printf("format name: %s\n", bs->drv->format_name);
     }
-- 
2.41.0

Almost all functions that access the parent link already take the graph
lock now. Add locking to the remaining user in a test case and finally
annotate the struct field itself as protected by the graph lock.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-21-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block_int-common.h | 4 ++--
 tests/unit/test-block-iothread.c | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -XXX,XX +XXX,XX @@ struct BdrvChild {
     bool quiesced_parent;
 
     QLIST_ENTRY(BdrvChild) next;
-    QLIST_ENTRY(BdrvChild) next_parent;
+    QLIST_ENTRY(BdrvChild GRAPH_RDLOCK_PTR) next_parent;
 };
 
 /*
@@ -XXX,XX +XXX,XX @@ struct BlockDriverState {
     BdrvChild *backing;
     BdrvChild *file;
 
-    QLIST_HEAD(, BdrvChild) parents;
+    QLIST_HEAD(, BdrvChild GRAPH_RDLOCK_PTR) parents;
 
     QDict *options;
     QDict *explicit_options;
diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/test-block-iothread.c
+++ b/tests/unit/test-block-iothread.c
@@ -XXX,XX +XXX,XX @@ static void test_sync_op(const void *opaque)
     BlockDriverState *bs;
     BdrvChild *c;
 
+    GLOBAL_STATE_CODE();
+
     blk = blk_new(qemu_get_aio_context(), BLK_PERM_ALL, BLK_PERM_ALL);
     bs = bdrv_new_open_driver(&bdrv_test, "base", BDRV_O_RDWR, &error_abort);
     bs->total_sectors = 65536 / BDRV_SECTOR_SIZE;
     blk_insert_bs(blk, bs, &error_abort);
+
+    bdrv_graph_rdlock_main_loop();
     c = QLIST_FIRST(&bs->parents);
+    bdrv_graph_rdunlock_main_loop();
 
     blk_set_aio_context(blk, ctx, &error_abort);
     aio_context_acquire(ctx);
-- 
2.41.0

Almost all functions that access the child links already take the graph
lock now. Add locking to the remaining users and finally annotate the
struct field itself as protected by the graph lock.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230929145157.45443-22-kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 include/block/block_int-common.h | 4 ++--
 block.c                          | 2 ++
 block/replication.c              | 3 ++-
 tests/unit/test-bdrv-drain.c     | 4 ++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int-common.h
+++ b/include/block/block_int-common.h
@@ -XXX,XX +XXX,XX @@ struct BdrvChild {
      */
     bool quiesced_parent;
 
-    QLIST_ENTRY(BdrvChild) next;
+    QLIST_ENTRY(BdrvChild GRAPH_RDLOCK_PTR) next;
     QLIST_ENTRY(BdrvChild GRAPH_RDLOCK_PTR) next_parent;
 };
 
@@ -XXX,XX +XXX,XX @@ struct BlockDriverState {
      * See also comment in include/block/block.h, to learn how backing and file
      * are connected with BdrvChildRole.
      */
-    QLIST_HEAD(, BdrvChild) children;
+    QLIST_HEAD(, BdrvChild GRAPH_RDLOCK_PTR) children;
     BdrvChild *backing;
     BdrvChild *file;
 
diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ static void bdrv_child_free(BdrvChild *child)
 {
     assert(!child->bs);
     GLOBAL_STATE_CODE();
+    GRAPH_RDLOCK_GUARD_MAINLOOP();
+
     assert(!child->next.le_prev); /* not in children list */
 
     g_free(child->name);
diff --git a/block/replication.c b/block/replication.c
index XXXXXXX..XXXXXXX 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -XXX,XX +XXX,XX @@ static void backup_job_completed(void *opaque, int ret)
     backup_job_cleanup(bs);
 }
 
-static bool check_top_bs(BlockDriverState *top_bs, BlockDriverState *bs)
+static bool GRAPH_RDLOCK
+check_top_bs(BlockDriverState *top_bs, BlockDriverState *bs)
 {
     BdrvChild *child;
 
diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/test-bdrv-drain.c
+++ b/tests/unit/test-bdrv-drain.c
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn test_co_delete_by_drain(void *opaque)
         blk_co_unref(blk);
     } else {
         BdrvChild *c, *next_c;
+        bdrv_graph_co_rdlock();
         QLIST_FOREACH_SAFE(c, &bs->children, next, next_c) {
+            bdrv_graph_co_rdunlock();
             bdrv_co_unref_child(bs, c);
+            bdrv_graph_co_rdlock();
         }
+        bdrv_graph_co_rdunlock();
     }
 
     dbdd->done = true;
-- 
2.41.0

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>
---
 include/block/graph-lock.h | 3 ++-
 block/graph-lock.c         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/block/graph-lock.h b/include/block/graph-lock.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/graph-lock.h
+++ b/include/block/graph-lock.h
@@ -XXX,XX +XXX,XX @@ 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:
diff --git a/block/graph-lock.c b/block/graph-lock.c
index XXXXXXX..XXXXXXX 100644
--- a/block/graph-lock.c
+++ b/block/graph-lock.c
@@ -XXX,XX +XXX,XX @@ 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
-- 
2.41.0