coroutine: add missing annotations
v2 cover coroutine: add missing annotations
Hi
Add missing coroutine_fn, coroutine_mixed_fn annotations and fix a few related issues across monitor, migration, io, block, and 9pfs subsystems.
---
Changes in v2:
- fix some annotations in patch "block: add missing coroutine annotation"
- collect trailer tags
- Link to v1: https://lore.kernel.org/qemu-devel/[email protected]
To: [email protected]
Cc: Markus Armbruster <[email protected]>
Cc: Peter Xu <[email protected]>
Cc: Fabiano Rosas <[email protected]>
Cc: "Daniel P. Berrangé" <[email protected]>
Cc: John Snow <[email protected]>
Cc: Vladimir Sementsov-Ogievskiy <[email protected]>
Cc: Kevin Wolf <[email protected]>
Cc: Hanna Reitz <[email protected]>
Cc: [email protected]
Cc: Stefan Hajnoczi <[email protected]>
Cc: Fam Zheng <[email protected]>
Cc: "Denis V. Lunev" <[email protected]>
Cc: Christian Schoenebeck <[email protected]>
Cc: Greg Kurz <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Anthony PERARD <[email protected]>
Cc: "Edgar E. Iglesias" <[email protected]>
Cc: [email protected]
Cc: Li Zhijian <[email protected]>
---
Marc-André Lureau (8):
monitor: annotate monitor_qmp_dispatcher_pop_any() as coroutine
migration: fix qemu_get_counted_string annotation
io: add missing coroutine annotation
block: add missing coroutine annotation
qcow2: remove invalid qcow2_check_refcounts calls
block: add missing coroutine_fn annotations
hw/9pfs: annotate V9fsTransport callbacks as coroutine_fn migration/rdma: annotate and simplify wait_comp_channel()
hw/9pfs/9p.h | 26 +++++++++++++++----------- include/block/blockjob_int.h | 2 +- include/io/channel.h | 4 ++-- block/commit.c | 5 +++-- block/crypto.c | 13 +++++++------ block/io.c | 8 +++++--- block/parallels.c | 5 +++-- block/qcow2-snapshot.c | 18 ------------------ block/qcow2.c | 12 ++++++++---- blockjob.c | 3 ++- hw/9pfs/9p.c | 31 +++++++++++++++++++------------ hw/9pfs/virtio-9p-device.c | 24 +++++++++++++----------- hw/9pfs/xen-9p-backend.c | 34 +++++++++++++++++----------------- io/channel.c | 5 +++-- migration/qemu-file.c | 2 +- migration/rdma.c | 12 ++++-------- monitor/qmp.c | 3 ++- 17 files changed, 105 insertions(+), 102 deletions(-)
---
base-commit: 300438ffbb8d9430cac2fcc15cba6f482b2c0587
change-id: 20260720-co-625d98c7dc5e
Best regards,
Signature · 1 line
Marc-André Lureau <[email protected]>
PATCH v2 1/8 monitor: annotate monitor_qmp_dispatcher_pop_any() as coroutine
The function calls qemu_coroutine_yield(), and is called from monitor_qmp_dispatcher_co().
--- monitor/qmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
monitor/qmp.c +2 -1
@@ -342,7 +342,8 @@ static QMPRequest *monitor_qmp_requests_pop_any_with_lock(void)return req_obj; } -static QMPRequest *monitor_qmp_dispatcher_pop_any (void ) +static QMPRequest * coroutine_fn +monitor_qmp_dispatcher_pop_any (void) {while (true) {/*
Signature · 1 line
2.55.0
PATCH v2 2/8 migration: fix qemu_get_counted_string annotation
In reply to Marc-André Lureau--- migration/qemu-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
migration/qemu-file.c +1 -1
@@ -830,7 +830,7 @@ uint64_t qemu_get_be64(QEMUFile *f)* else 0 * (Note a 0 length string will return 0 either way) */ -size_t coroutine_fn qemu_get_counted_string(QEMUFile *f, char buf[256]) +size_t coroutine_mixed_fn qemu_get_counted_string(QEMUFile *f, char buf[256]) {size_t len =qemu_get_byte (f);size_t res =qemu_get_buffer (f, (uint8_t *)buf, len);
Signature · 1 line
2.55.0
PATCH v2 3/8 io: add missing coroutine annotation
In reply to Marc-André Lureau--- include/io/channel.h | 4 ++-- io/channel.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
include/io/channel.h +2 -2
@@ -1016,8 +1016,8 @@ void qio_channel_wait(QIOChannel *ioc,* This will work with/without a coroutine context, by automatically select * the proper API to wait. */ -void qio_channel_wait_cond (QIOChannel *ioc, -GIOCondition condition); +void coroutine_mixed_fn qio_channel_wait_cond(QIOChannel *ioc, +GIOCondition condition);/** * qio_channel_set_aio_fd_handler:
io/channel.c +3 -2
@@ -905,8 +905,9 @@ void qio_channel_wait(QIOChannel *ioc,g_main_context_unref (ctxt); } -void qio_channel_wait_cond (QIOChannel *ioc, -GIOCondition condition) +void coroutine_mixed_fn +qio_channel_wait_cond (QIOChannel *ioc, +GIOCondition condition) {if (qemu_in_coroutine ()) {qio_channel_yield (ioc, condition);
Signature · 1 line
2.55.0
PATCH v2 4/8 block: add missing coroutine annotation
In reply to Marc-André LureauThe function was extracted without carrying the annotation.
--- block/commit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
block/commit.c +3 -2
@@ -128,8 +128,9 @@ static void commit_clean(Job *job)blk_unref (s->top); } -static int commit_iteration (CommitBlockJob *s,int64_t offset, -int64_t *requested_bytes,void *buf) +static int coroutine_fn +commit_iteration (CommitBlockJob *s,int64_t offset, +int64_t *requested_bytes,void *buf) {BlockErrorAction action;int64_t bytes = *requested_bytes;
Signature · 1 line
2.55.0
PATCH v2 5/8 qcow2: remove invalid qcow2_check_refcounts calls
In reply to Marc-André LureauThose DEBUG_ALLOC-guarded are dead code incorrectly calling coroutine fn from non-coroutine. Remove it.
--- block/qcow2-snapshot.c | 18 ------------------ 1 file changed, 18 deletions(-)
block/qcow2-snapshot.c +0 -18
@@ -740,12 +740,6 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)ROUND_UP (sn->vm_state_size, s->cluster_size), QCOW2_DISCARD_NEVER, false); -#ifdef DEBUG_ALLOC - { -BdrvCheckResult result = {0 }; -qcow2_check_refcounts (bs, &result,0 ); - } -#endif return 0 ; fail:
@@ -893,12 +887,6 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id) goto fail; } -#ifdef DEBUG_ALLOC - { -BdrvCheckResult result = {0 }; -qcow2_check_refcounts (bs, &result,0 ); - } -#endif return 0 ; fail:
@@ -975,12 +963,6 @@ int qcow2_snapshot_delete(BlockDriverState *bs,return ret; } -#ifdef DEBUG_ALLOC - { -BdrvCheckResult result = {0 }; -qcow2_check_refcounts (bs, &result,0 ); - } -#endif return 0 ; }
Signature · 1 line
2.55.0
PATCH v2 6/8 block: add missing coroutine_fn annotations
In reply to Marc-André LureauThe functions call coroutine functions or are called by coroutine.
Add an assert() in qcow2_do_close() code path which calls a no_coroutine_fn bdrv_graph_wrlock_drained().
Add an assert() in qcow2_update_options_commit() in the coroutine path.
--- include/block/blockjob_int.h | 2 +- block/crypto.c | 13 +++++++------ block/io.c | 8 +++++--- block/parallels.c | 5 +++-- block/qcow2.c | 12 ++++++++---- blockjob.c | 3 ++- 6 files changed, 26 insertions(+), 17 deletions(-)
include/block/blockjob_int.h +1 -1
@@ -150,7 +150,7 @@ void block_job_ratelimit_processed_bytes(BlockJob *job, uint64_t n);* Put the job to sleep (assuming that it wasn't canceled) to throttle it to the * right speed according to its rate limiting. */ -void block_job_ratelimit_sleep (BlockJob *job); +void coroutine_fn block_job_ratelimit_sleep(BlockJob *job);/** * block_job_error_action:
block/crypto.c +7 -6
@@ -56,12 +56,13 @@ static int block_crypto_probe_generic(QCryptoBlockFormat format, } -static int block_crypto_read_func (QCryptoBlock *block, -size_t offset, -uint8_t *buf, -size_t buflen, -void *opaque, -Error **errp) +static int coroutine_mixed_fn +block_crypto_read_func (QCryptoBlock *block, +size_t offset, +uint8_t *buf, +size_t buflen, +void *opaque, +Error **errp) {BlockDriverState *bs = opaque;BlockCrypto *crypto = bs->opaque;
block/io.c +5 -3
@@ -346,8 +346,9 @@ static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs,assert (data.done); } -static void bdrv_do_drained_begin (BlockDriverState *bs,BdrvChild *parent, -bool poll) +static void coroutine_mixed_fn +bdrv_do_drained_begin (BlockDriverState *bs,BdrvChild *parent, +bool poll) {IO_OR_GS_CODE ();
@@ -397,7 +398,8 @@ bdrv_drained_begin(BlockDriverState *bs)* This function does not poll, nor must any of its recursively called * functions. */ -static void bdrv_do_drained_end (BlockDriverState *bs,BdrvChild *parent) +static void coroutine_mixed_fn +bdrv_do_drained_end (BlockDriverState *bs,BdrvChild *parent) {IO_OR_GS_CODE ();
block/parallels.c +3 -2
@@ -142,8 +142,9 @@ static uint32_t host_cluster_index(BDRVParallelsState *s, int64_t off)return off / s->cluster_size; } -static int64_t block_status (BDRVParallelsState *s,int64_t sector_num, -int nb_sectors,int *pnum) +static int64_t +block_status (BDRVParallelsState *s,int64_t sector_num, +int nb_sectors,int *pnum) {int64_t start_off =-2 , prev_end_off =-2 ;
block/qcow2.c +8 -4
@@ -1287,9 +1287,10 @@ fail: }/* s_locked specifies whether s->lock is held or not */ -static void qcow2_update_options_commit (BlockDriverState *bs, -Qcow2ReopenState *r, -bool s_locked) +static coroutine_mixed_fn void +qcow2_update_options_commit (BlockDriverState *bs, +Qcow2ReopenState *r, +bool s_locked) {BDRVQcow2State *s = bs->opaque;int i;
@@ -1299,6 +1300,7 @@ static void qcow2_update_options_commit(BlockDriverState *bs,* table caches */ if (s_locked) { +assert (qemu_in_coroutine ());cache_clean_timer_co_locked_del_and_wait (bs); }else {cache_clean_timer_del_and_wait (bs);
@@ -2126,7 +2128,8 @@ fail:return ret; } -static void qcow2_reopen_commit (BDRVReopenState *state) +static void +qcow2_reopen_commit (BDRVReopenState *state) {BDRVQcow2State *s = state->bs->opaque;
@@ -2905,6 +2908,7 @@ qcow2_do_close(BlockDriverState *bs, bool close_data_file)g_free (s->image_backing_format);if (close_data_file &&has_data_file (bs)) { +assert (!qemu_in_coroutine ());GLOBAL_STATE_CODE ();bdrv_graph_rdunlock_main_loop ();bdrv_graph_wrlock_drained ();
blockjob.c +2 -1
@@ -338,7 +338,8 @@ void block_job_ratelimit_processed_bytes(BlockJob *job, uint64_t n)ratelimit_calculate_delay (&job->limit, n); } -void block_job_ratelimit_sleep (BlockJob *job) +void coroutine_fn +block_job_ratelimit_sleep (BlockJob *job) {uint64_t delay_ns;
Signature · 1 line
2.55.0
Re: [PATCH v2 6/8] block: add missing coroutine_fn annotations
Quoted 6 lines · Marc-André Lureau
block/parallels.c +0
-0@@ -142,8 +142,9 @@ static uint32_t host_cluster_index(BDRVParallelsState *s, int64_t off)return off / s->cluster_size;
block/parallels.c static uint32_t host_cluster_index(BDRVParallelsState *s, int64_t off) · line 150
Quoted 10 lines
block/parallels.c +3
-2} -static int64_t block_status (BDRVParallelsState *s,int64_t sector_num, -int nb_sectors,int *pnum) +static int64_t +block_status (BDRVParallelsState *s,int64_t sector_num, +int nb_sectors,int *pnum) {int64_t start_off =-2 , prev_end_off =-2 ;
This hunk looks like an accidental whitespace change? This function is not a coroutine function.
block/parallels.c fail: · line 2132
Quoted 7 lines
block/parallels.c +2
-1@@ -2126,7 +2128,8 @@ fail:return ret; } -static void qcow2_reopen_commit (BDRVReopenState *state) +static void +qcow2_reopen_commit (BDRVReopenState *state)
Whitespace change?
Looks good aside from these whitespace changes.
PATCH v2 7/8 hw/9pfs: annotate V9fsTransport callbacks as coroutine_fn
In reply to Marc-André LureauAll V9fsTransport callbacks are invoked exclusively from coroutine context (the v9fs_* PDU handlers). Annotate the function pointer types in V9fsTransport and all implementations (virtio and xen backends), as well as intermediate callers in 9p.c (pdu_marshal, pdu_unmarshal, v9fs_init_qiov_from_pdu, etc.).
--- hw/9pfs/9p.h | 26 +++++++++++++++----------- hw/9pfs/9p.c | 31 +++++++++++++++++++------------ hw/9pfs/virtio-9p-device.c | 24 +++++++++++++----------- hw/9pfs/xen-9p-backend.c | 34 +++++++++++++++++----------------- 4 files changed, 64 insertions(+), 51 deletions(-)
hw/9pfs/9p.h +15 -11
@@ -472,17 +472,21 @@ void pdu_submit(V9fsPDU *pdu, P9MsgHeader *hdr);void v9fs_reset (V9fsState *s);struct V9fsTransport { -ssize_t (*pdu_vmarshal)(V9fsPDU *pdu,size_t offset,const char *fmt, -va_list ap); -ssize_t (*pdu_vunmarshal)(V9fsPDU *pdu,size_t offset,const char *fmt, -va_list ap); -void (*init_in_iov_from_pdu)(V9fsPDU *pdu,struct iovec **piov, -unsigned int *pniov,size_t size); -void (*init_out_iov_from_pdu)(V9fsPDU *pdu,struct iovec **piov, -unsigned int *pniov,size_t size); -void (*push_and_notify)(V9fsPDU *pdu); -size_t (*msize_limit)(V9fsState *s); -size_t (*response_buffer_size)(V9fsPDU *pdu); + ssize_t coroutine_fn (*pdu_vmarshal)(V9fsPDU *pdu, size_t offset, +const char *fmt,va_list ap); + ssize_t coroutine_fn (*pdu_vunmarshal)(V9fsPDU *pdu, size_t offset, +const char *fmt,va_list ap); + void coroutine_fn (*init_in_iov_from_pdu)(V9fsPDU *pdu, +struct iovec **piov, +unsigned int *pniov, +size_t size); + void coroutine_fn (*init_out_iov_from_pdu)(V9fsPDU *pdu, +struct iovec **piov, +unsigned int *pniov, +size_t size); + void coroutine_fn (*push_and_notify)(V9fsPDU *pdu); + size_t coroutine_fn (*msize_limit)(V9fsState *s); + size_t coroutine_fn (*response_buffer_size)(V9fsPDU *pdu); };#endif
hw/9pfs/9p.c +19 -12
@@ -55,7 +55,8 @@ enum {P9ARRAY_DEFINE_TYPE (V9fsPath, v9fs_path_free); -static ssize_t pdu_marshal (V9fsPDU *pdu,size_t offset,const char *fmt, ...) +static ssize_t coroutine_fn +pdu_marshal (V9fsPDU *pdu,size_t offset,const char *fmt, ...) {ssize_t ret;va_list ap;
@@ -67,7 +68,8 @@ static ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...)return ret; } -static ssize_t pdu_unmarshal (V9fsPDU *pdu,size_t offset,const char *fmt, ...) +static ssize_t coroutine_fn +pdu_unmarshal (V9fsPDU *pdu,size_t offset,const char *fmt, ...) {ssize_t ret;va_list ap;
@@ -1841,7 +1843,8 @@ out_nofid:pdu_complete (pdu, err); } -static int v9fs_walk_marshal (V9fsPDU *pdu,uint16_t nwnames,V9fsQID *qids) +static int coroutine_fn +v9fs_walk_marshal (V9fsPDU *pdu,uint16_t nwnames,V9fsQID *qids) {int i;ssize_t err;
@@ -2363,9 +2366,10 @@ out_nofid:* The resulting QEMUIOVector has heap-allocated iovecs and must be cleaned up * with qemu_iovec_destroy(). */ -static void v9fs_init_qiov_from_pdu (QEMUIOVector *qiov,V9fsPDU *pdu, -size_t skip,size_t size, -bool is_write) +static void coroutine_fn +v9fs_init_qiov_from_pdu (QEMUIOVector *qiov,V9fsPDU *pdu, +size_t skip,size_t size, +bool is_write) {QEMUIOVector elem;struct iovec *iov;
@@ -2382,8 +2386,9 @@ static void v9fs_init_qiov_from_pdu(QEMUIOVector *qiov, V9fsPDU *pdu,qemu_iovec_concat (qiov, &elem, skip, size); } -static int v9fs_xattr_read (V9fsState *s,V9fsPDU *pdu,V9fsFidState *fidp, -uint64_t off,uint32_t max_count) +static int coroutine_fn +v9fs_xattr_read (V9fsState *s,V9fsPDU *pdu,V9fsFidState *fidp, +uint64_t off,uint32_t max_count) {ssize_t err;size_t offset =7 ;
@@ -2793,9 +2798,10 @@ out_nofid:pdu_complete (pdu, retval); } -static int v9fs_xattr_write (V9fsState *s,V9fsPDU *pdu,V9fsFidState *fidp, -uint64_t off,uint32_t count, -struct iovec *sg,int cnt) +static int coroutine_fn +v9fs_xattr_write (V9fsState *s,V9fsPDU *pdu,V9fsFidState *fidp, +uint64_t off,uint32_t count, +struct iovec *sg,int cnt) {int i, to_copy;ssize_t err =0 ;
@@ -3729,7 +3735,8 @@ out_nofid:pdu_complete (pdu, err); } -static int v9fs_fill_statfs (V9fsState *s,V9fsPDU *pdu,struct statfs *stbuf) +static int coroutine_fn +v9fs_fill_statfs (V9fsState *s,V9fsPDU *pdu,struct statfs *stbuf) {uint32_t f_type;uint32_t f_bsize;
hw/9pfs/virtio-9p-device.c +13 -11
@@ -28,7 +28,7 @@#include "qemu/module.h" #include "system/qtest.h" -static void virtio_9p_push_and_notify (V9fsPDU *pdu) +static void coroutine_fn virtio_9p_push_and_notify(V9fsPDU *pdu) {V9fsState *s = pdu->s;V9fsVirtioState *v =container_of (s, V9fsVirtioState, state);
@@ -117,8 +117,8 @@ static void virtio_9p_reset(VirtIODevice *vdev)v9fs_reset (&v->state); } -static ssize_t virtio_pdu_vmarshal (V9fsPDU *pdu,size_t offset, -const char *fmt,va_list ap) +static ssize_t coroutine_fn +virtio_pdu_vmarshal (V9fsPDU *pdu,size_t offset,const char *fmt,va_list ap) {V9fsState *s = pdu->s;V9fsVirtioState *v =container_of (s, V9fsVirtioState, state);
@@ -135,8 +135,8 @@ static ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset,return ret; } -static ssize_t virtio_pdu_vunmarshal (V9fsPDU *pdu,size_t offset, -const char *fmt,va_list ap) +static ssize_t coroutine_fn +virtio_pdu_vunmarshal (V9fsPDU *pdu,size_t offset,const char *fmt,va_list ap) {V9fsState *s = pdu->s;V9fsVirtioState *v =container_of (s, V9fsVirtioState, state);
@@ -152,8 +152,9 @@ static ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset,return ret; } -static void virtio_init_in_iov_from_pdu (V9fsPDU *pdu,struct iovec **piov, -unsigned int *pniov,size_t size) +static void coroutine_fn +virtio_init_in_iov_from_pdu (V9fsPDU *pdu,struct iovec **piov, +unsigned int *pniov,size_t size) {V9fsState *s = pdu->s;V9fsVirtioState *v =container_of (s, V9fsVirtioState, state);
@@ -172,8 +173,9 @@ static void virtio_init_in_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, *pniov = elem->in_num; } -static void virtio_init_out_iov_from_pdu (V9fsPDU *pdu,struct iovec **piov, -unsigned int *pniov,size_t size) +static void coroutine_fn +virtio_init_out_iov_from_pdu (V9fsPDU *pdu,struct iovec **piov, +unsigned int *pniov,size_t size) {V9fsState *s = pdu->s;V9fsVirtioState *v =container_of (s, V9fsVirtioState, state);
@@ -192,13 +194,13 @@ static void virtio_init_out_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, *pniov = elem->out_num; } -static size_t virtio_9p_msize_limit (V9fsState *s) +static size_t coroutine_fn virtio_9p_msize_limit(V9fsState *s) {const size_t guestPageSize =4096 ;return (VIRTQUEUE_MAX_SIZE -2 ) * guestPageSize; } -static size_t virtio_9p_response_buffer_size (V9fsPDU *pdu) +static size_t coroutine_fn virtio_9p_response_buffer_size(V9fsPDU *pdu) {V9fsState *s = pdu->s;V9fsVirtioState *v =container_of (s, V9fsVirtioState, state);
hw/9pfs/xen-9p-backend.c +17 -17
@@ -131,10 +131,10 @@ static void xen_9pfs_out_sg(Xen9pfsRing *ring, } } -static ssize_t xen_9pfs_pdu_vmarshal (V9fsPDU *pdu, -size_t offset, -const char *fmt, -va_list ap) +static ssize_t coroutine_fn xen_9pfs_pdu_vmarshal(V9fsPDU *pdu, +size_t offset, +const char *fmt, +va_list ap) {Xen9pfsDev *xen_9pfs =container_of (pdu->s, Xen9pfsDev, state);struct iovec in_sg[2 ];
@@ -155,10 +155,10 @@ static ssize_t xen_9pfs_pdu_vmarshal(V9fsPDU *pdu,return ret; } -static ssize_t xen_9pfs_pdu_vunmarshal (V9fsPDU *pdu, -size_t offset, -const char *fmt, -va_list ap) +static ssize_t coroutine_fn xen_9pfs_pdu_vunmarshal(V9fsPDU *pdu, +size_t offset, +const char *fmt, +va_list ap) {Xen9pfsDev *xen_9pfs =container_of (pdu->s, Xen9pfsDev, state);struct iovec out_sg[2 ];
@@ -178,10 +178,10 @@ static ssize_t xen_9pfs_pdu_vunmarshal(V9fsPDU *pdu,return ret; } -static void xen_9pfs_init_out_iov_from_pdu (V9fsPDU *pdu, -struct iovec **piov, -unsigned int *pniov, -size_t size) +static void coroutine_fn xen_9pfs_init_out_iov_from_pdu(V9fsPDU *pdu, +struct iovec **piov, +unsigned int *pniov, +size_t size) {Xen9pfsDev *xen_9pfs =container_of (pdu->s, Xen9pfsDev, state);Xen9pfsRing *ring = &xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings];
@@ -195,10 +195,10 @@ static void xen_9pfs_init_out_iov_from_pdu(V9fsPDU *pdu, *pniov = num; } -static void xen_9pfs_init_in_iov_from_pdu (V9fsPDU *pdu, -struct iovec **piov, -unsigned int *pniov, -size_t size) +static void coroutine_fn xen_9pfs_init_in_iov_from_pdu(V9fsPDU *pdu, +struct iovec **piov, +unsigned int *pniov, +size_t size) {Xen9pfsDev *xen_9pfs =container_of (pdu->s, Xen9pfsDev, state);Xen9pfsRing *ring = &xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings];
@@ -227,7 +227,7 @@ again: *pniov = num; } -static void xen_9pfs_push_and_notify (V9fsPDU *pdu) +static void coroutine_fn xen_9pfs_push_and_notify(V9fsPDU *pdu) {RING_IDX prod;Xen9pfsDev *priv =container_of (pdu->s, Xen9pfsDev, state);
Signature · 1 line
2.55.0
PATCH v2 8/8 migration/rdma: annotate and simplify wait_comp_channel()
In reply to Marc-André LureauThe function calls yield_until_fd_readable() (coroutine_fn) when in coroutine context, and polls with qemu_poll_ns() otherwise.
Replace the migration-state proxy check with qemu_in_coroutine(), which directly tests what matters.
--- migration/rdma.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
migration/rdma.c +4 -8
@@ -1348,17 +1348,13 @@ static int qemu_rdma_poll(RDMAContext *rdma, struct ibv_cq *cq,/* Wait for activity on the completion channel. * Returns 0 on success, none-0 on error. */ -static int qemu_rdma_wait_comp_channel (RDMAContext *rdma, -struct ibv_comp_channel *comp_channel) +static int coroutine_mixed_fn +qemu_rdma_wait_comp_channel (RDMAContext *rdma, +struct ibv_comp_channel *comp_channel) {struct rdma_cm_event *cm_event; -/* -* Coroutine doesn't start until migration_fd_process_incoming() -* so don't yield unless we know we're running inside of a coroutine. -*/ -if (rdma->migration_started_on_destination && -migration_incoming_get_current ()->state ==MIGRATION_STATUS_ACTIVE ) { +if (qemu_in_coroutine ()) {yield_until_fd_readable (comp_channel->fd); }else {/* This is the source side, we're in a separate thread
Signature · 1 line
2.55.0
Hi
Quoted 8 lines · Marc-André Lureau
Hi
Add missing
coroutine_fn,coroutine_mixed_fnannotations and fix a few related issues across monitor, migration, io, block, and 9pfs subsystems.Signed-off-by Marc-André Lureau <[email protected]>
I am queuing all except "block: add missing coroutine_fn annotations" awaiting review
Quoted 65 lines
---
Changes in v2:
- fix some annotations in patch "block: add missing coroutine annotation"
- collect trailer tags
- Link to v1: https://lore.kernel.org/qemu-devel/[email protected]To: [email protected]
Cc: Markus Armbruster <[email protected]>
Cc: Peter Xu <[email protected]>
Cc: Fabiano Rosas <[email protected]>
Cc: "Daniel P. Berrangé" <[email protected]>
Cc: John Snow <[email protected]>
Cc: Vladimir Sementsov-Ogievskiy <[email protected]>
Cc: Kevin Wolf <[email protected]>
Cc: Hanna Reitz <[email protected]>
Cc: [email protected]
Cc: Stefan Hajnoczi <[email protected]>
Cc: Fam Zheng <[email protected]>
Cc: "Denis V. Lunev" <[email protected]>
Cc: Christian Schoenebeck <[email protected]>
Cc: Greg Kurz <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Anthony PERARD <[email protected]>
Cc: "Edgar E. Iglesias" <[email protected]>
Cc: [email protected]
Cc: Li Zhijian <[email protected]>---
Marc-André Lureau (8):
monitor: annotatemonitor_qmp_dispatcher_pop_any()as coroutine
migration: fixqemu_get_counted_stringannotation
io: add missing coroutine annotation
block: add missing coroutine annotation
qcow2: remove invalidqcow2_check_refcountscalls
block: add missingcoroutine_fnannotations
hw/9pfs: annotate V9fsTransport callbacks ascoroutine_fnmigration/rdma: annotate and simplifywait_comp_channel()hw/9pfs/9p.h | 26 +++++++++++++++----------- include/block/blockjob_int.h | 2 +- include/io/channel.h | 4 ++-- block/commit.c | 5 +++-- block/crypto.c | 13 +++++++------ block/io.c | 8 +++++--- block/parallels.c | 5 +++-- block/qcow2-snapshot.c | 18 ------------------ block/qcow2.c | 12 ++++++++---- blockjob.c | 3 ++- hw/9pfs/9p.c | 31 +++++++++++++++++++------------ hw/9pfs/virtio-9p-device.c | 24 +++++++++++++----------- hw/9pfs/xen-9p-backend.c | 34 +++++++++++++++++----------------- io/channel.c | 5 +++-- migration/qemu-file.c | 2 +- migration/rdma.c | 12 ++++-------- monitor/qmp.c | 3 ++- 17 files changed, 105 insertions(+), 102 deletions(-)---
base-commit:300438ffbb8d9430cac2fcc15cba6f482b2c0587
change-id: 20260720-co-625d98c7dc5eBest regards,
--
Marc-André Lureau <[email protected]>