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 36/51] graph-lock: Implement guard macros
Date: Wed, 14 Dec 2022 14:44:38 +0100 [thread overview]
Message-ID: <20221214134453.31665-37-kwolf@redhat.com> (raw)
In-Reply-To: <20221214134453.31665-1-kwolf@redhat.com>
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Similar to the implementation in lockable.h, implement macros to
automatically take and release the rdlock.
Create the empty GraphLockable and GraphLockableMainloop structs only to
use it as a type for G_DEFINE_AUTOPTR_CLEANUP_FUNC.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20221207131838.239125-4-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/graph-lock.h | 66 ++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/include/block/graph-lock.h b/include/block/graph-lock.h
index 82edb62cfa..b27d8a5fb1 100644
--- a/include/block/graph-lock.h
+++ b/include/block/graph-lock.h
@@ -135,5 +135,71 @@ void coroutine_fn bdrv_graph_co_rdunlock(void);
void bdrv_graph_rdlock_main_loop(void);
void bdrv_graph_rdunlock_main_loop(void);
+typedef struct GraphLockable { } GraphLockable;
+
+/*
+ * In C, compound literals have the lifetime of an automatic variable.
+ * In C++ it would be different, but then C++ wouldn't need QemuLockable
+ * either...
+ */
+#define GML_OBJ_() (&(GraphLockable) { })
+
+static inline GraphLockable *graph_lockable_auto_lock(GraphLockable *x)
+{
+ bdrv_graph_co_rdlock();
+ return x;
+}
+
+static inline void graph_lockable_auto_unlock(GraphLockable *x)
+{
+ bdrv_graph_co_rdunlock();
+}
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GraphLockable, graph_lockable_auto_unlock)
+
+#define WITH_GRAPH_RDLOCK_GUARD_(var) \
+ for (g_autoptr(GraphLockable) var = graph_lockable_auto_lock(GML_OBJ_()); \
+ var; \
+ graph_lockable_auto_unlock(var), var = NULL)
+
+#define WITH_GRAPH_RDLOCK_GUARD() \
+ WITH_GRAPH_RDLOCK_GUARD_(glue(graph_lockable_auto, __COUNTER__))
+
+#define GRAPH_RDLOCK_GUARD(x) \
+ g_autoptr(GraphLockable) \
+ glue(graph_lockable_auto, __COUNTER__) G_GNUC_UNUSED = \
+ graph_lockable_auto_lock(GML_OBJ_())
+
+
+typedef struct GraphLockableMainloop { } GraphLockableMainloop;
+
+/*
+ * In C, compound literals have the lifetime of an automatic variable.
+ * In C++ it would be different, but then C++ wouldn't need QemuLockable
+ * either...
+ */
+#define GMLML_OBJ_() (&(GraphLockableMainloop) { })
+
+static inline GraphLockableMainloop *
+graph_lockable_auto_lock_mainloop(GraphLockableMainloop *x)
+{
+ bdrv_graph_rdlock_main_loop();
+ return x;
+}
+
+static inline void
+graph_lockable_auto_unlock_mainloop(GraphLockableMainloop *x)
+{
+ bdrv_graph_rdunlock_main_loop();
+}
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GraphLockableMainloop,
+ graph_lockable_auto_unlock_mainloop)
+
+#define GRAPH_RDLOCK_GUARD_MAINLOOP(x) \
+ g_autoptr(GraphLockableMainloop) \
+ glue(graph_lockable_auto, __COUNTER__) G_GNUC_UNUSED = \
+ graph_lockable_auto_lock_mainloop(GMLML_OBJ_())
+
#endif /* GRAPH_LOCK_H */
--
2.38.1
next prev parent reply other threads:[~2022-12-14 13:49 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 ` Kevin Wolf [this message]
2022-12-14 13:44 ` [PULL 37/51] async: Register/unregister aiocontext in graph lock list Kevin Wolf
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-37-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).