block: fix coroutine_fn annotations
v2 cover block: fix coroutine_fn annotations
This is the initial result of reviving Marc-André's series at
https://patchew.org/QEMU/[email protected]/.
A lot of the patches are similar to the ones that Marc-André wrote, but due to the changes in the code it was easier to redo them.
For nbd, the patch is on top of "nbd: mark more coroutine_fns" that I sent a few days ago and that (AIUI) Eric has already queued; only one function was missing, much to my surprise.
Apart from this, I also identified the following functions that can be called both in coroutine context and outside:
- qmp_dispatch
- schedule_next_request
- nvme_get_free_req
- bdrv_create
- bdrv_remove_persistent_dirty_bitmap
- bdrv_can_store_new_dirty_bitmap
- bdrv_do_drained_begin
- bdrv_do_drained_end
- bdrv_drain_all_begin
- qcow2_open
- qcow2_has_zero_init
- bdrv_qed_open
- qio_channel_readv_full_all_eof
- qio_channel_writev_full_all
besides, of course, everything that is generated by scripts/block-coroutine-wrapper.py.
The patches are exactly the same as v1, but I have improved the commit messages for the "remove incorrect coroutine_fn annotations" bits.
Marc-André Lureau (3):
9p: add missing coroutine_fn annotations
migration: add missing coroutine_fn annotations
test-coroutine: add missing coroutine_fn annotations
Paolo Bonzini (23):
block: remove incorrect coroutine_fn annotations
qcow2: remove incorrect coroutine_fn annotations
nbd: remove incorrect coroutine_fn annotations
coroutine: remove incorrect coroutine_fn annotations
blkdebug: add missing coroutine_fn annotations
blkverify: add missing coroutine_fn annotations
block: add missing coroutine_fn annotations
file-posix: add missing coroutine_fn annotations
iscsi: add missing coroutine_fn annotations
nbd: add missing coroutine_fn annotations
nfs: add missing coroutine_fn annotations
nvme: add missing coroutine_fn annotations
parallels: add missing coroutine_fn annotations
qcow2: add missing coroutine_fn annotations
copy-before-write: add missing coroutine_fn annotations
curl: add missing coroutine_fn annotations
qed: add missing coroutine_fn annotations
quorum: add missing coroutine_fn annotations
throttle: add missing coroutine_fn annotations
vmdk: add missing coroutine_fn annotations
job: add missing coroutine_fn annotations
coroutine-lock: add missing coroutine_fn annotations
raw-format: add missing coroutine_fn annotations
block/blkdebug.c | 14 +++++++------- block/blkverify.c | 2 +- block/block-backend.c | 26 +++++++++++++------------- block/copy-before-write.c | 8 ++++---- block/curl.c | 2 +- block/file-posix.c | 2 +- block/io.c | 24 ++++++++++++------------ block/iscsi.c | 2 +- block/nbd.c | 10 +++++----- block/nfs.c | 2 +- block/nvme.c | 5 +++-- block/parallels.c | 5 +++-- block/qcow2-cluster.c | 18 +++++++++--------- block/qcow2-refcount.c | 6 +++--- block/qcow2.c | 4 ++-- block/qcow2.h | 18 +++++++++--------- block/qed.c | 4 ++-- block/quorum.c | 35 ++++++++++++++++++----------------- block/raw-format.c | 2 +- block/throttle.c | 2 +- block/vmdk.c | 20 ++++++++++---------- hw/9pfs/9p.h | 9 ++++++--- include/block/nbd.h | 2 +- include/qemu/coroutine.h | 2 +- include/qemu/job.h | 2 +- job.c | 2 +- migration/migration.c | 3 ++- tests/unit/test-coroutine.c | 2 +- util/qemu-coroutine-lock.c | 14 +++++++------- util/qemu-coroutine.c | 2 +- 30 files changed, 128 insertions(+), 121 deletions(-)
Signature · 1 line
2.35.1
PATCH v2 1/26 block: remove incorrect coroutine_fn annotations
This is incorrect because blk_pwritev_part() is called by blk_pwrite_zeroes() and blk_pwrite(), neither of which has to be called from a coroutine.
--- block/block-backend.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
block/block-backend.c +4 -4
@@ -1391,10 +1391,10 @@ int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,return blk_co_pwritev_part (blk, offset, bytes, qiov,0 , flags); } -static int coroutine_fn blk_pwritev_part(BlockBackend *blk, int64_t offset, -int64_t bytes, -QEMUIOVector *qiov,size_t qiov_offset, -BdrvRequestFlags flags) +static int blk_pwritev_part (BlockBackend *blk,int64_t offset, +int64_t bytes, +QEMUIOVector *qiov,size_t qiov_offset, +BdrvRequestFlags flags) {int ret;
Signature · 1 line
2.35.1
Re: [PATCH v2 01/26] block: remove incorrect coroutine_fn annotations
Quoted 8 lines · Paolo Bonzini
This is incorrect because
blk_pwritev_part()is called byblk_pwrite_zeroes()andblk_pwrite(), neither of which has to be called from a coroutine.Signed-off-by Paolo Bonzini <[email protected]>--- block/block-backend.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Quoted 24 lines
block/block-backend.c +4
-4@@ -1391,10 +1391,10 @@ int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,return blk_co_pwritev_part (blk, offset, bytes, qiov,0 , flags); } -static int coroutine_fn blk_pwritev_part(BlockBackend *blk, int64_t offset, -int64_t bytes, -QEMUIOVector *qiov,size_t qiov_offset, -BdrvRequestFlags flags) +static int blk_pwritev_part (BlockBackend *blk,int64_t offset, +int64_t bytes, +QEMUIOVector *qiov,size_t qiov_offset, +BdrvRequestFlags flags) {int ret;Signature · 1 line
2.35.1
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 01/26] block: remove incorrect coroutine_fn annotations
In reply to Paolo BonziniQuoted 8 lines · Paolo Bonzini
This is incorrect because
blk_pwritev_part()is called byblk_pwrite_zeroes()andblk_pwrite(), neither of which has to be called from a coroutine.Signed-off-by Paolo Bonzini <[email protected]>--- block/block-backend.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Isn't this sort of justification the wrong way around?
Regardless:
PATCH v2 2/26 qcow2: remove incorrect coroutine_fn annotations
In reply to Paolo BonziniThis is incorrect because qcow2_mark_clean() calls qcow2_flush_caches(). qcow2_mark_clean() is called from non-coroutine context in qcow2_inactivate() and qcow2_close().
--- block/qcow2-refcount.c | 4 ++-- block/qcow2.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
block/qcow2-refcount.c +2 -2
@@ -1206,7 +1206,7 @@ void qcow2_free_any_cluster(BlockDriverState *bs, uint64_t l2_entry, } } -int coroutine_fn qcow2_write_caches(BlockDriverState *bs) +int qcow2_write_caches (BlockDriverState *bs) {BDRVQcow2State *s = bs->opaque;int ret;
@@ -1226,7 +1226,7 @@ int coroutine_fn qcow2_write_caches(BlockDriverState *bs)return 0 ; } -int coroutine_fn qcow2_flush_caches(BlockDriverState *bs) +int qcow2_flush_caches (BlockDriverState *bs) {int ret =qcow2_write_caches (bs);if (ret <0 ) {
block/qcow2.h +2 -2
@@ -874,8 +874,8 @@ void qcow2_free_any_cluster(BlockDriverState *bs, uint64_t l2_entry,int qcow2_update_snapshot_refcount (BlockDriverState *bs,int64_t l1_table_offset,int l1_size,int addend); -int coroutine_fn qcow2_flush_caches(BlockDriverState *bs); -int coroutine_fn qcow2_write_caches(BlockDriverState *bs); +int qcow2_flush_caches (BlockDriverState *bs); +int qcow2_write_caches (BlockDriverState *bs);int qcow2_check_refcounts (BlockDriverState *bs,BdrvCheckResult *res,BdrvCheckMode fix);
Signature · 1 line
2.35.1
Re: [PATCH v2 02/26] qcow2: remove incorrect coroutine_fn annotations
Quoted 9 lines · Paolo Bonzini
This is incorrect because
qcow2_mark_clean()callsqcow2_flush_caches().qcow2_mark_clean()is called from non-coroutine context inqcow2_inactivate()andqcow2_close().Signed-off-by Paolo Bonzini <[email protected]>--- block/qcow2-refcount.c | 4 ++-- block/qcow2.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 02/26] qcow2: remove incorrect coroutine_fn annotations
In reply to Paolo BonziniQuoted 9 lines · Paolo Bonzini
This is incorrect because
qcow2_mark_clean()callsqcow2_flush_caches().qcow2_mark_clean()is called from non-coroutine context inqcow2_inactivate()andqcow2_close().Signed-off-by Paolo Bonzini <[email protected]>--- block/qcow2-refcount.c | 4 ++-- block/qcow2.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
PATCH v2 3/26 nbd: remove incorrect coroutine_fn annotations
In reply to Paolo Bonzininbd_co_establish_connection_cancel() cancels a coroutine but is not called from coroutine context itself, for example in nbd_cancel_in_flight() and in timer callbacks reconnect_delay_timer_cb() and open_timer_cb().
--- include/block/nbd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/block/nbd.h +1 -1
@@ -423,6 +423,6 @@ QIOChannel *coroutine_fnnbd_co_establish_connection (NBDClientConnection *conn, NBDExportInfo *info, bool blocking, Error **errp); -void coroutine_fn nbd_co_establish_connection_cancel(NBDClientConnection *conn); +void nbd_co_establish_connection_cancel (NBDClientConnection *conn);#endif
Signature · 1 line
2.35.1
Re: [PATCH v2 03/26] nbd: remove incorrect coroutine_fn annotations
Quoted 8 lines · Paolo Bonzini
nbd_co_establish_connection_cancel()cancels a coroutine but is not called from coroutine context itself, for example innbd_cancel_in_flight()and in timer callbacksreconnect_delay_timer_cb()andopen_timer_cb().Signed-off-by Paolo Bonzini <[email protected]>--- include/block/nbd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 17 lines
include/block/nbd.h +1
-1@@ -423,6 +423,6 @@ QIOChannel *coroutine_fnnbd_co_establish_connection (NBDClientConnection *conn, NBDExportInfo *info, bool blocking, Error **errp); -void coroutine_fn nbd_co_establish_connection_cancel(NBDClientConnection *conn); +void nbd_co_establish_connection_cancel (NBDClientConnection *conn);#endif Signature · 1 line
2.35.1
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 03/26] nbd: remove incorrect coroutine_fn annotations
In reply to Paolo BonziniQuoted 8 lines · Paolo Bonzini
nbd_co_establish_connection_cancel()cancels a coroutine but is not called from coroutine context itself, for example innbd_cancel_in_flight()and in timer callbacksreconnect_delay_timer_cb()andopen_timer_cb().Signed-off-by Paolo Bonzini <[email protected]>--- include/block/nbd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v2 4/26 coroutine: remove incorrect coroutine_fn annotations
In reply to Paolo Bonziniqemu_coroutine_get_aio_context inspects a coroutine, but it does not have to be called from the coroutine itself (or from any coroutine).
--- include/qemu/coroutine.h | 2 +- util/qemu-coroutine.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/qemu/coroutine.h +1 -1
@@ -92,7 +92,7 @@ void coroutine_fn qemu_coroutine_yield(void);/** * Get the AioContext of the given coroutine */ -AioContext *coroutine_fn qemu_coroutine_get_aio_context(Coroutine *co); +AioContext *qemu_coroutine_get_aio_context (Coroutine *co);/** * Get the currently executing coroutine
util/qemu-coroutine.c +1 -1
@@ -207,7 +207,7 @@ bool qemu_coroutine_entered(Coroutine *co)return co->caller; } -AioContext *coroutine_fn qemu_coroutine_get_aio_context(Coroutine *co) +AioContext *qemu_coroutine_get_aio_context (Coroutine *co) {return co->ctx; }
Signature · 1 line
2.35.1
Re: [PATCH v2 04/26] coroutine: remove incorrect coroutine_fn annotations
Quoted 9 lines · Paolo Bonzini
qemu_coroutine_get_aio_contextinspects a coroutine, but it does not have to be called from the coroutine itself (or from any coroutine).Signed-off-by Paolo Bonzini <[email protected]>--- include/qemu/coroutine.h | 2 +- util/qemu-coroutine.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 04/26] coroutine: remove incorrect coroutine_fn annotations
In reply to Paolo BonziniQuoted 9 lines · Paolo Bonzini
qemu_coroutine_get_aio_contextinspects a coroutine, but it does not have to be called from the coroutine itself (or from any coroutine).Signed-off-by Paolo Bonzini <[email protected]>--- include/qemu/coroutine.h | 2 +- util/qemu-coroutine.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
PATCH v2 5/26 blkdebug: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/blkdebug.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
block/blkdebug.c +7 -7
@@ -587,8 +587,8 @@ out:return ret; } -static int rule_check (BlockDriverState *bs,uint64_t offset,uint64_t bytes, -BlkdebugIOType iotype) +static int coroutine_fn rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes, +BlkdebugIOType iotype) {BDRVBlkdebugState *s = bs->opaque;BlkdebugRule *rule =NULL ;
@@ -672,7 +672,7 @@ blkdebug_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,return bdrv_co_pwritev (bs->file, offset, bytes, qiov, flags); } -static int blkdebug_co_flush (BlockDriverState *bs) +static int coroutine_fn blkdebug_co_flush(BlockDriverState *bs) {int err =rule_check (bs,0 ,0 ,BLKDEBUG_IO_TYPE_FLUSH );
@@ -791,7 +791,7 @@ static void blkdebug_close(BlockDriverState *bs) }/* Called with lock held. */ -static void suspend_request (BlockDriverState *bs,BlkdebugRule *rule) +static void coroutine_fn suspend_request(BlockDriverState *bs, BlkdebugRule *rule) {BDRVBlkdebugState *s = bs->opaque;BlkdebugSuspendedReq *r;
@@ -810,8 +810,8 @@ static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule) }/* Called with lock held. */ -static void process_rule (BlockDriverState *bs,struct BlkdebugRule *rule, -int *action_count,int *new_state) +static void coroutine_fn process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, +int *action_count,int *new_state) {BDRVBlkdebugState *s = bs->opaque;
@@ -840,7 +840,7 @@ static void process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, } } -static void blkdebug_debug_event (BlockDriverState *bs,BlkdebugEvent event) +static void coroutine_fn blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event) {BDRVBlkdebugState *s = bs->opaque;struct BlkdebugRule *rule, *next;
Signature · 1 line
2.35.1
Re: [PATCH v2 05/26] blkdebug: add missing coroutine_fn annotations
Quoted 1 line · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>
Sparse commit message; from the followup email, this sentence would be helpful:
| The only rule is that callers of coroutine_fn must be coroutine_fn themselves, | or the call must be within "if (qemu_in_coroutine())".
Quoted 9 lines
--- block/blkdebug.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)block/blkdebug.c +0
-0
block/blkdebug.c out: · line 591
Quoted 7 lines
block/blkdebug.c +2
-2@@ -587,8 +587,8 @@ out:return ret; } -static int rule_check (BlockDriverState *bs,uint64_t offset,uint64_t bytes, -BlkdebugIOType iotype) +static int coroutine_fn rule_check(BlockDriverState *bs, uint64_t offset, uint64_t bytes, +BlkdebugIOType iotype)
Following that guideline, rule_check() is reached from:
+ coroutine_fn blkdebug_co_preadv
+ coroutine_fn blkdebug_co_pwritev
+ blkdebug_co_flush (fixed to be coroutine_fn below)
+ coroutine_fn blkdebug_co_pwrite_zeroes
+ coroutine_fn blkdebug_co_pdiscard
+ coroutine_fn blkdebug_co_block_status
block/blkdebug.c blkdebug_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes, · line 675
Quoted 9 lines
block/blkdebug.c +1
-1{BDRVBlkdebugState *s = bs->opaque;BlkdebugRule *rule =NULL ;@@ -672,7 +672,7 @@ blkdebug_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,return bdrv_co_pwritev (bs->file, offset, bytes, qiov, flags); } -static int blkdebug_co_flush (BlockDriverState *bs) +static int coroutine_fn blkdebug_co_flush(BlockDriverState *bs)
blkdebug_co_flush() is only reached from:
+ .bdrv_co_flush_to_disk
+ from io.c coroutine_fn bdrv_co_flush
block/blkdebug.c static void blkdebug_close(BlockDriverState *bs) · line 794
Quoted 9 lines
block/blkdebug.c +1
-1{int err =rule_check (bs,0 ,0 ,BLKDEBUG_IO_TYPE_FLUSH );@@ -791,7 +791,7 @@ static void blkdebug_close(BlockDriverState *bs) }/* Called with lock held. */ -static void suspend_request (BlockDriverState *bs,BlkdebugRule *rule) +static void coroutine_fn suspend_request(BlockDriverState *bs, BlkdebugRule *rule)
suspend_request() is only reached from:
+ process_rule (fixed to be coroutine_fn below)
block/blkdebug.c static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule) · line 814
Quoted 11 lines
block/blkdebug.c +2
-2{BDRVBlkdebugState *s = bs->opaque;BlkdebugSuspendedReq *r;@@ -810,8 +810,8 @@ static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule) }/* Called with lock held. */ -static void process_rule (BlockDriverState *bs,struct BlkdebugRule *rule, -int *action_count,int *new_state) +static void coroutine_fn process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, +int *action_count,int *new_state)
process_rule() is only reached from:
+ blkdebug_debug_event (fixed to be coroutine_fn below)
block/blkdebug.c static void process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, · line 843
Quoted 9 lines
block/blkdebug.c +1
-1{BDRVBlkdebugState *s = bs->opaque;@@ -840,7 +840,7 @@ static void process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, } } -static void blkdebug_debug_event (BlockDriverState *bs,BlkdebugEvent event) +static void coroutine_fn blkdebug_debug_event(BlockDriverState *bs, BlkdebugEvent event)
Long line; could wrap the arguments.
blkdebug_debug_event() is only reached from:
+ .bdrv_debug_event
+ from io.c coroutine_fn bdrv_do_co_copy_on_readv
+ from io.c bdrv_padding_rmw_read (NOT marked coroutine_fn, no qemu_in_coroutine guard!) | + from io.c coroutine_fn bdrv_co_do_zero_pwritev
| + from io.c coroutine_fn bdrv_co_pwritev_part
+ from io.c coroutine_fn bdrv_aligned_pwritev
So the patch is 95% correct; if you also mark io.c bdrv_padding_rmw_read(), you can add:
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
PATCH v2 6/26 blkverify: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/blkverify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/blkverify.c +1 -1
@@ -258,7 +258,7 @@ blkverify_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,return blkverify_co_prwv (bs, &r, offset, bytes, qiov, qiov, flags, true); } -static int blkverify_co_flush (BlockDriverState *bs) +static int coroutine_fn blkverify_co_flush(BlockDriverState *bs) {BDRVBlkverifyState *s = bs->opaque;
Signature · 1 line
2.35.1
Re: [PATCH v2 06/26] blkverify: add missing coroutine_fn annotations
Quoted 10 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/blkverify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)block/blkverify.c +0
-0
block/blkverify.c blkverify_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes, · line 261
Quoted 5 lines
block/blkverify.c +1
-1@@ -258,7 +258,7 @@ blkverify_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,return blkverify_co_prwv (bs, &r, offset, bytes, qiov, qiov, flags, true); } -static int blkverify_co_flush (BlockDriverState *bs) +static int coroutine_fn blkverify_co_flush(BlockDriverState *bs)
Called by:
+ .bdrv_co_flush
+ from io.c coroutine_fn bdrv_co_flush
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 06/26] blkverify: add missing coroutine_fn annotations
In reply to Paolo BonziniQuoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/blkverify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v2 7/26 block: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/block-backend.c | 18 +++++++++--------- block/io.c | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-)
block/block-backend.c +9 -9
@@ -1413,8 +1413,8 @@ typedef struct BlkRwCo {BdrvRequestFlags flags; } BlkRwCo; -int blk_pwrite_zeroes (BlockBackend *blk,int64_t offset, -int64_t bytes,BdrvRequestFlags flags) +int coroutine_fn blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, +int64_t bytes,BdrvRequestFlags flags) {IO_OR_GS_CODE (); return blk_pwritev_part(blk, offset, bytes, NULL, 0,
@@ -1534,7 +1534,7 @@ static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset,return &acb->common; } -static void blk_aio_read_entry (void *opaque) +static void coroutine_fn blk_aio_read_entry(void *opaque) {BlkAioEmAIOCB *acb = opaque;BlkRwCo *rwco = &acb->rwco;
@@ -1546,7 +1546,7 @@ static void blk_aio_read_entry(void *opaque)blk_aio_complete (acb); } -static void blk_aio_write_entry (void *opaque) +static void coroutine_fn blk_aio_write_entry(void *opaque) {BlkAioEmAIOCB *acb = opaque;BlkRwCo *rwco = &acb->rwco;
@@ -1580,8 +1580,8 @@ int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int bytes)return ret <0 ? ret : bytes; } -int blk_pwrite (BlockBackend *blk,int64_t offset,const void *buf,int bytes, -BdrvRequestFlags flags) +int coroutine_fn blk_pwrite(BlockBackend *blk, int64_t offset, const void *buf, int bytes, +BdrvRequestFlags flags) {int ret;QEMUIOVector qiov =QEMU_IOVEC_INIT_BUF (qiov, buf, bytes);
@@ -1681,7 +1681,7 @@ int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf)return ret; } -static void blk_aio_ioctl_entry (void *opaque) +static void coroutine_fn blk_aio_ioctl_entry(void *opaque) {BlkAioEmAIOCB *acb = opaque;BlkRwCo *rwco = &acb->rwco;
@@ -1715,7 +1715,7 @@ blk_co_do_pdiscard(BlockBackend *blk, int64_t offset, int64_t bytes)return bdrv_co_pdiscard (blk->root, offset, bytes); } -static void blk_aio_pdiscard_entry (void *opaque) +static void coroutine_fn blk_aio_pdiscard_entry(void *opaque) {BlkAioEmAIOCB *acb = opaque;BlkRwCo *rwco = &acb->rwco;
@@ -1771,7 +1771,7 @@ int coroutine_fn blk_co_do_flush(BlockBackend *blk)return bdrv_co_flush (blk_bs (blk)); } -static void blk_aio_flush_entry (void *opaque) +static void coroutine_fn blk_aio_flush_entry(void *opaque) {BlkAioEmAIOCB *acb = opaque;BlkRwCo *rwco = &acb->rwco;
block/io.c +12 -12
@@ -751,7 +751,7 @@ void bdrv_drain_all(void)* * This function should be called when a tracked request is completing. */ -static void tracked_request_end (BdrvTrackedRequest *req) +static void coroutine_fn tracked_request_end(BdrvTrackedRequest *req) {if (req->serialising) {qatomic_dec (&req->bs->serialising_in_flight);
@@ -766,11 +766,11 @@ static void tracked_request_end(BdrvTrackedRequest *req)/** * Add an active request to the tracked requests list */ -static void tracked_request_begin (BdrvTrackedRequest *req, -BlockDriverState *bs, -int64_t offset, -int64_t bytes, -enum BdrvTrackedRequestType type) +static void coroutine_fn tracked_request_begin(BdrvTrackedRequest *req, +BlockDriverState *bs, +int64_t offset, +int64_t bytes, +enum BdrvTrackedRequestType type) {bdrv_check_request (offset, bytes, &error_abort);
@@ -809,7 +809,7 @@ static bool tracked_request_overlaps(BdrvTrackedRequest *req, }/* Called with self->bs->reqs_lock held */ -static BdrvTrackedRequest * +static coroutine_fn BdrvTrackedRequest *bdrv_find_conflicting_request (BdrvTrackedRequest *self) {BdrvTrackedRequest *req;
@@ -1704,10 +1704,10 @@ static bool bdrv_init_padding(BlockDriverState *bs,return true; } -static int bdrv_padding_rmw_read (BdrvChild *child, -BdrvTrackedRequest *req, -BdrvRequestPadding *pad, -bool zero_middle) +static coroutine_fn int bdrv_padding_rmw_read(BdrvChild *child, +BdrvTrackedRequest *req, +BdrvRequestPadding *pad, +bool zero_middle) {QEMUIOVector local_qiov;BlockDriverState *bs = child->bs;
@@ -3228,7 +3228,7 @@ out:return ret; } -int bdrv_co_ioctl (BlockDriverState *bs,int req,void *buf) +int coroutine_fn bdrv_co_ioctl(BlockDriverState *bs, int req, void *buf) {BlockDriver *drv = bs->drv;CoroutineIOCompletion co = {
Signature · 1 line
2.35.1
Re: [PATCH v2 07/26] block: add missing coroutine_fn annotations
Quoted 1 line · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>
Resuming more of my review...
Quoted 10 lines
--- block/block-backend.c | 18 +++++++++--------- block/io.c | 24 ++++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-)block/block-backend.c +0
-0
block/block-backend.c typedef struct BlkRwCo { · line 1417
Quoted 7 lines
block/block-backend.c +2
-2@@ -1413,8 +1413,8 @@ typedef struct BlkRwCo {BdrvRequestFlags flags; } BlkRwCo; -int blk_pwrite_zeroes (BlockBackend *blk,int64_t offset, -int64_t bytes,BdrvRequestFlags flags) +int coroutine_fn blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, +int64_t bytes,BdrvRequestFlags flags)
Tracking down all callers of blk_pwrite_zeroes is not as trivial as in the previous patches. But the very first one I checked:
block.c: create_file_fallback_zero_first_sector()
is neither marked coroutine_fn, nor does it have the "if (qemu_in_coroutine())" guard. And block.c is not touched in this patch series, per the diffstat in 0/26. Am I missing something?
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 07/26] block: add missing coroutine_fn annotations
Quoted 8 lines · Eric Blake
block/block-backend.c typedef struct BlkRwCo { · line 1417
Quoted 2 lines
block/block-backend.c +2
-0+int coroutine_fn blk_pwrite_zeroes(BlockBackend *blk, int64_t offset, +int64_t bytes,BdrvRequestFlags flags)Tracking down all callers of
blk_pwrite_zeroesis not as trivial as in the previous patches. But the very first one I checked:
block.c:create_file_fallback_zero_first_sector()is neither marked
coroutine_fn, nor does it have the "if (qemu_in_coroutine())" guard.
That one in particular _should_ be coroutine_fn; bdrv_co_create_opts_simple is the only caller. This is probably a limitation of the thread-safety annotations that I used to generate this patchset: the compiler does limited inter-procedural analysis which for us means missing some potential coroutine_fn additions.
But I agree that blk_pwrite_zeros shouldn't be a coroutine_fn, because of fuse_fallocate and block_load. Alberto, this function is another candidate for adding a blk_co_pwrite_zeros + a matching generated_co_wrapper.
Paolo
Quoted 2 lines
And
block.cis not touched in this
patch series, per the diffstat in 0/26. Am I missing something?
Re: [PATCH v2 07/26] block: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
But I agree that
blk_pwrite_zerosshouldn't be acoroutine_fn, because offuse_fallocateandblock_load. Alberto, this function is another candidate for adding ablk_co_pwrite_zeros+ a matchinggenerated_co_wrapper.
Thanks for the heads up. In fact, looking at block-backend-io.h, there's quite a few functions that (AFAICT) we could implement using generated_co_wrapper:
- blk_pread, blk_preadv, blk_preadv_part
- blk_pwrite, blk_pwritev, blk_pwritev_part
- blk_pwrite_compressed, blk_pwrite_zeroes
- blk_pdiscard
- blk_flush
- blk_truncate, blk_ioctl
Would this make sense?
Re: [PATCH v2 07/26] block: add missing coroutine_fn annotations
Quoted 4 lines · Alberto Faria
Thanks for the heads up. In fact, looking at
block-backend-io.h, there's quite a few functions that (AFAICT) we could implement usinggenerated_co_wrapper:
Quoted 8 lines
-
blk_pread,blk_preadv,blk_preadv_part
-blk_pwrite,blk_pwritev,blk_pwritev_part
-blk_pwrite_compressed,blk_pwrite_zeroes
-blk_pdiscard
-blk_flush
-blk_truncate,blk_ioctlWould this make sense?
Yes, I think so.
Paolo
PATCH v2 8/26 file-posix: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/file-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/file-posix.c +1 -1
@@ -2158,7 +2158,7 @@ static void raw_aio_unplug(BlockDriverState *bs)#endif } -static int raw_co_flush_to_disk (BlockDriverState *bs) +static int coroutine_fn raw_co_flush_to_disk(BlockDriverState *bs) {BDRVRawState *s = bs->opaque;RawPosixAIOData acb;
Signature · 1 line
2.35.1
Re: [PATCH v2 08/26] file-posix: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/file-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Sparse commit message.
block/file-posix.c static void raw_aio_unplug(BlockDriverState *bs) · line 2161
Quoted 11 lines
block/file-posix.c +1
-1@@ -2158,7 +2158,7 @@ static void raw_aio_unplug(BlockDriverState *bs)#endif } -static int raw_co_flush_to_disk (BlockDriverState *bs) +static int coroutine_fn raw_co_flush_to_disk(BlockDriverState *bs)
Only reached by:
+ .bdrv_co_flush_to_disk
+ io.c: coroutine_fn bdrv_co_flush
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 08/26] file-posix: add missing coroutine_fn annotations
In reply to Paolo BonziniQuoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/file-posix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v2 9/26 iscsi: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/iscsi.c +1 -1
@@ -290,7 +290,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, } } -static void iscsi_co_init_iscsitask (IscsiLun *iscsilun,struct IscsiTask *iTask) +static void coroutine_fn iscsi_co_init_iscsitask(IscsiLun *iscsilun, struct IscsiTask *iTask) { *iTask = (struct IscsiTask ) { .co =qemu_coroutine_self (),
Signature · 1 line
2.35.1
Re: [PATCH v2 09/26] iscsi: add missing coroutine_fn annotations
Quoted 10 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)block/iscsi.c +0
-0
block/iscsi.c iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, · line 293
Quoted 5 lines
block/iscsi.c +1
-1@@ -290,7 +290,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, } } -static void iscsi_co_init_iscsitask (IscsiLun *iscsilun,struct IscsiTask *iTask) +static void coroutine_fn iscsi_co_init_iscsitask(IscsiLun *iscsilun, struct IscsiTask *iTask)
Might be worth wrapping the long line.
All callers are already coroutine_fn (iscsi_co_writev, iscsi_co_block_status, iscsi_co_readv, iscsi_co_flush, iscsi_co_pdiscard, iscsi_co_pwrite_zeroes, iscsi_co_copy_range_to), so safe.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 09/26] iscsi: add missing coroutine_fn annotations
In reply to Paolo BonziniQuoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v2 10/26 nbd: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/nbd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
block/nbd.c +5 -5
@@ -983,11 +983,11 @@ static void nbd_iter_request_error(NBDReplyChunkIter *iter, int ret)* nbd_reply_chunk_iter_receive * The pointer stored in @payload requires g_free() to free it. */ -static bool nbd_reply_chunk_iter_receive (BDRVNBDState *s, -NBDReplyChunkIter *iter, -uint64_t handle, -QEMUIOVector *qiov,NBDReply *reply, -void **payload) +static bool coroutine_fn nbd_reply_chunk_iter_receive(BDRVNBDState *s, +NBDReplyChunkIter *iter, +uint64_t handle, +QEMUIOVector *qiov,NBDReply *reply, +void **payload) {int ret, request_ret;NBDReply local_reply;
Signature · 1 line
2.35.1
Re: [PATCH v2 10/26] nbd: add missing coroutine_fn annotations
Quoted 12 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/nbd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)block/nbd.c +0
-0@@ -983,11 +983,11 @@ static void nbd_iter_request_error(NBDReplyChunkIter *iter, int ret)* nbd_reply_chunk_iter_receive * The pointer stored in @payload requires g_free() to free it.
block/nbd.c static void nbd_iter_request_error(NBDReplyChunkIter *iter, int ret) · line 989
Quoted 10 lines
block/nbd.c +4
-5*/ -static bool nbd_reply_chunk_iter_receive (BDRVNBDState *s, -NBDReplyChunkIter *iter, -uint64_t handle, -QEMUIOVector *qiov,NBDReply *reply, -void **payload) +static bool coroutine_fn nbd_reply_chunk_iter_receive(BDRVNBDState *s, + NBDReplyChunkIter *iter, + uint64_t handle, + QEMUIOVector *qiov, NBDReply *reply,
Might be worth wrapping the now-longer line.
block/nbd.c static void nbd_iter_request_error(NBDReplyChunkIter *iter, int ret) · line 990
Quoted 1 line
block/nbd.c +1
-0+ void **payload)
Used only by the macro NBD_FOREACH_REPLY_CHUNK(), which in turn is used by nbd_co_receive_return_code, nbd_co_receive_cmdread_reply, nbd_co_receive_blockstatus_reply, which all got recently marked in 0c43c6fc.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [PATCH v2 10/26] nbd: add missing coroutine_fn annotations
In reply to Paolo BonziniQuoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/nbd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
PATCH v2 11/26 nfs: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/nfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/nfs.c +1 -1
@@ -223,7 +223,7 @@ static void nfs_process_write(void *arg)qemu_mutex_unlock (&client->mutex); } -static void nfs_co_init_task (BlockDriverState *bs,NFSRPC *task) +static void coroutine_fn nfs_co_init_task(BlockDriverState *bs, NFSRPC *task) { *task = (NFSRPC ) { .co =qemu_coroutine_self (),
Signature · 1 line
2.35.1
Re: [PATCH v2 11/26] nfs: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/nfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v2 12/26 nvme: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/nvme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
block/nvme.c +3 -2
@@ -1234,8 +1234,9 @@ static inline bool nvme_qiov_aligned(BlockDriverState *bs,return true; } -static int nvme_co_prw (BlockDriverState *bs,uint64_t offset,uint64_t bytes, -QEMUIOVector *qiov,bool is_write,int flags) +static coroutine_fn int nvme_co_prw(BlockDriverState *bs, +uint64_t offset,uint64_t bytes, +QEMUIOVector *qiov,bool is_write,int flags) {BDRVNVMeState *s = bs->opaque;int r;
Signature · 1 line
2.35.1
Re: [PATCH v2 12/26] nvme: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/nvme.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
PATCH v2 13/26 parallels: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/parallels.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
block/parallels.c +3 -2
@@ -165,8 +165,9 @@ static int64_t block_status(BDRVParallelsState *s, int64_t sector_num,return start_off; } -static int64_t allocate_clusters (BlockDriverState *bs,int64_t sector_num, -int nb_sectors,int *pnum) +static coroutine_fn int64_t allocate_clusters(BlockDriverState *bs, +int64_t sector_num, +int nb_sectors,int *pnum) {int ret =0 ;BDRVParallelsState *s = bs->opaque;
Signature · 1 line
2.35.1
Re: [PATCH v2 13/26] parallels: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/parallels.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
PATCH v2 14/26 qcow2: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/qcow2-cluster.c | 18 +++++++++--------- block/qcow2-refcount.c | 2 +- block/qcow2.c | 4 ++-- block/qcow2.h | 14 +++++++------- 4 files changed, 19 insertions(+), 19 deletions(-)
block/qcow2-cluster.c +9 -9
@@ -884,7 +884,7 @@ int qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,return 0 ; } -static int perform_cow (BlockDriverState *bs,QCowL2Meta *m) +static int coroutine_fn perform_cow(BlockDriverState *bs, QCowL2Meta *m) {BDRVQcow2State *s = bs->opaque;Qcow2COWRegion *start = &m->cow_start;
@@ -1024,7 +1024,7 @@ fail:return ret; } -int qcow2_alloc_cluster_link_l2 (BlockDriverState *bs,QCowL2Meta *m) +int coroutine_fn qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m) {BDRVQcow2State *s = bs->opaque;int i, j =0 , l2_index, ret;
@@ -1397,8 +1397,8 @@ static int count_single_write_clusters(BlockDriverState *bs, int nb_clusters,* information on cluster allocation may be invalid now. The caller * must start over anyway, so consider *cur_bytes undefined. */ -static int handle_dependencies (BlockDriverState *bs,uint64_t guest_offset, -uint64_t *cur_bytes,QCowL2Meta **m) +static int coroutine_fn handle_dependencies(BlockDriverState *bs, uint64_t guest_offset, +uint64_t *cur_bytes,QCowL2Meta **m) {BDRVQcow2State *s = bs->opaque;QCowL2Meta *old_alloc;
@@ -1772,9 +1772,9 @@ out:* * Return 0 on success and -errno in error cases */ -int qcow2_alloc_host_offset (BlockDriverState *bs,uint64_t offset, -unsigned int *bytes,uint64_t *host_offset, -QCowL2Meta **m) +int coroutine_fn qcow2_alloc_host_offset(BlockDriverState *bs, uint64_t offset, +unsigned int *bytes,uint64_t *host_offset, +QCowL2Meta **m) {BDRVQcow2State *s = bs->opaque;uint64_t start, remaining;
@@ -2105,8 +2105,8 @@ out:return ret; } -int qcow2_subcluster_zeroize (BlockDriverState *bs,uint64_t offset, -uint64_t bytes,int flags) +int coroutine_fn qcow2_subcluster_zeroize(BlockDriverState *bs, uint64_t offset, +uint64_t bytes,int flags) {BDRVQcow2State *s = bs->opaque;uint64_t end_offset = offset + bytes;
block/qcow2-refcount.c +1 -1
@@ -3704,7 +3704,7 @@ int64_t qcow2_get_last_cluster(BlockDriverState *bs, int64_t size)return -EIO ; } -int qcow2_detect_metadata_preallocation (BlockDriverState *bs) +int coroutine_fn qcow2_detect_metadata_preallocation(BlockDriverState *bs) {BDRVQcow2State *s = bs->opaque;int64_t i, end_cluster, cluster_count =0 , threshold;
block/qcow2.c +2 -2
@@ -2438,7 +2438,7 @@ static bool merge_cow(uint64_t offset, unsigned bytes,* Return 1 if the COW regions read as zeroes, 0 if not, < 0 on error. * Note that returning 0 does not guarantee non-zero data. */ -static int is_zero_cow (BlockDriverState *bs,QCowL2Meta *m) +static int coroutine_fn is_zero_cow(BlockDriverState *bs, QCowL2Meta *m) {/* * This check is designed for optimization shortcut so it must be
@@ -2456,7 +2456,7 @@ static int is_zero_cow(BlockDriverState *bs, QCowL2Meta *m) m->cow_end.nb_bytes); } -static int handle_alloc_space (BlockDriverState *bs,QCowL2Meta *l2meta) +static int coroutine_fn handle_alloc_space(BlockDriverState *bs, QCowL2Meta *l2meta) {BDRVQcow2State *s = bs->opaque;QCowL2Meta *m;
block/qcow2.h +7 -7
@@ -895,7 +895,7 @@ int qcow2_change_refcount_order(BlockDriverState *bs, int refcount_order, void *cb_opaque, Error **errp);int qcow2_shrink_reftable (BlockDriverState *bs);int64_t qcow2_get_last_cluster (BlockDriverState *bs,int64_t size); -int qcow2_detect_metadata_preallocation (BlockDriverState *bs); +int coroutine_fn qcow2_detect_metadata_preallocation(BlockDriverState *bs);/* qcow2-cluster.c functions */ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
@@ -908,9 +908,9 @@ int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num,int qcow2_get_host_offset (BlockDriverState *bs,uint64_t offset,unsigned int *bytes,uint64_t *host_offset,QCow2SubclusterType *subcluster_type); -int qcow2_alloc_host_offset (BlockDriverState *bs,uint64_t offset, -unsigned int *bytes,uint64_t *host_offset, -QCowL2Meta **m); +int coroutine_fn qcow2_alloc_host_offset(BlockDriverState *bs, uint64_t offset, +unsigned int *bytes,uint64_t *host_offset, +QCowL2Meta **m); int qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs, uint64_t offset, int compressed_size,
@@ -918,13 +918,13 @@ int qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,void qcow2_parse_compressed_l2_entry (BlockDriverState *bs,uint64_t l2_entry,uint64_t *coffset,int *csize); -int qcow2_alloc_cluster_link_l2 (BlockDriverState *bs,QCowL2Meta *m); +int coroutine_fn qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m);void qcow2_alloc_cluster_abort (BlockDriverState *bs,QCowL2Meta *m);int qcow2_cluster_discard (BlockDriverState *bs,uint64_t offset,uint64_t bytes,enum qcow2_discard_type type,bool full_discard); -int qcow2_subcluster_zeroize (BlockDriverState *bs,uint64_t offset, -uint64_t bytes,int flags); +int coroutine_fn qcow2_subcluster_zeroize(BlockDriverState *bs, uint64_t offset, +uint64_t bytes,int flags); int qcow2_expand_zero_clusters(BlockDriverState *bs, BlockDriverAmendStatusCB *status_cb,
Signature · 1 line
2.35.1
Re: [PATCH v2 14/26] qcow2: add missing coroutine_fn annotations
Quoted 7 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/qcow2-cluster.c | 18 +++++++++--------- block/qcow2-refcount.c | 2 +- block/qcow2.c | 4 ++-- block/qcow2.h | 14 +++++++------- 4 files changed, 19 insertions(+), 19 deletions(-)
Some overly long lines.
PATCH v2 15/26 copy-before-write: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/copy-before-write.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
block/copy-before-write.c +4 -4
@@ -165,9 +165,9 @@ static int coroutine_fn cbw_co_flush(BlockDriverState *bs)* It's guaranteed that guest writes will not interact in the region until * cbw_snapshot_read_unlock() called. */ -static BlockReq *cbw_snapshot_read_lock (BlockDriverState *bs, -int64_t offset,int64_t bytes, -int64_t *pnum,BdrvChild **file) +static coroutine_fn BlockReq *cbw_snapshot_read_lock(BlockDriverState *bs, +int64_t offset,int64_t bytes, +int64_t *pnum,BdrvChild **file) {BDRVCopyBeforeWriteState *s = bs->opaque;BlockReq *req =g_new (BlockReq,1 );
@@ -197,7 +197,7 @@ static BlockReq *cbw_snapshot_read_lock(BlockDriverState *bs,return req; } -static void cbw_snapshot_read_unlock (BlockDriverState *bs,BlockReq *req) +static coroutine_fn void cbw_snapshot_read_unlock(BlockDriverState *bs, BlockReq *req) {BDRVCopyBeforeWriteState *s = bs->opaque;
Signature · 1 line
2.35.1
Re: [PATCH v2 15/26] copy-before-write: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/copy-before-write.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Some overly long lines.
PATCH v2 16/26 curl: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/curl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/curl.c +1 -1
@@ -855,7 +855,7 @@ out_noclean:return -EINVAL ; } -static void curl_setup_preadv (BlockDriverState *bs,CURLAIOCB *acb) +static void coroutine_fn curl_setup_preadv(BlockDriverState *bs, CURLAIOCB *acb) {CURLState *state;int running;
Signature · 1 line
2.35.1
Re: [PATCH v2 16/26] curl: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/curl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v2 17/26 qed: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/qed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/qed.c +2 -2
@@ -259,7 +259,7 @@ static CachedL2Table *qed_new_l2_table(BDRVQEDState *s)return l2_table; } -static bool qed_plug_allocating_write_reqs (BDRVQEDState *s) +static bool coroutine_fn qed_plug_allocating_write_reqs(BDRVQEDState *s) {qemu_co_mutex_lock (&s->table_lock);
@@ -278,7 +278,7 @@ static bool qed_plug_allocating_write_reqs(BDRVQEDState *s)return true; } -static void qed_unplug_allocating_write_reqs (BDRVQEDState *s) +static void coroutine_fn qed_unplug_allocating_write_reqs(BDRVQEDState *s) {qemu_co_mutex_lock (&s->table_lock);assert (s->allocating_write_reqs_plugged);
Signature · 1 line
2.35.1
Re: [PATCH v2 17/26] qed: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/qed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
PATCH v2 18/26 quorum: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/quorum.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-)
block/quorum.c +18 -17
@@ -161,11 +161,10 @@ static bool quorum_64bits_compare(QuorumVoteValue *a, QuorumVoteValue *b)return a->l == b->l; } -static QuorumAIOCB *quorum_aio_get (BlockDriverState *bs, -QEMUIOVector *qiov, -uint64_t offset, -uint64_t bytes, -int flags) +static QuorumAIOCB *coroutine_fn quorum_aio_get(BlockDriverState *bs, +QEMUIOVector *qiov, +uint64_t offset,uint64_t bytes, +int flags) {BDRVQuorumState *s = bs->opaque;QuorumAIOCB *acb =g_new (QuorumAIOCB,1 );
@@ -273,7 +272,7 @@ static void quorum_report_bad_versions(BDRVQuorumState *s, } } -static void quorum_rewrite_entry (void *opaque) +static void coroutine_fn quorum_rewrite_entry(void *opaque) {QuorumCo *co = opaque;QuorumAIOCB *acb = co->acb;
@@ -574,7 +573,7 @@ free_exit:quorum_free_vote_list (&acb->votes); } -static void read_quorum_children_entry (void *opaque) +static void coroutine_fn read_quorum_children_entry(void *opaque) {QuorumCo *co = opaque;QuorumAIOCB *acb = co->acb;
@@ -602,7 +601,7 @@ static void read_quorum_children_entry(void *opaque) } } -static int read_quorum_children (QuorumAIOCB *acb) +static int coroutine_fn read_quorum_children(QuorumAIOCB *acb) {BDRVQuorumState *s = acb->bs->opaque;int i;
@@ -643,7 +642,7 @@ static int read_quorum_children(QuorumAIOCB *acb)return acb->vote_ret; } -static int read_fifo_child (QuorumAIOCB *acb) +static int coroutine_fn read_fifo_child(QuorumAIOCB *acb) {BDRVQuorumState *s = acb->bs->opaque;int n, ret;
@@ -664,8 +663,9 @@ static int read_fifo_child(QuorumAIOCB *acb)return ret; } -static int quorum_co_preadv (BlockDriverState *bs,int64_t offset,int64_t bytes, -QEMUIOVector *qiov,BdrvRequestFlags flags) +static int coroutine_fn quorum_co_preadv(BlockDriverState *bs, +int64_t offset,int64_t bytes, +QEMUIOVector *qiov,BdrvRequestFlags flags) {BDRVQuorumState *s = bs->opaque;QuorumAIOCB *acb =quorum_aio_get (bs, qiov, offset, bytes, flags);
@@ -684,7 +684,7 @@ static int quorum_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,return ret; } -static void write_quorum_entry (void *opaque) +static void coroutine_fn write_quorum_entry(void *opaque) {QuorumCo *co = opaque;QuorumAIOCB *acb = co->acb;
@@ -715,9 +715,9 @@ static void write_quorum_entry(void *opaque) } } -static int quorum_co_pwritev (BlockDriverState *bs,int64_t offset, -int64_t bytes,QEMUIOVector *qiov, -BdrvRequestFlags flags) +static int coroutine_fn quorum_co_pwritev(BlockDriverState *bs, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +BdrvRequestFlags flags) {BDRVQuorumState *s = bs->opaque;QuorumAIOCB *acb =quorum_aio_get (bs, qiov, offset, bytes, flags);
@@ -746,8 +746,9 @@ static int quorum_co_pwritev(BlockDriverState *bs, int64_t offset,return ret; } -static int quorum_co_pwrite_zeroes (BlockDriverState *bs,int64_t offset, -int64_t bytes,BdrvRequestFlags flags) +static int coroutine_fn quorum_co_pwrite_zeroes(BlockDriverState *bs, +int64_t offset,int64_t bytes, +BdrvRequestFlags flags) { return quorum_co_pwritev(bs, offset, bytes, NULL,
Signature · 1 line
2.35.1
Re: [PATCH v2 18/26] quorum: add missing coroutine_fn annotations
Quoted 53 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/quorum.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-)block/quorum.c +7
-8@@ -161,11 +161,10 @@ static bool quorum_64bits_compare(QuorumVoteValue *a, QuorumVoteValue *b)return a->l == b->l; } -static QuorumAIOCB *quorum_aio_get (BlockDriverState *bs, -QEMUIOVector *qiov, -uint64_t offset, -uint64_t bytes, -int flags) +static QuorumAIOCB *coroutine_fn quorum_aio_get(BlockDriverState *bs, +QEMUIOVector *qiov, +uint64_t offset,uint64_t bytes, +int flags) {BDRVQuorumState *s = bs->opaque;QuorumAIOCB *acb =g_new (QuorumAIOCB,1 );@@ -273,7 +272,7 @@ static void quorum_report_bad_versions(BDRVQuorumState *s, } } -static void quorum_rewrite_entry (void *opaque) +static void coroutine_fn quorum_rewrite_entry(void *opaque) {QuorumCo *co = opaque;QuorumAIOCB *acb = co->acb;@@ -574,7 +573,7 @@ free_exit:quorum_free_vote_list (&acb->votes); } -static void read_quorum_children_entry (void *opaque) +static void coroutine_fn read_quorum_children_entry(void *opaque) {QuorumCo *co = opaque;QuorumAIOCB *acb = co->acb;@@ -602,7 +601,7 @@ static void read_quorum_children_entry(void *opaque) } } -static int read_quorum_children (QuorumAIOCB *acb) +static int coroutine_fn read_quorum_children(QuorumAIOCB *acb) {BDRVQuorumState *s = acb->bs->opaque;int i;
block/quorum.c static int read_quorum_children(QuorumAIOCB *acb) · line 645
Quoted 5 lines
block/quorum.c +1
-1@@ -643,7 +642,7 @@ static int read_quorum_children(QuorumAIOCB *acb)return acb->vote_ret; } -static int read_fifo_child (QuorumAIOCB *acb) +static int coroutine_fn read_fifo_child(QuorumAIOCB *acb)
There's a prototype further above that may be worth marking as coroutine_fn too.
block/quorum.c static int read_fifo_child(QuorumAIOCB *acb) · line 668
Quoted 12 lines
block/quorum.c +3
-2{BDRVQuorumState *s = acb->bs->opaque;int n, ret;@@ -664,8 +663,9 @@ static int read_fifo_child(QuorumAIOCB *acb)return ret; } -static int quorum_co_preadv (BlockDriverState *bs,int64_t offset,int64_t bytes, -QEMUIOVector *qiov,BdrvRequestFlags flags) +static int coroutine_fn quorum_co_preadv(BlockDriverState *bs, +int64_t offset,int64_t bytes, +QEMUIOVector *qiov,BdrvRequestFlags flags)
Overly long line.
Quoted 38 lines
block/quorum.c +7
-7{BDRVQuorumState *s = bs->opaque;QuorumAIOCB *acb =quorum_aio_get (bs, qiov, offset, bytes, flags);@@ -684,7 +684,7 @@ static int quorum_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,return ret; } -static void write_quorum_entry (void *opaque) +static void coroutine_fn write_quorum_entry(void *opaque) {QuorumCo *co = opaque;QuorumAIOCB *acb = co->acb;@@ -715,9 +715,9 @@ static void write_quorum_entry(void *opaque) } } -static int quorum_co_pwritev (BlockDriverState *bs,int64_t offset, -int64_t bytes,QEMUIOVector *qiov, -BdrvRequestFlags flags) +static int coroutine_fn quorum_co_pwritev(BlockDriverState *bs, int64_t offset, +int64_t bytes,QEMUIOVector *qiov, +BdrvRequestFlags flags) {BDRVQuorumState *s = bs->opaque;QuorumAIOCB *acb =quorum_aio_get (bs, qiov, offset, bytes, flags);@@ -746,8 +746,9 @@ static int quorum_co_pwritev(BlockDriverState *bs, int64_t offset,return ret; } -static int quorum_co_pwrite_zeroes (BlockDriverState *bs,int64_t offset, -int64_t bytes,BdrvRequestFlags flags) +static int coroutine_fn quorum_co_pwrite_zeroes(BlockDriverState *bs, +int64_t offset,int64_t bytes, +BdrvRequestFlags flags) { return quorum_co_pwritev(bs, offset, bytes, NULL, --
Quoted 1 line
2.35.1
PATCH v2 19/26 throttle: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/throttle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/throttle.c +1 -1
@@ -162,7 +162,7 @@ static int coroutine_fn throttle_co_pwritev_compressed(BlockDriverState *bs, BDRV_REQ_WRITE_COMPRESSED); } -static int throttle_co_flush (BlockDriverState *bs) +static int coroutine_fn throttle_co_flush(BlockDriverState *bs) {return bdrv_co_flush (bs->file->bs); }
Signature · 1 line
2.35.1
Re: [PATCH v2 19/26] throttle: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/throttle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v2 20/26 vmdk: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/vmdk.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
block/vmdk.c +10 -10
@@ -1793,10 +1793,10 @@ static int coroutine_fn vmdk_co_block_status(BlockDriverState *bs,return ret; } -static int vmdk_write_extent (VmdkExtent *extent,int64_t cluster_offset, -int64_t offset_in_cluster,QEMUIOVector *qiov, -uint64_t qiov_offset,uint64_t n_bytes, -uint64_t offset) +static int coroutine_fn vmdk_write_extent(VmdkExtent *extent, int64_t cluster_offset, +int64_t offset_in_cluster,QEMUIOVector *qiov, +uint64_t qiov_offset,uint64_t n_bytes, +uint64_t offset) {int ret;VmdkGrainMarker *data =NULL ;
@@ -1874,9 +1874,9 @@ static int vmdk_write_extent(VmdkExtent *extent, int64_t cluster_offset,return ret; } -static int vmdk_read_extent (VmdkExtent *extent,int64_t cluster_offset, -int64_t offset_in_cluster,QEMUIOVector *qiov, -int bytes) +static int coroutine_fn vmdk_read_extent(VmdkExtent *extent, int64_t cluster_offset, +int64_t offset_in_cluster,QEMUIOVector *qiov, +int bytes) {int ret;int cluster_bytes, buf_bytes;
@@ -2023,9 +2023,9 @@ fail:* * Returns: error code with 0 for success. */ -static int vmdk_pwritev (BlockDriverState *bs,uint64_t offset, -uint64_t bytes,QEMUIOVector *qiov, -bool zeroed,bool zero_dry_run) +static int coroutine_fn vmdk_pwritev(BlockDriverState *bs, uint64_t offset, +uint64_t bytes,QEMUIOVector *qiov, +bool zeroed,bool zero_dry_run) {BDRVVmdkState *s = bs->opaque;VmdkExtent *extent =NULL ;
Signature · 1 line
2.35.1
Re: [PATCH v2 20/26] vmdk: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/vmdk.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
Some overly long lines.
PATCH v2 21/26 job: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- include/qemu/job.h | 2 +- job.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/qemu/job.h +1 -1
@@ -436,7 +436,7 @@ void coroutine_fn job_pause_point(Job *job);* * Yield the job coroutine. */ -void job_yield (Job *job); +void coroutine_fn job_yield(Job *job);/** * @job: The job that calls the function.
job.c +1 -1
@@ -525,7 +525,7 @@ void coroutine_fn job_pause_point(Job *job) } } -void job_yield (Job *job) +void coroutine_fn job_yield(Job *job) {assert (job->busy);
Signature · 1 line
2.35.1
Re: [PATCH v2 21/26] job: add missing coroutine_fn annotations
Quoted 5 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- include/qemu/job.h | 2 +- job.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
PATCH v2 22/26 coroutine-lock: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- util/qemu-coroutine-lock.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
util/qemu-coroutine-lock.c +7 -7
@@ -144,7 +144,7 @@ typedef struct CoWaitRecord {QSLIST_ENTRY (CoWaitRecord) next; } CoWaitRecord; -static void push_waiter (CoMutex *mutex,CoWaitRecord *w) +static void coroutine_fn push_waiter(CoMutex *mutex, CoWaitRecord *w) { w->co =qemu_coroutine_self ();QSLIST_INSERT_HEAD_ATOMIC (&mutex->from_push, w, next);
@@ -341,7 +341,7 @@ void qemu_co_rwlock_init(CoRwlock *lock) }/* Releases the internal CoMutex. */ -static void qemu_co_rwlock_maybe_wake_one (CoRwlock *lock) +static void coroutine_fn qemu_co_rwlock_maybe_wake_one(CoRwlock *lock) {CoRwTicket *tkt =QSIMPLEQ_FIRST (&lock->tickets);Coroutine *co =NULL ;
@@ -374,7 +374,7 @@ static void qemu_co_rwlock_maybe_wake_one(CoRwlock *lock) } } -void qemu_co_rwlock_rdlock (CoRwlock *lock) +void coroutine_fn qemu_co_rwlock_rdlock(CoRwlock *lock) {Coroutine *self =qemu_coroutine_self ();
@@ -399,7 +399,7 @@ void qemu_co_rwlock_rdlock(CoRwlock *lock) self->locks_held++; } -void qemu_co_rwlock_unlock (CoRwlock *lock) +void coroutine_fn qemu_co_rwlock_unlock(CoRwlock *lock) {Coroutine *self =qemu_coroutine_self ();
@@ -417,7 +417,7 @@ void qemu_co_rwlock_unlock(CoRwlock *lock)qemu_co_rwlock_maybe_wake_one (lock); } -void qemu_co_rwlock_downgrade (CoRwlock *lock) +void coroutine_fn qemu_co_rwlock_downgrade(CoRwlock *lock) {qemu_co_mutex_lock (&lock->mutex);assert (lock->owners ==-1 );
@@ -427,7 +427,7 @@ void qemu_co_rwlock_downgrade(CoRwlock *lock)qemu_co_rwlock_maybe_wake_one (lock); } -void qemu_co_rwlock_wrlock (CoRwlock *lock) +void coroutine_fn qemu_co_rwlock_wrlock(CoRwlock *lock) {Coroutine *self =qemu_coroutine_self ();
@@ -447,7 +447,7 @@ void qemu_co_rwlock_wrlock(CoRwlock *lock) self->locks_held++; } -void qemu_co_rwlock_upgrade (CoRwlock *lock) +void coroutine_fn qemu_co_rwlock_upgrade(CoRwlock *lock) {qemu_co_mutex_lock (&lock->mutex);assert (lock->owners >0 );
Signature · 1 line
2.35.1
Re: [PATCH v2 22/26] coroutine-lock: add missing coroutine_fn annotations
Quoted 4 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- util/qemu-coroutine-lock.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
PATCH v2 23/26 raw-format: add missing coroutine_fn annotations
In reply to Paolo Bonzini--- block/raw-format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/raw-format.c +1 -1
@@ -411,7 +411,7 @@ static void raw_lock_medium(BlockDriverState *bs, bool locked)bdrv_lock_medium (bs->file->bs, locked); } -static int raw_co_ioctl (BlockDriverState *bs,unsigned long int req,void *buf) +static int coroutine_fn raw_co_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) {BDRVRawState *s = bs->opaque;if (s->offset || s->has_size) {
Signature · 1 line
2.35.1
Re: [PATCH v2 23/26] raw-format: add missing coroutine_fn annotations
Quoted 10 lines · Paolo Bonzini
Signed-off-by Paolo Bonzini <[email protected]>--- block/raw-format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)block/raw-format.c +0
-0
block/raw-format.c static void raw_lock_medium(BlockDriverState *bs, bool locked) · line 414
Quoted 5 lines
block/raw-format.c +1
-1@@ -411,7 +411,7 @@ static void raw_lock_medium(BlockDriverState *bs, bool locked)bdrv_lock_medium (bs->file->bs, locked); } -static int raw_co_ioctl (BlockDriverState *bs,unsigned long int req,void *buf) +static int coroutine_fn raw_co_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
Overly long line.
Quoted 5 lines
block/raw-format.c +0
-1{BDRVRawState *s = bs->opaque;if (s->offset || s->has_size) { --2.35.1
PATCH v2 24/26 9p: add missing coroutine_fn annotations
In reply to Paolo BonziniFrom: Marc-André Lureau <[email protected]>
--- hw/9pfs/9p.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
hw/9pfs/9p.h +6 -3
@@ -424,21 +424,24 @@ typedef struct V9fsGetlockextern int open_fd_hw;extern int total_open_fd; -static inline void v9fs_path_write_lock (V9fsState *s) +static inline void coroutine_fn +v9fs_path_write_lock (V9fsState *s) {if (s->ctx.export_flags &V9FS_PATHNAME_FSCONTEXT ) {qemu_co_rwlock_wrlock (&s->rename_lock); } } -static inline void v9fs_path_read_lock (V9fsState *s) +static inline void coroutine_fn +v9fs_path_read_lock (V9fsState *s) {if (s->ctx.export_flags &V9FS_PATHNAME_FSCONTEXT ) {qemu_co_rwlock_rdlock (&s->rename_lock); } } -static inline void v9fs_path_unlock (V9fsState *s) +static inline void coroutine_fn +v9fs_path_unlock (V9fsState *s) {if (s->ctx.export_flags &V9FS_PATHNAME_FSCONTEXT ) {qemu_co_rwlock_unlock (&s->rename_lock);
Signature · 1 line
2.35.1
Re: [PATCH v2 24/26] 9p: add missing coroutine_fn annotations
Quoted 8 lines · Paolo Bonzini
From: Marc-André Lureau <[email protected]>
Signed-off-by Marc-André Lureau <[email protected]>Acked-by Greg Kurz <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>--- hw/9pfs/9p.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
PATCH v2 25/26 migration: add missing coroutine_fn annotations
In reply to Paolo BonziniFrom: Marc-André Lureau <[email protected]>
--- migration/migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
migration/migration.c +2 -1
@@ -565,7 +565,8 @@ static void process_incoming_migration_bh(void *opaque)migration_incoming_state_destroy (); } -static void process_incoming_migration_co (void *opaque) +static void coroutine_fn +process_incoming_migration_co (void *opaque) {MigrationIncomingState *mis =migration_incoming_get_current ();PostcopyState ps;
Signature · 1 line
2.35.1
Re: [PATCH v2 25/26] migration: add missing coroutine_fn annotations
Quoted 9 lines · Paolo Bonzini
From: Marc-André Lureau <[email protected]>
Signed-off-by Marc-André Lureau <[email protected]>Reviewed-by Juan Quintela <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>--- migration/migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
PATCH v2 26/26 test-coroutine: add missing coroutine_fn annotations
In reply to Paolo BonziniFrom: Marc-André Lureau <[email protected]>
Message-Id: <[email protected]>
--- tests/unit/test-coroutine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/unit/test-coroutine.c +1 -1
@@ -610,7 +610,7 @@ static void perf_baseline(void)g_test_message ("Function call %u iterations: %f s" , maxcycles, duration); } -static __attribute__((noinline))void perf_cost_func (void *opaque) +static __attribute__((noinline)) void coroutine_fn perf_cost_func(void *opaque) {qemu_coroutine_yield (); }
Signature · 1 line
2.35.1
Re: [PATCH v2 26/26] test-coroutine: add missing coroutine_fn annotations
Quoted 8 lines · Paolo Bonzini
From: Marc-André Lureau <[email protected]>
Signed-off-by Marc-André Lureau <[email protected]>Message-Id: <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>--- tests/unit/test-coroutine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 11 lines · Paolo Bonzini
This is the initial result of reviving Marc-André's series at
https://patchew.org/QEMU/[email protected]/.
A lot of the patches are similar to the ones that Marc-André wrote, but due to the changes in the code it was easier to redo them.For nbd, the patch is on top of "nbd: mark more
coroutine_fns" that I sent a few days ago and that (AIUI) Eric has already queued; only one function was missing, much to my surprise.Apart from this, I also identified the following functions that can be called both in coroutine context and outside:
snip
Quoted 2 lines
-
qio_channel_readv_full_all_eof
-qio_channel_writev_full_all
I'm trying to understand what criteria makes those two functions liable for the annotation, but not others in the I/O code ?
What is the actual rule for when to apply 'coroutine_fn' annotation to a function, and does it apply transitively to up and/or down the call stack ?
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 9 lines · Daniel P. Berrangé
Quoted 2 lines
Apart from this, I also identified the following functions that can be called both in coroutine context and outside:
snip
Quoted 2 lines
-
qio_channel_readv_full_all_eof
-qio_channel_writev_full_allI'm trying to understand what criteria makes those two functions liable for the annotation, but not others in the I/O code ?
These two are _not_ annotated as coroutine_fn: this is a list of functions that can be called both in coroutine context and outside, while 'coroutine_fn' functions can be called only within coroutines.
The only 'coroutine_fn' function in the I/O code is qio_channel_yield.
Quoted 3 lines
What is the actual rule for when to apply '
coroutine_fn' annotation to a function, and does it apply transitively to up and/or down the call stack ?
The only rule is that callers of coroutine_fn must be coroutine_fn themselves, or the call must be within "if (qemu_in_coroutine())". For example:
- qio_channel_readv_full_all_eof() calls qio_channel_yield() within such an "if", therefore it need not be coroutine_fn.
- qio_channel_yield() unconditionally calls qemu_coroutine_yield() which is coroutine_fn, and therefore must be coroutine_fn as well.
After this series, the only exception to the rule is that qemu_coroutine_self() is occasionally called from tracepoints.
Paolo