From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: Max Reitz <mreitz@redhat.com>,
"qemu-block@nongnu.org" <qemu-block@nongnu.org>
Cc: Kevin Wolf <kwolf@redhat.com>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH v5 24/42] block: Use child access functions for QAPI queries
Date: Tue, 18 Jun 2019 12:06:43 +0000 [thread overview]
Message-ID: <7cdd5863-e420-4816-7ca4-0148dd63993b@virtuozzo.com> (raw)
In-Reply-To: <20190612221004.2317-25-mreitz@redhat.com>
13.06.2019 1:09, Max Reitz wrote:
> query-block and query-named-block-nodes now return any filtered child
> under "backing", not just bs->backing or COW children. This is so that
> filters do not interrupt the reported backing chain. This changes the
> output for iotest 184, as the throttled node now appears as a backing
> child.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> block/qapi.c | 35 ++++++++++++++++++++---------------
> tests/qemu-iotests/184.out | 7 ++++++-
> 2 files changed, 26 insertions(+), 16 deletions(-)
>
> diff --git a/block/qapi.c b/block/qapi.c
> index 0c13c86f4e..1fd2937abc 100644
> --- a/block/qapi.c
> +++ b/block/qapi.c
> @@ -150,9 +150,13 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
> return NULL;
> }
>
> - if (bs0->drv && bs0->backing) {
> + if (bs0->drv && bdrv_filtered_child(bs0)) {
> + /*
> + * Put any filtered child here (for backwards compatibility to when
> + * we put bs0->backing here, which might be any filtered child).
> + */
> info->backing_file_depth++;
> - bs0 = bs0->backing->bs;
> + bs0 = bdrv_filtered_bs(bs0);
so, here we report all filtered filter children as backing ...
> (*p_image_info)->has_backing_image = true;
> p_image_info = &((*p_image_info)->backing_image);
> } else {
> @@ -161,9 +165,8 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
>
> /* Skip automatically inserted nodes that the user isn't aware of for
> * query-block (blk != NULL), but not for query-named-block-nodes */
> - while (blk && bs0->drv && bs0->implicit) {
> - bs0 = backing_bs(bs0);
> - assert(bs0);
> + if (blk) {
> + bs0 = bdrv_skip_implicit_filters(bs0);
> }
> }
>
> @@ -348,9 +351,9 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info,
> BlockDriverState *bs = blk_bs(blk);
> char *qdev;
>
> - /* Skip automatically inserted nodes that the user isn't aware of */
> - while (bs && bs->drv && bs->implicit) {
> - bs = backing_bs(bs);
> + if (bs) {
> + /* Skip automatically inserted nodes that the user isn't aware of */
> + bs = bdrv_skip_implicit_filters(bs);
> }
>
> info->device = g_strdup(blk_name(blk));
> @@ -507,6 +510,7 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk)
> static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs,
> bool blk_level)
> {
> + BlockDriverState *storage_bs, *cow_bs;
> BlockStats *s = NULL;
>
> s = g_malloc0(sizeof(*s));
> @@ -519,9 +523,8 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs,
> /* Skip automatically inserted nodes that the user isn't aware of in
> * a BlockBackend-level command. Stay at the exact node for a node-level
> * command. */
> - while (blk_level && bs->drv && bs->implicit) {
> - bs = backing_bs(bs);
> - assert(bs);
> + if (blk_level) {
> + bs = bdrv_skip_implicit_filters(bs);
> }
>
> if (bdrv_get_node_name(bs)[0]) {
> @@ -531,14 +534,16 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs,
>
> s->stats->wr_highest_offset = stat64_get(&bs->wr_highest_offset);
>
> - if (bs->file) {
> + storage_bs = bdrv_storage_bs(bs);
> + if (storage_bs) {
> s->has_parent = true;
> - s->parent = bdrv_query_bds_stats(bs->file->bs, blk_level);
> + s->parent = bdrv_query_bds_stats(storage_bs, blk_level);
... and here not as "backing" but as "parent"
Shouldn't we report filter-child as backing here too, for consistency?
anyway:
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> }
>
> - if (blk_level && bs->backing) {
> + cow_bs = bdrv_filtered_cow_bs(bs);
> + if (blk_level && cow_bs) {
> s->has_backing = true;
> - s->backing = bdrv_query_bds_stats(bs->backing->bs, blk_level);
> + s->backing = bdrv_query_bds_stats(cow_bs, blk_level);
> }
>
> return s;
> diff --git a/tests/qemu-iotests/184.out b/tests/qemu-iotests/184.out
> index 3deb3cfb94..1d61f7e224 100644
> --- a/tests/qemu-iotests/184.out
> +++ b/tests/qemu-iotests/184.out
> @@ -27,6 +27,11 @@ Testing:
> "iops_rd": 0,
> "detect_zeroes": "off",
> "image": {
> + "backing-image": {
> + "virtual-size": 1073741824,
> + "filename": "null-co://",
> + "format": "null-co"
> + },
> "virtual-size": 1073741824,
> "filename": "json:{\"throttle-group\": \"group0\", \"driver\": \"throttle\", \"file\": {\"driver\": \"null-co\"}}",
> "format": "throttle"
> @@ -34,7 +39,7 @@ Testing:
> "iops_wr": 0,
> "ro": false,
> "node-name": "throttle0",
> - "backing_file_depth": 0,
> + "backing_file_depth": 1,
> "drv": "throttle",
> "iops": 0,
> "bps_wr": 0,
>
--
Best regards,
Vladimir
next prev parent reply other threads:[~2019-06-18 12:10 UTC|newest]
Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 22:09 [Qemu-devel] [PATCH v5 00/42] block: Deal with filters Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 01/42] block: Mark commit and mirror as filter drivers Max Reitz
2019-06-13 10:47 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 02/42] copy-on-read: Support compressed writes Max Reitz
2019-06-13 10:49 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 03/42] throttle: " Max Reitz
2019-06-13 10:51 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 04/42] block: Add child access functions Max Reitz
2019-06-13 12:15 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 05/42] block: Add chain helper functions Max Reitz
2019-06-13 12:26 ` Vladimir Sementsov-Ogievskiy
2019-06-13 12:33 ` Max Reitz
2019-06-13 12:39 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 06/42] qcow2: Implement .bdrv_storage_child() Max Reitz
2019-06-13 12:27 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 07/42] block: *filtered_cow_child() for *has_zero_init() Max Reitz
2019-06-13 12:34 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 08/42] block: bdrv_set_backing_hd() is about bs->backing Max Reitz
2019-06-13 12:40 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 09/42] block: Include filters when freezing backing chain Max Reitz
2019-06-13 13:04 ` Vladimir Sementsov-Ogievskiy
2019-06-13 14:05 ` Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 10/42] block: Use CAF in bdrv_is_encrypted() Max Reitz
2019-06-13 13:16 ` Vladimir Sementsov-Ogievskiy
2019-06-13 14:15 ` Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 11/42] block: Add bdrv_supports_compressed_writes() Max Reitz
2019-06-13 13:29 ` Vladimir Sementsov-Ogievskiy
2019-06-13 14:19 ` Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 12/42] block: Use bdrv_filtered_rw* where obvious Max Reitz
2019-06-13 13:37 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 13/42] block: Use CAFs in block status functions Max Reitz
2019-06-14 12:07 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 14/42] block: Use CAFs when working with backing chains Max Reitz
2019-06-14 13:26 ` Vladimir Sementsov-Ogievskiy
2019-06-14 13:50 ` Max Reitz
2019-06-14 14:31 ` Vladimir Sementsov-Ogievskiy
2019-06-14 16:02 ` Max Reitz
2019-06-14 16:39 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 15/42] block: Re-evaluate backing file handling in reopen Max Reitz
2019-06-14 13:42 ` Vladimir Sementsov-Ogievskiy
2019-06-14 15:52 ` Max Reitz
2019-06-14 16:43 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 16/42] block: Use child access functions when flushing Max Reitz
2019-06-14 14:01 ` Vladimir Sementsov-Ogievskiy
2019-06-14 15:55 ` Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 17/42] block: Use CAFs in bdrv_refresh_limits() Max Reitz
2019-06-14 15:04 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 18/42] block: Use CAFs in bdrv_refresh_filename() Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 19/42] block: Use CAF in bdrv_co_rw_vmstate() Max Reitz
2019-06-14 15:14 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 20/42] block/snapshot: Fall back to storage child Max Reitz
2019-06-14 15:22 ` Vladimir Sementsov-Ogievskiy
2019-06-14 16:10 ` Max Reitz
2019-06-14 16:47 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 21/42] block: Use CAFs for debug breakpoints Max Reitz
2019-06-14 15:29 ` Vladimir Sementsov-Ogievskiy
2019-06-14 16:12 ` Max Reitz
2019-06-14 20:28 ` Eric Blake
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 22/42] block: Use CAFs in bdrv_get_allocated_file_size() Max Reitz
2019-06-12 22:17 ` Max Reitz
2019-06-14 15:41 ` Vladimir Sementsov-Ogievskiy
2019-06-14 16:15 ` Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 23/42] blockdev: Use CAF in external_snapshot_prepare() Max Reitz
2019-06-14 15:46 ` Vladimir Sementsov-Ogievskiy
2019-06-14 16:20 ` Max Reitz
2019-06-14 16:58 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 24/42] block: Use child access functions for QAPI queries Max Reitz
2019-06-18 12:06 ` Vladimir Sementsov-Ogievskiy [this message]
2019-06-18 14:22 ` Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 25/42] mirror: Deal with filters Max Reitz
2019-06-18 13:12 ` Vladimir Sementsov-Ogievskiy
2019-06-18 14:47 ` Max Reitz
2019-06-18 14:55 ` Vladimir Sementsov-Ogievskiy
2019-06-18 15:20 ` Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 26/42] backup: " Max Reitz
2019-06-18 13:45 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 27/42] commit: " Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 28/42] stream: " Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 29/42] nbd: Use CAF when looking for dirty bitmap Max Reitz
2019-06-18 13:58 ` Vladimir Sementsov-Ogievskiy
2019-06-18 14:48 ` Eric Blake
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 30/42] qemu-img: Use child access functions Max Reitz
2019-06-19 9:18 ` Vladimir Sementsov-Ogievskiy
2019-06-19 15:49 ` Max Reitz
2019-06-21 13:15 ` Vladimir Sementsov-Ogievskiy
2019-07-24 9:54 ` Vladimir Sementsov-Ogievskiy
2019-07-25 16:34 ` Max Reitz
2019-07-26 13:44 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 31/42] block: Drop backing_bs() Max Reitz
2019-06-19 9:18 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 32/42] block: Make bdrv_get_cumulative_perm() public Max Reitz
2019-06-19 9:19 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 33/42] blockdev: Fix active commit choice Max Reitz
2019-06-19 9:31 ` Vladimir Sementsov-Ogievskiy
2019-06-19 15:59 ` Max Reitz
2019-06-21 13:26 ` Vladimir Sementsov-Ogievskiy
2019-07-24 9:54 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 34/42] block: Inline bdrv_co_block_status_from_*() Max Reitz
2019-06-19 9:34 ` Vladimir Sementsov-Ogievskiy
2019-06-19 16:01 ` Max Reitz
2019-06-19 16:07 ` Max Reitz
2019-06-21 13:39 ` Vladimir Sementsov-Ogievskiy
2019-07-24 9:54 ` Vladimir Sementsov-Ogievskiy
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 35/42] block: Fix check_to_replace_node() Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 36/42] iotests: Add tests for mirror @replaces loops Max Reitz
2019-06-12 22:09 ` [Qemu-devel] [PATCH v5 37/42] block: Leave BDS.backing_file constant Max Reitz
2019-06-12 22:10 ` [Qemu-devel] [PATCH v5 38/42] iotests: Let complete_and_wait() work with commit Max Reitz
2019-06-12 22:10 ` [Qemu-devel] [PATCH v5 39/42] iotests: Add filter commit test cases Max Reitz
2019-06-12 22:10 ` [Qemu-devel] [PATCH v5 40/42] iotests: Add filter mirror " Max Reitz
2019-06-12 22:10 ` [Qemu-devel] [PATCH v5 41/42] iotests: Add test for commit in sub directory Max Reitz
2019-06-12 22:10 ` [Qemu-devel] [PATCH v5 42/42] iotests: Test committing to overridden backing Max Reitz
2019-06-13 15:28 ` [Qemu-devel] [PATCH v5 00/42] block: Deal with filters Vladimir Sementsov-Ogievskiy
2019-06-13 16:12 ` Max Reitz
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=7cdd5863-e420-4816-7ca4-0148dd63993b@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=kwolf@redhat.com \
--cc=mreitz@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 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).