From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
To: qemu-block@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@virtuozzo.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
qemu-devel@nongnu.org, "John Snow" <jsnow@redhat.com>,
"Emanuele Giuseppe Esposito" <eesposit@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Markus Armbruster" <armbru@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Hanna Reitz" <hreitz@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Eric Blake" <eblake@redhat.com>
Subject: [PATCH v8 14/31] block: introduce assert_bdrv_graph_writable
Date: Thu, 3 Mar 2022 10:15:59 -0500 [thread overview]
Message-ID: <20220303151616.325444-15-eesposit@redhat.com> (raw)
In-Reply-To: <20220303151616.325444-1-eesposit@redhat.com>
We want to be sure that the functions that write the child and
parent list of a bs are under BQL and drain.
BQL prevents from concurrent writings from the GS API, while
drains protect from I/O.
TODO: drains are missing in some functions using this assert.
Therefore a proper assertion will fail. Because adding drains
requires additional discussions, they will be added in future
series.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
block.c | 4 ++++
include/block/block_int-global-state.h | 17 +++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/block.c b/block.c
index cf656e5b26..48daca835a 100644
--- a/block.c
+++ b/block.c
@@ -1420,6 +1420,7 @@ static void bdrv_child_cb_attach(BdrvChild *child)
{
BlockDriverState *bs = child->opaque;
+ assert_bdrv_graph_writable(bs);
QLIST_INSERT_HEAD(&bs->children, child, next);
if (child->role & BDRV_CHILD_COW) {
@@ -1439,6 +1440,7 @@ static void bdrv_child_cb_detach(BdrvChild *child)
bdrv_unapply_subtree_drain(child, bs);
+ assert_bdrv_graph_writable(bs);
QLIST_REMOVE(child, next);
}
@@ -2829,6 +2831,7 @@ static void bdrv_replace_child_noperm(BdrvChild **childp,
if (child->klass->detach) {
child->klass->detach(child);
}
+ assert_bdrv_graph_writable(old_bs);
QLIST_REMOVE(child, next_parent);
}
@@ -2838,6 +2841,7 @@ static void bdrv_replace_child_noperm(BdrvChild **childp,
}
if (new_bs) {
+ assert_bdrv_graph_writable(new_bs);
QLIST_INSERT_HEAD(&new_bs->parents, child, next_parent);
/*
diff --git a/include/block/block_int-global-state.h b/include/block/block_int-global-state.h
index 5078d6a6ea..0f21b0570b 100644
--- a/include/block/block_int-global-state.h
+++ b/include/block/block_int-global-state.h
@@ -309,4 +309,21 @@ void bdrv_remove_aio_context_notifier(BlockDriverState *bs,
*/
void bdrv_drain_all_end_quiesce(BlockDriverState *bs);
+/**
+ * Make sure that the function is running under both drain and BQL.
+ * The latter protects from concurrent writings
+ * from the GS API, while the former prevents concurrent reads
+ * from I/O.
+ */
+static inline void assert_bdrv_graph_writable(BlockDriverState *bs)
+{
+ /*
+ * TODO: this function is incomplete. Because the users of this
+ * assert lack the necessary drains, check only for BQL.
+ * Once the necessary drains are added,
+ * assert also for qatomic_read(&bs->quiesce_counter) > 0
+ */
+ assert(qemu_in_main_thread());
+}
+
#endif /* BLOCK_INT_GLOBAL_STATE */
--
2.31.1
next prev parent reply other threads:[~2022-03-03 15:28 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-03 15:15 [PATCH v8 00/31] block layer: split block APIs in global state and I/O Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 01/31] main-loop.h: introduce qemu_in_main_thread() Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 02/31] main loop: macros to mark GS and I/O functions Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 03/31] include/block/block: split header into I/O and global state API Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 04/31] assertions for block " Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 05/31] IO_CODE and IO_OR_GS_CODE for block I/O API Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 06/31] block/export/fuse.c: allow writable exports to take RESIZE permission Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 07/31] include/sysemu/block-backend: split header into I/O and global state (GS) API Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 08/31] block/block-backend.c: assertions for block-backend Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 09/31] IO_CODE and IO_OR_GS_CODE for block-backend I/O API Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 10/31] block.c: assertions to the block layer permissions API Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 11/31] include/block/block_int: split header into I/O and global state API Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 12/31] assertions for block_int " Emanuele Giuseppe Esposito
2022-03-03 15:15 ` [PATCH v8 13/31] IO_CODE and IO_OR_GS_CODE for block_int I/O API Emanuele Giuseppe Esposito
2022-03-03 15:15 ` Emanuele Giuseppe Esposito [this message]
2022-03-03 15:16 ` [PATCH v8 15/31] include/block/blockjob_int.h: split header into I/O and GS API Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 16/31] GS and IO CODE macros for blockjob_int.h Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 17/31] block.c: add assertions to static functions Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 18/31] include/block/blockjob.h: global state API Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 19/31] assertions for blockjob.h " Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 20/31] include/sysemu/blockdev.h: " Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 21/31] assertions for blockdev.h " Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 22/31] include/block/snapshot: global state API + assertions Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 23/31] block/copy-before-write.h: " Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 24/31] block/coroutines: I/O and "I/O or GS" API Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 25/31] block_int-common.h: split function pointers in BlockDriver Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 26/31] block_int-common.h: assertions in the callers of BlockDriver function pointers Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 27/31] block_int-common.h: split function pointers in BdrvChildClass Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 28/31] block_int-common.h: assertions in the callers of BdrvChildClass function pointers Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 29/31] block-backend-common.h: split function pointers in BlockDevOps Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 30/31] job.h: split function pointers in JobDriver Emanuele Giuseppe Esposito
2022-03-03 15:16 ` [PATCH v8 31/31] job.h: assertions in the callers of JobDriver function pointers Emanuele Giuseppe Esposito
2022-03-04 10:51 ` [PATCH v8 00/31] block layer: split block APIs in global state and I/O 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=20220303151616.325444-15-eesposit@redhat.com \
--to=eesposit@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=fam@euphon.net \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=richard.henderson@linaro.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@virtuozzo.com \
/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).