From: Hanna Reitz <hreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Hanna Reitz <hreitz@redhat.com>,
Kevin Wolf <kwolf@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PATCH v2 0/3] block: Start/end drain on correct AioContext
Date: Mon, 7 Nov 2022 16:13:18 +0100 [thread overview]
Message-ID: <20221107151321.211175-1-hreitz@redhat.com> (raw)
Hi,
v1 cover letter:
https://lists.nongnu.org/archive/html/qemu-block/2022-09/msg00389.html
bdrv_replace_child_noperm() drains the child via
bdrv_parent_drained_{begin,end}_single(). When it removes a child, the
bdrv_parent_drained_end_single() at its end will be called on an empty
child, making the BDRV_POLL_WHILE() in it poll the main AioContext
(because c->bs is NULL).
Thatâs wrong, though, because itâs supposed to operate on the parent.
bdrv_parent_drained_end_single_no_poll() will have scheduled any BHs in
the parentsâ AioContext, which may be anything, not necessarily the main
context. Therefore, we must poll the parentâs context.
Patch 3 does this for both bdrv_parent_drained_{begin,end}_single().
Patch 1 ensures that we can legally call
bdrv_child_get_parent_aio_context() from those I/O context functions,
and patch 2 fixes blk_do_set_aio_context() to not cause an assertion
failure if it beginning a drain can end up in blk_get_aio_context()
before blk->ctx has been updated.
v2:
- Patch 1:
- Move bdrv_child_get_parent_aio_context() from block-global-state.h
to block-io.h
- Move BdrvChildClass.get_parent_aio_context into the I/O code section
- Mark blk_root_get_parent_aio_context() as I/O code
- Mark child_job_get_parent_aio_context(), and lock the job mutex,
which we now need to do (as of 3ed4f708fe1)
- Patch 2:
- Added comment similar to Kevinâs suggestion
(Still decided to take Kevinâs R-b, even though I didnât use the
literal suggestion, but made it a bit more verbose)
Hanna Reitz (3):
block: Make bdrv_child_get_parent_aio_context I/O
block-backend: Update ctx immediately after root
block: Start/end drain on correct AioContext
include/block/block-global-state.h | 1 -
include/block/block-io.h | 2 ++
include/block/block_int-common.h | 4 ++--
block.c | 2 +-
block/block-backend.c | 9 ++++++++-
block/io.c | 6 ++++--
blockjob.c | 3 ++-
7 files changed, 19 insertions(+), 8 deletions(-)
--
2.36.1
next reply other threads:[~2022-11-07 15:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-07 15:13 Hanna Reitz [this message]
2022-11-07 15:13 ` [PATCH v2 1/3] block: Make bdrv_child_get_parent_aio_context I/O Hanna Reitz
2022-11-07 15:13 ` [PATCH v2 2/3] block-backend: Update ctx immediately after root Hanna Reitz
2022-11-07 15:13 ` [PATCH v2 3/3] block: Start/end drain on correct AioContext Hanna Reitz
2022-11-08 14:13 ` [PATCH v2 0/3] " Kevin Wolf
2022-11-08 14:23 ` Kevin Wolf
2022-11-10 14:01 ` Kevin Wolf
2022-11-10 16:11 ` Hanna Reitz
2022-11-10 17:46 ` 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=20221107151321.211175-1-hreitz@redhat.com \
--to=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.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).