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 05/39] block: BdrvChildClass: add .get_parent_aio_context handler
Date: Fri, 30 Apr 2021 12:51:13 +0200 [thread overview]
Message-ID: <20210430105147.125840-6-kwolf@redhat.com> (raw)
In-Reply-To: <20210430105147.125840-1-kwolf@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Add new handler to get aio context and implement it in all child
classes. Add corresponding public interface to be used soon.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210428151804.439460-6-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/block/block.h | 2 ++
include/block/block_int.h | 2 ++
block.c | 13 +++++++++++++
block/block-backend.c | 9 +++++++++
blockjob.c | 8 ++++++++
5 files changed, 34 insertions(+)
diff --git a/include/block/block.h b/include/block/block.h
index b3f6e509d4..54279baa95 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -702,6 +702,8 @@ 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);
+AioContext *bdrv_child_get_parent_aio_context(BdrvChild *c);
+
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 88e4111939..737ec632c4 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -789,6 +789,8 @@ struct BdrvChildClass {
bool (*can_set_aio_ctx)(BdrvChild *child, AioContext *ctx,
GSList **ignore, Error **errp);
void (*set_aio_ctx)(BdrvChild *child, AioContext *ctx, GSList **ignore);
+
+ AioContext *(*get_parent_aio_context)(BdrvChild *child);
};
extern const BdrvChildClass child_of_bds;
diff --git a/block.c b/block.c
index 1e7e8907e4..2833912436 100644
--- a/block.c
+++ b/block.c
@@ -1394,6 +1394,13 @@ static int bdrv_child_cb_update_filename(BdrvChild *c, BlockDriverState *base,
return 0;
}
+static AioContext *bdrv_child_cb_get_parent_aio_context(BdrvChild *c)
+{
+ BlockDriverState *bs = c->opaque;
+
+ return bdrv_get_aio_context(bs);
+}
+
const BdrvChildClass child_of_bds = {
.parent_is_bds = true,
.get_parent_desc = bdrv_child_get_parent_desc,
@@ -1407,8 +1414,14 @@ const BdrvChildClass child_of_bds = {
.can_set_aio_ctx = bdrv_child_cb_can_set_aio_ctx,
.set_aio_ctx = bdrv_child_cb_set_aio_ctx,
.update_filename = bdrv_child_cb_update_filename,
+ .get_parent_aio_context = bdrv_child_cb_get_parent_aio_context,
};
+AioContext *bdrv_child_get_parent_aio_context(BdrvChild *c)
+{
+ return c->klass->get_parent_aio_context(c);
+}
+
static int bdrv_open_flags(BlockDriverState *bs, int flags)
{
int open_flags = flags;
diff --git a/block/block-backend.c b/block/block-backend.c
index 413af51f3b..3f656ef361 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -298,6 +298,13 @@ static void blk_root_detach(BdrvChild *child)
}
}
+static AioContext *blk_root_get_parent_aio_context(BdrvChild *c)
+{
+ BlockBackend *blk = c->opaque;
+
+ return blk_get_aio_context(blk);
+}
+
static const BdrvChildClass child_root = {
.inherit_options = blk_root_inherit_options,
@@ -318,6 +325,8 @@ static const BdrvChildClass child_root = {
.can_set_aio_ctx = blk_root_can_set_aio_ctx,
.set_aio_ctx = blk_root_set_aio_ctx,
+
+ .get_parent_aio_context = blk_root_get_parent_aio_context,
};
/*
diff --git a/blockjob.c b/blockjob.c
index 207e8c7fd9..160bf38b19 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -163,6 +163,13 @@ static void child_job_set_aio_ctx(BdrvChild *c, AioContext *ctx,
job->job.aio_context = ctx;
}
+static AioContext *child_job_get_parent_aio_context(BdrvChild *c)
+{
+ BlockJob *job = c->opaque;
+
+ return job->job.aio_context;
+}
+
static const BdrvChildClass child_job = {
.get_parent_desc = child_job_get_parent_desc,
.drained_begin = child_job_drained_begin,
@@ -171,6 +178,7 @@ static const BdrvChildClass child_job = {
.can_set_aio_ctx = child_job_can_set_aio_ctx,
.set_aio_ctx = child_job_set_aio_ctx,
.stay_at_node = true,
+ .get_parent_aio_context = child_job_get_parent_aio_context,
};
void block_job_remove_all_bdrv(BlockJob *job)
--
2.30.2
next prev parent reply other threads:[~2021-04-30 11:27 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 10:51 [PULL 00/39] Block layer patches Kevin Wolf
2021-04-30 10:51 ` [PULL 01/39] tests/test-bdrv-graph-mod: add test_parallel_exclusive_write Kevin Wolf
2021-04-30 10:51 ` [PULL 02/39] tests/test-bdrv-graph-mod: add test_parallel_perm_update Kevin Wolf
2021-04-30 10:51 ` [PULL 03/39] tests/test-bdrv-graph-mod: add test_append_greedy_filter Kevin Wolf
2021-04-30 10:51 ` [PULL 04/39] block: bdrv_append(): don't consume reference Kevin Wolf
2021-04-30 10:51 ` Kevin Wolf [this message]
2021-04-30 10:51 ` [PULL 06/39] block: drop ctx argument from bdrv_root_attach_child Kevin Wolf
2021-04-30 10:51 ` [PULL 07/39] block: make bdrv_reopen_{prepare,commit,abort} private Kevin Wolf
2021-04-30 10:51 ` [PULL 08/39] util: add transactions.c Kevin Wolf
2021-04-30 10:51 ` [PULL 09/39] block: bdrv_refresh_perms: check for parents permissions conflict Kevin Wolf
2021-04-30 10:51 ` [PULL 10/39] block: refactor bdrv_child* permission functions Kevin Wolf
2021-04-30 10:51 ` [PULL 11/39] block: rewrite bdrv_child_try_set_perm() using bdrv_refresh_perms() Kevin Wolf
2021-04-30 10:51 ` [PULL 12/39] block: inline bdrv_child_*() permission functions calls Kevin Wolf
2021-04-30 10:51 ` [PULL 13/39] block: use topological sort for permission update Kevin Wolf
2021-04-30 10:51 ` [PULL 14/39] block: add bdrv_drv_set_perm transaction action Kevin Wolf
2021-04-30 10:51 ` [PULL 15/39] block: add bdrv_list_* permission update functions Kevin Wolf
2021-04-30 10:51 ` [PULL 16/39] block: add bdrv_replace_child_safe() transaction action Kevin Wolf
2021-04-30 10:51 ` [PULL 17/39] block: fix bdrv_replace_node_common Kevin Wolf
2021-04-30 10:51 ` [PULL 18/39] block: add bdrv_attach_child_common() transaction action Kevin Wolf
2021-04-30 22:33 ` Peter Maydell
2021-04-30 10:51 ` [PULL 19/39] block: add bdrv_attach_child_noperm() " Kevin Wolf
2021-04-30 10:51 ` [PULL 20/39] block: split out bdrv_replace_node_noperm() Kevin Wolf
2021-04-30 10:51 ` [PULL 21/39] block: adapt bdrv_append() for inserting filters Kevin Wolf
2021-04-30 10:51 ` [PULL 22/39] block: add bdrv_remove_filter_or_cow transaction action Kevin Wolf
2021-04-30 10:51 ` [PULL 23/39] block: introduce bdrv_drop_filter() Kevin Wolf
2021-04-30 10:51 ` [PULL 24/39] block/backup-top: drop .active Kevin Wolf
2021-04-30 10:51 ` [PULL 25/39] block: drop ignore_children for permission update functions Kevin Wolf
2021-04-30 10:51 ` [PULL 26/39] block: make bdrv_unset_inherits_from to be a transaction action Kevin Wolf
2021-04-30 10:51 ` [PULL 27/39] block: make bdrv_refresh_limits() " Kevin Wolf
2021-04-30 10:51 ` [PULL 28/39] block: add bdrv_set_backing_noperm() " Kevin Wolf
2021-04-30 10:51 ` [PULL 29/39] block: bdrv_reopen_multiple(): move bdrv_flush to separate pre-prepare Kevin Wolf
2021-04-30 10:51 ` [PULL 30/39] block: bdrv_reopen_multiple: refresh permissions on updated graph Kevin Wolf
2021-04-30 22:38 ` Peter Maydell
2021-04-30 10:51 ` [PULL 31/39] block: drop unused permission update functions Kevin Wolf
2021-04-30 10:51 ` [PULL 32/39] block: inline bdrv_check_perm_common() Kevin Wolf
2021-04-30 10:51 ` [PULL 33/39] block: inline bdrv_replace_child() Kevin Wolf
2021-04-30 10:51 ` [PULL 34/39] block: refactor bdrv_child_set_perm_safe() transaction action Kevin Wolf
2021-04-30 10:51 ` [PULL 35/39] block: rename bdrv_replace_child_safe() to bdrv_replace_child() Kevin Wolf
2021-04-30 10:51 ` [PULL 36/39] block: refactor bdrv_node_check_perm() Kevin Wolf
2021-04-30 10:51 ` [PULL 37/39] block: Add BDRV_O_NO_SHARE for blk_new_open() Kevin Wolf
2021-04-30 10:51 ` [PULL 38/39] qemu-img convert: Unshare write permission for source Kevin Wolf
2021-04-30 10:51 ` [PULL 39/39] vhost-user-blk: Fail gracefully on too large queue size Kevin Wolf
2021-04-30 15:00 ` [PULL 00/39] 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=20210430105147.125840-6-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).