Skip to content

monitor: Optionally run handlers in coroutines

Kevin Wolf qemu-devel 8 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v8 Latest14 patches 3 repliesIn review
  2. v713 patches 47 repliesSuperseded
  3. v612 patches 30 repliesSuperseded
Earlier versions · 5
VersionPostedPatchesRepliesStatus
v54 patches12 repliesApplied
v44 patches22 repliesSuperseded
v34 patches21 repliesSuperseded
v24 patches4 repliesSuperseded
v14 patches6 repliesSuperseded

Changes in v8 from the cover letter

- Replaced bdrv_co_move_to_aio_context() with bdrv_co_enter()/leave(), added bdrv_co_lock()/unlock() and fixed the iothread support in qmp_block_resize() with the new functions [Stefan]
- More detailed documentation of 'coroutine' flag for commands [Markus]
- Improved comment for dropping out of coroutine context in qmp_dispatch() [Markus]
- Coding style changes [Markus]
- Resolve some more merge conflicts on rebase

Patches in v8 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14monitor: Add Monitor parameter to monitor_set_cpu()include/monitor/monitor.h monitor/hmp-cmds.c monitor/misc.c+7 -70 replies
2/14monitor: Add Monitor parameter to monitor_get_cpu_index()hw/core/machine-hmp-cmds.c include/monitor/monitor.h monitor/hmp-cmds.c +2 more+14 -141 reply
3/14monitor: Use getter/setter functions for cur_monaudio/wavcapture.c dump/dump.c hw/scsi/vhost-scsi.c +18 more+73 -460 replies
4/14hmp: Update current monitor only in handle_hmp_command()monitor/hmp.c monitor/misc.c+5 -100 replies
5/14qmp: Assert that no other monitor is activemonitor/qmp.c+4 -10 replies
6/14qmp: Call monitor_set_cur() only in qmp_dispatch()include/qapi/qmp/dispatch.h monitor/qmp.c qapi/qmp-dispatch.c +3 more+20 -130 replies
7/14monitor: Make current monitor a per-coroutine propertyinclude/monitor/monitor.h monitor/hmp.c monitor/monitor.c +2 more+33 -130 replies
8/14qapi: Add a 'coroutine' flag for commandsdocs/devel/qapi-code-gen.txt docs/sphinx/qapidoc.py include/qapi/qmp/dispatch.h +12 more+73 -140 replies
9/14qmp: Move dispatcher to a coroutineinclude/qapi/qmp/dispatch.h monitor/monitor-internal.h monitor/monitor.c +4 more+214 -460 replies
10/14hmp: Add support for coroutine command handlersdocs/devel/qapi-code-gen.txt monitor/hmp.c monitor/monitor-internal.h+35 -70 replies
11/14util/async: Add aio_co_reschedule_self()include/block/aio.h util/async.c+40 -00 replies
12/14block: Add bdrv_co_enter()/leave()block.c include/block/block.h+40 -00 replies
13/14block: Add bdrv_lock()/unlock()block.c include/block/block.h+41 -00 replies
14/14block: Convert 'block_resize' to coroutineblockdev.c hmp-commands.hx qapi/block-core.json+11 -90 replies

Reviews trailers per patch

7 of 14 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchEric BlakeMarkus ArmbrusterStefan HajnocziDr. David Alan Gilbert
SeriesR-b R-b
1/14R-b
2/14R-b
3/14
4/14R-b
5/14
6/14
7/14R-b
8/14
9/14R-b
10/14R-b
11/14R-b
12/14
13/14
14/14

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v8 thread

Cover letter [PATCH v8 00/14] monitor: Optionally run handlers in coroutines

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.

v8:
- Replaced bdrv_co_move_to_aio_context() with bdrv_co_enter()/leave(), added bdrv_co_lock()/unlock() and fixed the iothread support in qmp_block_resize() with the new functions [Stefan]
- More detailed documentation of 'coroutine' flag for commands [Markus]
- Improved comment for dropping out of coroutine context in qmp_dispatch() [Markus]
- Coding style changes [Markus]
- Resolve some more merge conflicts on rebase

v7:
- Added patch 2 to add a Monitor parameter to monitor_get_cpu_index(), too [Markus]
- Let monitor_set_cur() return the old monitor [Markus]
- Fixed comment about linking stub objects in test-util-sockets [Markus]
- More detailed commit message for per-coroutine current monitor and document that monitor_set_cur(NULL) must be called eventually [Markus]
- Resolve some merge conflicts on rebase

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 (14):
monitor: Add Monitor parameter to monitor_set_cpu()
monitor: Add Monitor parameter to monitor_get_cpu_index()
monitor: Use getter/setter functions for cur_mon
hmp: Update current monitor 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_enter()/leave()
block: Add bdrv_lock()/unlock()
block: Convert 'block_resize' to coroutine

 qapi/block-core.json                    |   3 +-
 docs/devel/qapi-code-gen.txt            |  29 ++++++
 docs/sphinx/qapidoc.py                  |   2 +-
 include/block/aio.h                     |  10 ++
 include/block/block.h                   |  31 ++++++
 include/monitor/monitor.h               |   7 +-
 include/qapi/qmp/dispatch.h             |   5 +-
 monitor/monitor-internal.h              |   7 +-
 audio/wavcapture.c                      |   8 +-
 block.c                                 |  50 +++++++++
 blockdev.c                              |  16 +--
 dump/dump.c                             |   2 +-
 hw/core/machine-hmp-cmds.c              |   2 +-
 hw/scsi/vhost-scsi.c                    |   2 +-
 hw/virtio/vhost-vsock.c                 |   2 +-
 migration/fd.c                          |   4 +-
 monitor/hmp-cmds.c                      |   4 +-
 monitor/hmp.c                           |  44 ++++++--
 monitor/misc.c                          |  38 +++----
 monitor/monitor.c                       | 101 ++++++++++++++++--
 monitor/qmp-cmds-control.c              |   2 +
 monitor/qmp-cmds.c                      |   2 +-
 monitor/qmp.c                           | 131 +++++++++++++++++-------
 net/socket.c                            |   2 +-
 net/tap.c                               |   6 +-
 qapi/qmp-dispatch.c                     |  65 +++++++++++-
 qapi/qmp-registry.c                     |   3 +
 qga/main.c                              |   2 +-
 softmmu/cpus.c                          |   2 +-
 stubs/monitor-core.c                    |  10 +-
 tests/test-qmp-cmds.c                   |  10 +-
 tests/test-util-sockets.c               |  12 +--
 trace/control.c                         |   2 +-
 util/aio-posix.c                        |   8 +-
 util/async.c                            |  30 ++++++
 util/qemu-error.c                       |   6 +-
 util/qemu-print.c                       |   3 +-
 util/qemu-sockets.c                     |   1 +
 scripts/qapi/commands.py                |  10 +-
 scripts/qapi/expr.py                    |  11 +-
 scripts/qapi/introspect.py              |   2 +-
 scripts/qapi/schema.py                  |  13 ++-
 tests/qapi-schema/test-qapi.py          |   7 +-
 hmp-commands.hx                         |   1 +
 tests/qapi-schema/meson.build           |   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 +
 50 files changed, 573 insertions(+), 143 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
Signature · 1 line
2.25.4