From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 07/24] block: Add bdrv_try_set_aio_context()
Date: Mon, 20 May 2019 18:14:36 +0200 [thread overview]
Message-ID: <20190520161453.30723-8-kwolf@redhat.com> (raw)
In-Reply-To: <20190520161453.30723-1-kwolf@redhat.com>
Eventually, we want to make sure that all parents and all children of a
node are in the same AioContext as the node itself. This means that
changing the AioContext may fail because one of the other involved
parties (e.g. a guest device that was configured with an iothread)
cannot allow switching to a different AioContext.
Introduce a set of functions that allow to first check whether all
involved nodes can switch to a new context and only then do the actual
switch. The check recursively covers children and parents.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/block.h | 8 ++++
include/block/block_int.h | 3 ++
block.c | 92 +++++++++++++++++++++++++++++++++++++++
3 files changed, 103 insertions(+)
diff --git a/include/block/block.h b/include/block/block.h
index 5e2b98b0ee..fc0239a887 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -586,6 +586,14 @@ void bdrv_coroutine_enter(BlockDriverState *bs, Coroutine *co);
* This function must be called with iothread lock held.
*/
void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context);
+int bdrv_try_set_aio_context(BlockDriverState *bs, AioContext *ctx,
+ Error **errp);
+int bdrv_child_try_set_aio_context(BlockDriverState *bs, AioContext *ctx,
+ BdrvChild *ignore_child, Error **errp);
+bool bdrv_child_can_set_aio_context(BdrvChild *c, AioContext *ctx,
+ GSList **ignore, Error **errp);
+bool bdrv_can_set_aio_context(BlockDriverState *bs, AioContext *ctx,
+ GSList **ignore, Error **errp);
int bdrv_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz);
int bdrv_probe_geometry(BlockDriverState *bs, HDGeometry *geo);
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 94d45c9708..b150c5f047 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -691,6 +691,9 @@ struct BdrvChildRole {
* can update its reference. */
int (*update_filename)(BdrvChild *child, BlockDriverState *new_base,
const char *filename, Error **errp);
+
+ bool (*can_set_aio_ctx)(BdrvChild *child, AioContext *ctx,
+ GSList **ignore, Error **errp);
};
extern const BdrvChildRole child_file;
diff --git a/block.c b/block.c
index 6999aad446..8ff6ab1152 100644
--- a/block.c
+++ b/block.c
@@ -936,6 +936,13 @@ static int bdrv_child_cb_inactivate(BdrvChild *child)
return 0;
}
+static bool bdrv_child_cb_can_set_aio_ctx(BdrvChild *child, AioContext *ctx,
+ GSList **ignore, Error **errp)
+{
+ BlockDriverState *bs = child->opaque;
+ return bdrv_can_set_aio_context(bs, ctx, ignore, errp);
+}
+
/*
* Returns the options and flags that a temporary snapshot should get, based on
* the originally requested flags (the originally requested image will have
@@ -1003,6 +1010,7 @@ const BdrvChildRole child_file = {
.attach = bdrv_child_cb_attach,
.detach = bdrv_child_cb_detach,
.inactivate = bdrv_child_cb_inactivate,
+ .can_set_aio_ctx = bdrv_child_cb_can_set_aio_ctx,
};
/*
@@ -1029,6 +1037,7 @@ const BdrvChildRole child_format = {
.attach = bdrv_child_cb_attach,
.detach = bdrv_child_cb_detach,
.inactivate = bdrv_child_cb_inactivate,
+ .can_set_aio_ctx = bdrv_child_cb_can_set_aio_ctx,
};
static void bdrv_backing_attach(BdrvChild *c)
@@ -1152,6 +1161,7 @@ const BdrvChildRole child_backing = {
.drained_end = bdrv_child_cb_drained_end,
.inactivate = bdrv_child_cb_inactivate,
.update_filename = bdrv_backing_update_filename,
+ .can_set_aio_ctx = bdrv_child_cb_can_set_aio_ctx,
};
static int bdrv_open_flags(BlockDriverState *bs, int flags)
@@ -5750,6 +5760,88 @@ void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context)
aio_context_release(new_context);
}
+static bool bdrv_parent_can_set_aio_context(BdrvChild *c, AioContext *ctx,
+ GSList **ignore, Error **errp)
+{
+ if (g_slist_find(*ignore, c)) {
+ return true;
+ }
+ *ignore = g_slist_prepend(*ignore, c);
+
+ /* A BdrvChildRole that doesn't handle AioContext changes cannot
+ * tolerate any AioContext changes */
+ if (!c->role->can_set_aio_ctx) {
+ char *user = bdrv_child_user_desc(c);
+ error_setg(errp, "Changing iothreads is not supported by %s", user);
+ g_free(user);
+ return false;
+ }
+ if (!c->role->can_set_aio_ctx(c, ctx, ignore, errp)) {
+ assert(!errp || *errp);
+ return false;
+ }
+ return true;
+}
+
+bool bdrv_child_can_set_aio_context(BdrvChild *c, AioContext *ctx,
+ GSList **ignore, Error **errp)
+{
+ if (g_slist_find(*ignore, c)) {
+ return true;
+ }
+ *ignore = g_slist_prepend(*ignore, c);
+ return bdrv_can_set_aio_context(c->bs, ctx, ignore, errp);
+}
+
+/* @ignore will accumulate all visited BdrvChild object. The caller is
+ * responsible for freeing the list afterwards. */
+bool bdrv_can_set_aio_context(BlockDriverState *bs, AioContext *ctx,
+ GSList **ignore, Error **errp)
+{
+ BdrvChild *c;
+
+ if (bdrv_get_aio_context(bs) == ctx) {
+ return true;
+ }
+
+ QLIST_FOREACH(c, &bs->parents, next_parent) {
+ if (!bdrv_parent_can_set_aio_context(c, ctx, ignore, errp)) {
+ return false;
+ }
+ }
+ QLIST_FOREACH(c, &bs->children, next) {
+ if (!bdrv_child_can_set_aio_context(c, ctx, ignore, errp)) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+int bdrv_child_try_set_aio_context(BlockDriverState *bs, AioContext *ctx,
+ BdrvChild *ignore_child, Error **errp)
+{
+ GSList *ignore;
+ bool ret;
+
+ ignore = ignore_child ? g_slist_prepend(NULL, ignore_child) : NULL;
+ ret = bdrv_can_set_aio_context(bs, ctx, &ignore, errp);
+ g_slist_free(ignore);
+
+ if (!ret) {
+ return -EPERM;
+ }
+
+ bdrv_set_aio_context(bs, ctx);
+ return 0;
+}
+
+int bdrv_try_set_aio_context(BlockDriverState *bs, AioContext *ctx,
+ Error **errp)
+{
+ return bdrv_child_try_set_aio_context(bs, ctx, NULL, errp);
+}
+
void bdrv_add_aio_context_notifier(BlockDriverState *bs,
void (*attached_aio_context)(AioContext *new_context, void *opaque),
void (*detach_aio_context)(void *opaque), void *opaque)
--
2.20.1
next prev parent reply other threads:[~2019-05-20 16:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-20 16:14 [Qemu-devel] [PULL 00/24] Block layer patches Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 01/24] block/file-posix: Truncate in xfs_write_zeroes() Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 02/24] qcow2: Define and use QCOW2_COMPRESSED_SECTOR_SIZE Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 03/24] block: Use BDRV_REQUEST_MAX_BYTES instead of BDRV_REQUEST_MAX_SECTORS Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 04/24] qmp: forbid qmp_cont in RUN_STATE_FINISH_MIGRATE Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 05/24] iotest: fix 169: do not run " Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 06/24] nvme: fix copy direction in DMA reads going to CMB Kevin Wolf
2019-05-20 16:14 ` Kevin Wolf [this message]
2019-05-20 16:14 ` [Qemu-devel] [PULL 08/24] block: Make bdrv_attach/detach_aio_context() static Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 09/24] block: Move recursion to bdrv_set_aio_context() Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 10/24] block: Propagate AioContext change to parents Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 11/24] test-block-iothread: Test AioContext propagation through the tree Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 12/24] block: Implement .(can_)set_aio_ctx for BlockBackend Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 13/24] block: Add blk_set_allow_aio_context_change() Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 14/24] blockjob: Propagate AioContext change to all job nodes Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 15/24] blockjob: Remove AioContext notifiers Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 16/24] test-block-iothread: Test AioContext propagation for block jobs Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 17/24] block/file-posix: Unaligned O_DIRECT block-status Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 18/24] iotests: Test unaligned raw images with O_DIRECT Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 19/24] qemu-img.texi: Be specific about JSON object types Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 20/24] qemu-img.texi: Describe human-readable info output Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 21/24] block: Improve "Block node is read-only" message Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 22/24] iotests.py: Let assert_qmp() accept an array Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 23/24] iotests.py: Fix VM.run_job Kevin Wolf
2019-05-20 16:14 ` [Qemu-devel] [PULL 24/24] iotests: Make 245 faster and more reliable Kevin Wolf
2019-05-20 17:08 ` [Qemu-devel] [PULL 00/24] Block layer patches Peter Maydell
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=20190520161453.30723-8-kwolf@redhat.com \
--to=kwolf@redhat.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.