effd60c878
monitor_qmp_dispatcher_co() runs in the iohandler AioContext that is not
polled during nested event loops. The coroutine currently reschedules
itself in the main loop's qemu_aio_context AioContext, which is polled
during nested event loops. One known problem is that QMP device-add
calls drain_call_rcu(), which temporarily drops the BQL, leading to all
sorts of havoc like other vCPU threads re-entering device emulation code
while another vCPU thread is waiting in device emulation code with
aio_poll().
Paolo Bonzini suggested running non-coroutine QMP handlers in the
iohandler AioContext. This avoids trouble with nested event loops. His
original idea was to move coroutine rescheduling to
monitor_qmp_dispatch(), but I resorted to moving it to qmp_dispatch()
because we don't know if the QMP handler needs to run in coroutine
context in monitor_qmp_dispatch(). monitor_qmp_dispatch() would have
been nicer since it's associated with the monitor implementation and not
as general as qmp_dispatch(), which is also used by qemu-ga.
A number of qemu-iotests need updated .out files because the order of
QMP events vs QMP responses has changed.
Solves Issue #1933.
Cc: qemu-stable@nongnu.org
Fixes: 7bed89958b ("device_core: use drain_call_rcu in in qmp_device_add")
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2215192
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2214985
Buglink: https://issues.redhat.com/browse/RHEL-17369
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20240118144823.1497953-4-stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Tested-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
246 lines
6.0 KiB
Plaintext
246 lines
6.0 KiB
Plaintext
QA output created by 227
|
|
|
|
=== blockstats with -drive if=virtio ===
|
|
|
|
Testing: -drive driver=null-co,read-zeroes=on,if=virtio
|
|
{
|
|
QMP_VERSION
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
{
|
|
"device": "virtio0",
|
|
"stats": {
|
|
"unmap_operations": 0,
|
|
"unmap_merged": 0,
|
|
"failed_zone_append_operations": 0,
|
|
"flush_total_time_ns": 0,
|
|
"wr_highest_offset": 0,
|
|
"wr_total_time_ns": 0,
|
|
"failed_wr_operations": 0,
|
|
"failed_rd_operations": 0,
|
|
"wr_merged": 0,
|
|
"wr_bytes": 0,
|
|
"timed_stats": [
|
|
],
|
|
"failed_unmap_operations": 0,
|
|
"zone_append_merged": 0,
|
|
"failed_flush_operations": 0,
|
|
"account_invalid": true,
|
|
"rd_total_time_ns": 0,
|
|
"invalid_unmap_operations": 0,
|
|
"flush_operations": 0,
|
|
"wr_operations": 0,
|
|
"unmap_bytes": 0,
|
|
"rd_merged": 0,
|
|
"rd_bytes": 0,
|
|
"unmap_total_time_ns": 0,
|
|
"invalid_flush_operations": 0,
|
|
"account_failed": true,
|
|
"zone_append_total_time_ns": 0,
|
|
"zone_append_operations": 0,
|
|
"rd_operations": 0,
|
|
"zone_append_bytes": 0,
|
|
"invalid_zone_append_operations": 0,
|
|
"invalid_wr_operations": 0,
|
|
"invalid_rd_operations": 0
|
|
},
|
|
"node-name": "NODE_NAME",
|
|
"qdev": "/machine/peripheral-anon/device[0]/virtio-backend"
|
|
}
|
|
]
|
|
}
|
|
{
|
|
"timestamp": {
|
|
"seconds": TIMESTAMP,
|
|
"microseconds": TIMESTAMP
|
|
},
|
|
"event": "SHUTDOWN",
|
|
"data": {
|
|
"guest": false,
|
|
"reason": "host-qmp-quit"
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
|
|
|
|
=== blockstats with -drive if=none ===
|
|
|
|
Testing: -drive driver=null-co,if=none
|
|
{
|
|
QMP_VERSION
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
{
|
|
"device": "none0",
|
|
"stats": {
|
|
"unmap_operations": 0,
|
|
"unmap_merged": 0,
|
|
"failed_zone_append_operations": 0,
|
|
"flush_total_time_ns": 0,
|
|
"wr_highest_offset": 0,
|
|
"wr_total_time_ns": 0,
|
|
"failed_wr_operations": 0,
|
|
"failed_rd_operations": 0,
|
|
"wr_merged": 0,
|
|
"wr_bytes": 0,
|
|
"timed_stats": [
|
|
],
|
|
"failed_unmap_operations": 0,
|
|
"zone_append_merged": 0,
|
|
"failed_flush_operations": 0,
|
|
"account_invalid": true,
|
|
"rd_total_time_ns": 0,
|
|
"invalid_unmap_operations": 0,
|
|
"flush_operations": 0,
|
|
"wr_operations": 0,
|
|
"unmap_bytes": 0,
|
|
"rd_merged": 0,
|
|
"rd_bytes": 0,
|
|
"unmap_total_time_ns": 0,
|
|
"invalid_flush_operations": 0,
|
|
"account_failed": true,
|
|
"zone_append_total_time_ns": 0,
|
|
"zone_append_operations": 0,
|
|
"rd_operations": 0,
|
|
"zone_append_bytes": 0,
|
|
"invalid_zone_append_operations": 0,
|
|
"invalid_wr_operations": 0,
|
|
"invalid_rd_operations": 0
|
|
},
|
|
"node-name": "NODE_NAME"
|
|
}
|
|
]
|
|
}
|
|
{
|
|
"timestamp": {
|
|
"seconds": TIMESTAMP,
|
|
"microseconds": TIMESTAMP
|
|
},
|
|
"event": "SHUTDOWN",
|
|
"data": {
|
|
"guest": false,
|
|
"reason": "host-qmp-quit"
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
|
|
|
|
=== blockstats with -blockdev ===
|
|
|
|
Testing: -blockdev driver=null-co,node-name=null
|
|
{
|
|
QMP_VERSION
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
]
|
|
}
|
|
{
|
|
"timestamp": {
|
|
"seconds": TIMESTAMP,
|
|
"microseconds": TIMESTAMP
|
|
},
|
|
"event": "SHUTDOWN",
|
|
"data": {
|
|
"guest": false,
|
|
"reason": "host-qmp-quit"
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
|
|
|
|
=== blockstats with -blockdev and -device ===
|
|
|
|
Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device virtio-blk,drive=null,id=virtio0
|
|
{
|
|
QMP_VERSION
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
{
|
|
"return": [
|
|
{
|
|
"device": "",
|
|
"stats": {
|
|
"unmap_operations": 0,
|
|
"unmap_merged": 0,
|
|
"failed_zone_append_operations": 0,
|
|
"flush_total_time_ns": 0,
|
|
"wr_highest_offset": 0,
|
|
"wr_total_time_ns": 0,
|
|
"failed_wr_operations": 0,
|
|
"failed_rd_operations": 0,
|
|
"wr_merged": 0,
|
|
"wr_bytes": 0,
|
|
"timed_stats": [
|
|
],
|
|
"failed_unmap_operations": 0,
|
|
"zone_append_merged": 0,
|
|
"failed_flush_operations": 0,
|
|
"account_invalid": true,
|
|
"rd_total_time_ns": 0,
|
|
"invalid_unmap_operations": 0,
|
|
"flush_operations": 0,
|
|
"wr_operations": 0,
|
|
"unmap_bytes": 0,
|
|
"rd_merged": 0,
|
|
"rd_bytes": 0,
|
|
"unmap_total_time_ns": 0,
|
|
"invalid_flush_operations": 0,
|
|
"account_failed": true,
|
|
"zone_append_total_time_ns": 0,
|
|
"zone_append_operations": 0,
|
|
"rd_operations": 0,
|
|
"zone_append_bytes": 0,
|
|
"invalid_zone_append_operations": 0,
|
|
"invalid_wr_operations": 0,
|
|
"invalid_rd_operations": 0
|
|
},
|
|
"node-name": "null",
|
|
"qdev": "/machine/peripheral/virtio0/virtio-backend"
|
|
}
|
|
]
|
|
}
|
|
{
|
|
"timestamp": {
|
|
"seconds": TIMESTAMP,
|
|
"microseconds": TIMESTAMP
|
|
},
|
|
"event": "SHUTDOWN",
|
|
"data": {
|
|
"guest": false,
|
|
"reason": "host-qmp-quit"
|
|
}
|
|
}
|
|
{
|
|
"return": {
|
|
}
|
|
}
|
|
|
|
*** done
|