| Message ID | 20221214134453.31665-1-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Wed, 14 Dec 2022 at 13:45, Kevin Wolf <kwolf@redhat.com> wrote: > > The following changes since commit 5204b499a6cae4dfd9fe762d5e6e82224892383b: > > mailmap: Fix Stefan Weil author email (2022-12-13 15:56:57 -0500) > > are available in the Git repository at: > > https://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to 2ad19e5dc950d4b340894846b9e71c0b20f9a1cc: > > block: GRAPH_RDLOCK for functions only called by co_wrappers (2022-12-14 13:13:07 +0100) > > ---------------------------------------------------------------- > Block layer patches > > - Code cleanups around block graph modification > - Simplify drain > - coroutine_fn correctness fixes, including splitting generated > coroutine wrappers into co_wrapper (to be called only from > non-coroutine context) and co_wrapper_mixed (both coroutine and > non-coroutine context) > - Introduce a block graph rwlock > > ---------------------------------------------------------------- Fails to build on the tsan-build job: https://gitlab.com/qemu-project/qemu/-/jobs/3476176683 In file included from ../hw/nvram/fw_cfg-interface.c:10: In file included from /builds/qemu-project/qemu/include/hw/nvram/fw_cfg.h:7: In file included from /builds/qemu-project/qemu/include/sysemu/dma.h:15: In file included from /builds/qemu-project/qemu/include/block/block.h:27: In file included from /builds/qemu-project/qemu/include/block/block-global-state.h:27: In file included from /builds/qemu-project/qemu/include/block/block-common.h:27: In file included from /builds/qemu-project/qemu/include/block/aio.h:25: /builds/qemu-project/qemu/include/block/graph-lock.h:62:31: error: invalid capability name 'graph-lock'; capability name must be 'mutex' or 'role' [-Werror,-Wthread-safety-attributes] typedef struct TSA_CAPABILITY("graph-lock") BdrvGraphLock { ^ (I see the same error on my x86 macos system.) thanks -- PMM
Am 14.12.2022 um 23:35 hat Peter Maydell geschrieben: > On Wed, 14 Dec 2022 at 13:45, Kevin Wolf <kwolf@redhat.com> wrote: > > > > The following changes since commit 5204b499a6cae4dfd9fe762d5e6e82224892383b: > > > > mailmap: Fix Stefan Weil author email (2022-12-13 15:56:57 -0500) > > > > are available in the Git repository at: > > > > https://repo.or.cz/qemu/kevin.git tags/for-upstream > > > > for you to fetch changes up to 2ad19e5dc950d4b340894846b9e71c0b20f9a1cc: > > > > block: GRAPH_RDLOCK for functions only called by co_wrappers (2022-12-14 13:13:07 +0100) > > > > ---------------------------------------------------------------- > > Block layer patches > > > > - Code cleanups around block graph modification > > - Simplify drain > > - coroutine_fn correctness fixes, including splitting generated > > coroutine wrappers into co_wrapper (to be called only from > > non-coroutine context) and co_wrapper_mixed (both coroutine and > > non-coroutine context) > > - Introduce a block graph rwlock > > > > ---------------------------------------------------------------- > > Fails to build on the tsan-build job: > https://gitlab.com/qemu-project/qemu/-/jobs/3476176683 > > In file included from ../hw/nvram/fw_cfg-interface.c:10: > In file included from /builds/qemu-project/qemu/include/hw/nvram/fw_cfg.h:7: > In file included from /builds/qemu-project/qemu/include/sysemu/dma.h:15: > In file included from /builds/qemu-project/qemu/include/block/block.h:27: > In file included from > /builds/qemu-project/qemu/include/block/block-global-state.h:27: > In file included from /builds/qemu-project/qemu/include/block/block-common.h:27: > In file included from /builds/qemu-project/qemu/include/block/aio.h:25: > /builds/qemu-project/qemu/include/block/graph-lock.h:62:31: error: > invalid capability name 'graph-lock'; capability name must be 'mutex' > or 'role' [-Werror,-Wthread-safety-attributes] > typedef struct TSA_CAPABILITY("graph-lock") BdrvGraphLock { > ^ > > (I see the same error on my x86 macos system.) Ah, surprise, clang 11 lifted this arbitrary restriction for capability names and that it existed in older compiler versions isn't documented (any more?). We can either just name it "mutex" and have slightly misleading error messages (it's semantically not a mutex, but an rwlock), or add a configure check and leave TSA disabled if it doesn't work. I think I'll try the former for now, "mutex 'graph_lock'" should still be good enough to know what it means. Kevin
The following changes since commit 5204b499a6cae4dfd9fe762d5e6e82224892383b: mailmap: Fix Stefan Weil author email (2022-12-13 15:56:57 -0500) are available in the Git repository at: https://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to 2ad19e5dc950d4b340894846b9e71c0b20f9a1cc: block: GRAPH_RDLOCK for functions only called by co_wrappers (2022-12-14 13:13:07 +0100) ---------------------------------------------------------------- Block layer patches - Code cleanups around block graph modification - Simplify drain - coroutine_fn correctness fixes, including splitting generated coroutine wrappers into co_wrapper (to be called only from non-coroutine context) and co_wrapper_mixed (both coroutine and non-coroutine context) - Introduce a block graph rwlock ---------------------------------------------------------------- Emanuele Giuseppe Esposito (21): block-io: introduce coroutine_fn duplicates for bdrv_common_block_status_above callers block-copy: add coroutine_fn annotations nbd/server.c: add coroutine_fn annotations block-backend: replace bdrv_*_above with blk_*_above block/vmdk: add coroutine_fn annotations block: avoid duplicating filename string in bdrv_create block: distinguish between bdrv_create running in coroutine and not block: bdrv_create_file is a coroutine_fn block: rename generated_co_wrapper in co_wrapper_mixed block-coroutine-wrapper.py: introduce co_wrapper block-coroutine-wrapper.py: support functions without bs arg block-coroutine-wrapper.py: support also basic return types block: convert bdrv_create to co_wrapper block/dirty-bitmap: convert coroutine-only functions to co_wrapper graph-lock: Implement guard macros async: Register/unregister aiocontext in graph lock list block: wrlock in bdrv_replace_child_noperm block: remove unnecessary assert_bdrv_graph_writable() block: assert that graph read and writes are performed correctly block-coroutine-wrapper.py: introduce annotations that take the graph rdlock block: use co_wrapper_mixed_bdrv_rdlock in functions taking the rdlock Kevin Wolf (25): qed: Don't yield in bdrv_qed_co_drain_begin() test-bdrv-drain: Don't yield in .bdrv_co_drained_begin/end() block: Revert .bdrv_drained_begin/end to non-coroutine_fn block: Remove drained_end_counter block: Inline bdrv_drain_invoke() block: Fix locking for bdrv_reopen_queue_child() block: Drain individual nodes during reopen block: Don't use subtree drains in bdrv_drop_intermediate() stream: Replace subtree drain with a single node drain block: Remove subtree drains block: Call drain callbacks only once block: Remove ignore_bds_parents parameter from drain_begin/end. block: Drop out of coroutine in bdrv_do_drained_begin_quiesce() block: Don't poll in bdrv_replace_child_noperm() block: Remove poll parameter from bdrv_parent_drained_begin_single() block: Factor out bdrv_drain_all_begin_nopoll() Import clang-tsa.h clang-tsa: Add TSA_ASSERT() macro clang-tsa: Add macros for shared locks configure: Enable -Wthread-safety if present test-bdrv-drain: Fix incorrrect drain assumptions block: Fix locking in external_snapshot_prepare() graph-lock: TSA annotations for lock/unlock functions Mark assert_bdrv_graph_readable/writable() GRAPH_RD/WRLOCK block: GRAPH_RDLOCK for functions only called by co_wrappers Paolo Bonzini (1): graph-lock: Introduce a lock to protect block graph operations Vladimir Sementsov-Ogievskiy (4): block: Inline bdrv_detach_child() block: drop bdrv_remove_filter_or_cow_child block: bdrv_refresh_perms(): allow external tran block: refactor bdrv_list_refresh_perms to allow any list of nodes docs/devel/block-coroutine-wrapper.rst | 6 +- configure | 1 + block/block-gen.h | 11 +- block/coroutines.h | 21 +- include/block/aio.h | 9 + include/block/block-common.h | 27 ++- include/block/block-copy.h | 5 +- include/block/block-global-state.h | 15 +- include/block/block-io.h | 136 +++++------ include/block/block_int-common.h | 49 ++-- include/block/block_int-global-state.h | 17 -- include/block/block_int-io.h | 12 - include/block/block_int.h | 1 + include/block/dirty-bitmap.h | 10 +- include/block/graph-lock.h | 280 +++++++++++++++++++++++ include/qemu/clang-tsa.h | 114 ++++++++++ include/sysemu/block-backend-io.h | 77 ++++--- block.c | 404 ++++++++++++++++++--------------- block/block-backend.c | 25 +- block/block-copy.c | 21 +- block/commit.c | 4 +- block/crypto.c | 2 +- block/dirty-bitmap.c | 88 +------ block/graph-lock.c | 275 ++++++++++++++++++++++ block/io.c | 367 ++++++++++-------------------- block/parallels.c | 2 +- block/qcow.c | 2 +- block/qcow2.c | 4 +- block/qed.c | 28 ++- block/raw-format.c | 2 +- block/replication.c | 6 - block/stream.c | 26 ++- block/throttle.c | 8 +- block/vdi.c | 2 +- block/vhdx.c | 2 +- block/vmdk.c | 38 ++-- block/vpc.c | 2 +- blockdev.c | 17 +- blockjob.c | 2 +- nbd/server.c | 47 ++-- stubs/graph-lock.c | 10 + tests/unit/test-bdrv-drain.c | 387 +++++++++---------------------- util/async.c | 4 + scripts/block-coroutine-wrapper.py | 133 ++++++++--- block/meson.build | 2 + stubs/meson.build | 1 + 46 files changed, 1575 insertions(+), 1127 deletions(-) create mode 100644 include/block/graph-lock.h create mode 100644 include/qemu/clang-tsa.h create mode 100644 block/graph-lock.c create mode 100644 stubs/graph-lock.c