From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, marcandre.lureau@gmail.com, armbru@redhat.com,
qemu-devel@nongnu.org
Subject: [PATCH v6 00/12] monitor: Optionally run handlers in coroutines
Date: Thu, 28 May 2020 17:37:30 +0200 [thread overview]
Message-ID: <20200528153742.274164-1-kwolf@redhat.com> (raw)
Some QMP command handlers can block the main loop for a relatively long
time, for example because they perform some I/O. This is quite nasty.
Allowing such handlers to run in a coroutine where they can yield (and
therefore release the BQL) while waiting for an event such as I/O
completion solves the problem.
This series adds the infrastructure to allow this and switches
block_resize to run in a coroutine as a first example.
This is an alternative solution to Marc-André's "monitor: add
asynchronous command type" series.
v6:
- Fixed cur_mon behaviour: It should always point to the Monitor while
we're in the handler coroutine, but be NULL while the handler
coroutines has yielded. [Markus]
- Give HMP handlers the coroutine option, too, because they will call
QMP handlers, and life is easier when we know whether we are in
coroutine context or not.
- Fixed block_resize for block devices in iothreads and for HMP
- Resolved some merge conflict with QAPI generator and monitor
refactorings that were merged in the meantime
v5:
- Improved comments and documentation [Markus]
v4:
- Forbid 'oob': true, 'coroutine': true [Markus]
- Removed Python type hints [Markus]
- Introduced separate bool qmp_dispatcher_co_shutdown to make it clearer
how a shutdown request is signalled to the dispatcher [Markus]
- Allow using aio_poll() with iohandler_ctx and use that instead of
aio_bh_poll() [Markus]
- Removed coroutine_fn from qmp_block_resize() again because at least
one caller (HMP) calls it outside of coroutine context [Markus]
- Tried to make the synchronisation between dispatcher and the monitor
thread clearer, and fixed a race condition
- Improved documentation and comments
v3:
- Fix race between monitor thread and dispatcher that could schedule the
dispatcher coroutine twice if a second requests comes in before the
dispatcher can wake up [Patchew]
v2:
- Fix typo in a commit message [Eric]
- Use hyphen instead of underscore for the test command [Eric]
- Mark qmp_block_resize() as coroutine_fn [Stefan]
Kevin Wolf (12):
monitor: Add Monitor parameter to monitor_set_cpu()
monitor: Use getter/setter functions for cur_mon
hmp: Set cur_mon only in handle_hmp_command()
qmp: Assert that no other monitor is active
qmp: Call monitor_set_cur() only in qmp_dispatch()
monitor: Make current monitor a per-coroutine property
qapi: Add a 'coroutine' flag for commands
qmp: Move dispatcher to a coroutine
hmp: Add support for coroutine command handlers
util/async: Add aio_co_reschedule_self()
block: Add bdrv_co_move_to_aio_context()
block: Convert 'block_resize' to coroutine
qapi/block-core.json | 3 +-
docs/devel/qapi-code-gen.txt | 12 +++
include/block/aio.h | 10 ++
include/block/block.h | 6 ++
include/monitor/monitor.h | 5 +-
include/qapi/qmp/dispatch.h | 5 +-
monitor/monitor-internal.h | 7 +-
audio/wavcapture.c | 8 +-
block.c | 10 ++
blockdev.c | 13 ++-
dump/dump.c | 2 +-
hw/scsi/vhost-scsi.c | 2 +-
hw/virtio/vhost-vsock.c | 2 +-
migration/fd.c | 4 +-
monitor/hmp-cmds.c | 2 +-
monitor/hmp.c | 51 +++++++---
monitor/misc.c | 21 ++--
monitor/monitor.c | 87 ++++++++++++++--
monitor/qmp-cmds-control.c | 2 +
monitor/qmp-cmds.c | 2 +-
monitor/qmp.c | 130 +++++++++++++++++-------
net/socket.c | 2 +-
net/tap.c | 6 +-
qapi/qmp-dispatch.c | 52 +++++++++-
qapi/qmp-registry.c | 3 +
qga/main.c | 2 +-
stubs/monitor-core.c | 9 +-
tests/test-qmp-cmds.c | 10 +-
tests/test-util-sockets.c | 22 ++--
trace/control.c | 2 +-
util/aio-posix.c | 8 +-
util/async.c | 30 ++++++
util/qemu-error.c | 4 +-
util/qemu-print.c | 3 +-
util/qemu-sockets.c | 1 +
scripts/qapi/commands.py | 10 +-
scripts/qapi/doc.py | 2 +-
scripts/qapi/expr.py | 10 +-
scripts/qapi/introspect.py | 2 +-
scripts/qapi/schema.py | 12 ++-
tests/qapi-schema/test-qapi.py | 7 +-
hmp-commands.hx | 1 +
tests/Makefile.include | 1 +
tests/qapi-schema/oob-coroutine.err | 2 +
tests/qapi-schema/oob-coroutine.json | 2 +
tests/qapi-schema/oob-coroutine.out | 0
tests/qapi-schema/qapi-schema-test.json | 1 +
tests/qapi-schema/qapi-schema-test.out | 2 +
48 files changed, 454 insertions(+), 136 deletions(-)
create mode 100644 tests/qapi-schema/oob-coroutine.err
create mode 100644 tests/qapi-schema/oob-coroutine.json
create mode 100644 tests/qapi-schema/oob-coroutine.out
--
2.25.4
next reply other threads:[~2020-05-28 15:39 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 15:37 Kevin Wolf [this message]
2020-05-28 15:37 ` [PATCH v6 01/12] monitor: Add Monitor parameter to monitor_set_cpu() Kevin Wolf
2020-05-28 18:24 ` Eric Blake
2020-08-04 11:19 ` Markus Armbruster
2020-05-28 15:37 ` [PATCH v6 02/12] monitor: Use getter/setter functions for cur_mon Kevin Wolf
2020-05-28 18:31 ` Eric Blake
2020-06-02 13:36 ` Kevin Wolf
2020-05-28 18:36 ` Eric Blake
2020-08-04 12:46 ` Markus Armbruster
2020-08-04 16:16 ` Kevin Wolf
2020-08-05 7:19 ` Markus Armbruster
2020-08-05 8:25 ` Kevin Wolf
2020-08-05 4:45 ` Markus Armbruster
2020-05-28 15:37 ` [PATCH v6 03/12] hmp: Set cur_mon only in handle_hmp_command() Kevin Wolf
2020-05-28 18:37 ` Eric Blake
2020-08-04 12:54 ` Markus Armbruster
2020-05-28 15:37 ` [PATCH v6 04/12] qmp: Assert that no other monitor is active Kevin Wolf
2020-05-28 18:38 ` Eric Blake
2020-08-04 12:57 ` Markus Armbruster
2020-05-28 15:37 ` [PATCH v6 05/12] qmp: Call monitor_set_cur() only in qmp_dispatch() Kevin Wolf
2020-05-28 18:42 ` Eric Blake
2020-08-04 13:17 ` Markus Armbruster
2020-05-28 15:37 ` [PATCH v6 06/12] monitor: Make current monitor a per-coroutine property Kevin Wolf
2020-05-28 18:44 ` Eric Blake
2020-08-04 13:50 ` Markus Armbruster
2020-08-04 16:06 ` Kevin Wolf
2020-08-05 7:28 ` Markus Armbruster
2020-08-05 8:32 ` Kevin Wolf
2020-08-07 13:09 ` Ways to do per-coroutine properties (was: [PATCH v6 06/12] monitor: Make current monitor a per-coroutine property) Markus Armbruster
2020-08-07 13:27 ` [PATCH] Simple & stupid coroutine-aware monitor_cur() Markus Armbruster
2020-08-10 12:19 ` Kevin Wolf
2020-08-26 12:37 ` Markus Armbruster
2020-08-07 13:29 ` [PATCH] Coroutine-aware monitor_cur() with coroutine-specific data Markus Armbruster
2020-08-10 12:58 ` Kevin Wolf
2020-08-26 12:40 ` Markus Armbruster
2020-08-26 13:49 ` Kevin Wolf
2020-08-04 16:14 ` [PATCH v6 06/12] monitor: Make current monitor a per-coroutine property Daniel P. Berrangé
2020-05-28 15:37 ` [PATCH v6 07/12] qapi: Add a 'coroutine' flag for commands Kevin Wolf
2020-05-28 15:37 ` [PATCH v6 08/12] qmp: Move dispatcher to a coroutine Kevin Wolf
2020-08-05 10:03 ` Markus Armbruster
2020-05-28 15:37 ` [PATCH v6 09/12] hmp: Add support for coroutine command handlers Kevin Wolf
2020-08-05 10:33 ` Markus Armbruster
2020-05-28 15:37 ` [PATCH v6 10/12] util/async: Add aio_co_reschedule_self() Kevin Wolf
2020-05-28 15:37 ` [PATCH v6 11/12] block: Add bdrv_co_move_to_aio_context() Kevin Wolf
2020-05-28 15:37 ` [PATCH v6 12/12] block: Convert 'block_resize' to coroutine Kevin Wolf
2020-08-04 11:16 ` [PATCH v6 00/12] monitor: Optionally run handlers in coroutines Markus Armbruster
2020-08-05 11:34 ` Markus Armbruster
2020-09-03 10:49 ` Markus Armbruster
2020-09-03 12:45 ` Kevin Wolf
2020-09-03 14:17 ` Markus Armbruster
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=20200528153742.274164-1-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=armbru@redhat.com \
--cc=marcandre.lureau@gmail.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).