From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 37/51] async: Register/unregister aiocontext in graph lock list
Date: Wed, 14 Dec 2022 14:44:39 +0100 [thread overview]
Message-ID: <20221214134453.31665-38-kwolf@redhat.com> (raw)
In-Reply-To: <20221214134453.31665-1-kwolf@redhat.com>
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Add/remove the AioContext in aio_context_list in graph-lock.c when it is
created/destroyed. This allows using the graph locking operations from
this AioContext.
In order to allow linking util/async.c with binaries that don't include
the block layer, introduce stubs for (un)register_aiocontext().
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221207131838.239125-5-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
stubs/graph-lock.c | 10 ++++++++++
util/async.c | 4 ++++
stubs/meson.build | 1 +
3 files changed, 15 insertions(+)
create mode 100644 stubs/graph-lock.c
diff --git a/stubs/graph-lock.c b/stubs/graph-lock.c
new file mode 100644
index 0000000000..177aa0a8ba
--- /dev/null
+++ b/stubs/graph-lock.c
@@ -0,0 +1,10 @@
+#include "qemu/osdep.h"
+#include "block/graph-lock.h"
+
+void register_aiocontext(AioContext *ctx)
+{
+}
+
+void unregister_aiocontext(AioContext *ctx)
+{
+}
diff --git a/util/async.c b/util/async.c
index 63434ddae4..14d63b3091 100644
--- a/util/async.c
+++ b/util/async.c
@@ -27,6 +27,7 @@
#include "qapi/error.h"
#include "block/aio.h"
#include "block/thread-pool.h"
+#include "block/graph-lock.h"
#include "qemu/main-loop.h"
#include "qemu/atomic.h"
#include "qemu/rcu_queue.h"
@@ -376,6 +377,7 @@ aio_ctx_finalize(GSource *source)
qemu_rec_mutex_destroy(&ctx->lock);
qemu_lockcnt_destroy(&ctx->list_lock);
timerlistgroup_deinit(&ctx->tlg);
+ unregister_aiocontext(ctx);
aio_context_destroy(ctx);
}
@@ -574,6 +576,8 @@ AioContext *aio_context_new(Error **errp)
ctx->thread_pool_min = 0;
ctx->thread_pool_max = THREAD_POOL_MAX_THREADS_DEFAULT;
+ register_aiocontext(ctx);
+
return ctx;
fail:
g_source_destroy(&ctx->source);
diff --git a/stubs/meson.build b/stubs/meson.build
index c96a74f095..981585cbdf 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -13,6 +13,7 @@ stub_ss.add(files('error-printf.c'))
stub_ss.add(files('fdset.c'))
stub_ss.add(files('gdbstub.c'))
stub_ss.add(files('get-vm-name.c'))
+stub_ss.add(files('graph-lock.c'))
if linux_io_uring.found()
stub_ss.add(files('io_uring.c'))
endif
--
2.38.1
next prev parent reply other threads:[~2022-12-14 14:09 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 13:44 [PULL 00/51] Block layer patches Kevin Wolf
2022-12-14 13:44 ` [PULL 01/51] block: Inline bdrv_detach_child() Kevin Wolf
2022-12-14 13:44 ` [PULL 02/51] block: drop bdrv_remove_filter_or_cow_child Kevin Wolf
2022-12-14 13:44 ` [PULL 03/51] block: bdrv_refresh_perms(): allow external tran Kevin Wolf
2022-12-14 13:44 ` [PULL 04/51] block: refactor bdrv_list_refresh_perms to allow any list of nodes Kevin Wolf
2022-12-14 13:44 ` [PULL 05/51] qed: Don't yield in bdrv_qed_co_drain_begin() Kevin Wolf
2022-12-14 13:44 ` [PULL 06/51] test-bdrv-drain: Don't yield in .bdrv_co_drained_begin/end() Kevin Wolf
2022-12-14 13:44 ` [PULL 07/51] block: Revert .bdrv_drained_begin/end to non-coroutine_fn Kevin Wolf
2022-12-14 13:44 ` [PULL 08/51] block: Remove drained_end_counter Kevin Wolf
2022-12-14 13:44 ` [PULL 09/51] block: Inline bdrv_drain_invoke() Kevin Wolf
2022-12-14 13:44 ` [PULL 10/51] block: Fix locking for bdrv_reopen_queue_child() Kevin Wolf
2022-12-14 13:44 ` [PULL 11/51] block: Drain individual nodes during reopen Kevin Wolf
2022-12-14 13:44 ` [PULL 12/51] block: Don't use subtree drains in bdrv_drop_intermediate() Kevin Wolf
2022-12-14 13:44 ` [PULL 13/51] stream: Replace subtree drain with a single node drain Kevin Wolf
2022-12-14 13:44 ` [PULL 14/51] block: Remove subtree drains Kevin Wolf
2022-12-14 13:44 ` [PULL 15/51] block: Call drain callbacks only once Kevin Wolf
2022-12-14 13:44 ` [PULL 16/51] block: Remove ignore_bds_parents parameter from drain_begin/end Kevin Wolf
2022-12-14 13:44 ` [PULL 17/51] block: Drop out of coroutine in bdrv_do_drained_begin_quiesce() Kevin Wolf
2022-12-14 13:44 ` [PULL 18/51] block: Don't poll in bdrv_replace_child_noperm() Kevin Wolf
2022-12-14 13:44 ` [PULL 19/51] block: Remove poll parameter from bdrv_parent_drained_begin_single() Kevin Wolf
2022-12-14 13:44 ` [PULL 20/51] block-io: introduce coroutine_fn duplicates for bdrv_common_block_status_above callers Kevin Wolf
2022-12-14 13:44 ` [PULL 21/51] block-copy: add coroutine_fn annotations Kevin Wolf
2022-12-14 13:44 ` [PULL 22/51] nbd/server.c: " Kevin Wolf
2022-12-14 13:44 ` [PULL 23/51] block-backend: replace bdrv_*_above with blk_*_above Kevin Wolf
2022-12-14 13:44 ` [PULL 24/51] block/vmdk: add coroutine_fn annotations Kevin Wolf
2022-12-14 13:44 ` [PULL 25/51] block: avoid duplicating filename string in bdrv_create Kevin Wolf
2022-12-14 13:44 ` [PULL 26/51] block: distinguish between bdrv_create running in coroutine and not Kevin Wolf
2022-12-14 13:44 ` [PULL 27/51] block: bdrv_create_file is a coroutine_fn Kevin Wolf
2022-12-14 13:44 ` [PULL 28/51] block: rename generated_co_wrapper in co_wrapper_mixed Kevin Wolf
2022-12-14 13:44 ` [PULL 29/51] block-coroutine-wrapper.py: introduce co_wrapper Kevin Wolf
2022-12-14 13:44 ` [PULL 30/51] block-coroutine-wrapper.py: support functions without bs arg Kevin Wolf
2022-12-14 13:44 ` [PULL 31/51] block-coroutine-wrapper.py: support also basic return types Kevin Wolf
2022-12-14 13:44 ` [PULL 32/51] block: convert bdrv_create to co_wrapper Kevin Wolf
2022-12-14 13:44 ` [PULL 33/51] block/dirty-bitmap: convert coroutine-only functions " Kevin Wolf
2022-12-14 13:44 ` [PULL 34/51] block: Factor out bdrv_drain_all_begin_nopoll() Kevin Wolf
2022-12-14 13:44 ` [PULL 35/51] graph-lock: Introduce a lock to protect block graph operations Kevin Wolf
2022-12-14 13:44 ` [PULL 36/51] graph-lock: Implement guard macros Kevin Wolf
2022-12-14 13:44 ` Kevin Wolf [this message]
2022-12-14 13:44 ` [PULL 38/51] Import clang-tsa.h Kevin Wolf
2022-12-14 13:44 ` [PULL 39/51] clang-tsa: Add TSA_ASSERT() macro Kevin Wolf
2022-12-14 13:44 ` [PULL 40/51] clang-tsa: Add macros for shared locks Kevin Wolf
2022-12-14 13:44 ` [PULL 41/51] configure: Enable -Wthread-safety if present Kevin Wolf
2022-12-14 13:44 ` [PULL 42/51] test-bdrv-drain: Fix incorrrect drain assumptions Kevin Wolf
2022-12-14 13:44 ` [PULL 43/51] block: Fix locking in external_snapshot_prepare() Kevin Wolf
2022-12-14 13:44 ` [PULL 44/51] block: wrlock in bdrv_replace_child_noperm Kevin Wolf
2022-12-14 13:44 ` [PULL 45/51] block: remove unnecessary assert_bdrv_graph_writable() Kevin Wolf
2022-12-14 13:44 ` [PULL 46/51] block: assert that graph read and writes are performed correctly Kevin Wolf
2022-12-14 13:44 ` [PULL 47/51] graph-lock: TSA annotations for lock/unlock functions Kevin Wolf
2022-12-14 13:44 ` [PULL 48/51] Mark assert_bdrv_graph_readable/writable() GRAPH_RD/WRLOCK Kevin Wolf
2022-12-14 13:44 ` [PULL 49/51] block-coroutine-wrapper.py: introduce annotations that take the graph rdlock Kevin Wolf
2022-12-14 13:44 ` [PULL 50/51] block: use co_wrapper_mixed_bdrv_rdlock in functions taking the rdlock Kevin Wolf
2022-12-14 13:44 ` [PULL 51/51] block: GRAPH_RDLOCK for functions only called by co_wrappers Kevin Wolf
2022-12-14 22:35 ` [PULL 00/51] Block layer patches Peter Maydell
2022-12-15 9:44 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221214134453.31665-38-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).