Still more coroutine and various fixes in block layer
Subsystems (2)
v6 cover Still more coroutine and various fixes in block layer
This is a dump of all minor coroutine-related fixes found while looking around and testing various things in the QEMU block layer.
Patches aim to:
- add missing coroutine_fn annotation to the functions
- simplify to avoid the typical "if in coroutine: fn()
// else create_coroutine(fn)" already present in generated_co_wraper functions.
- make sure that if a BlockDriver callback is defined as coroutine_fn, then it is always running in a coroutine.
This serie is based on Kevin Wolf's series "block: Simplify drain".
Based-on: <[email protected]>
Emanuele
---
v6:
* use different naming for block-coroutine-wrapper annotations
* fix minor typos and patch odering
v5:
* add missing reviewed-by from Paolo
* minor indentation fixes
* use when possible _co_, but do not create new g_c_w. It will be done in future series
* introduce QEMU_IN_COROUTINE
* reorder patches
* rebase on kevin block branch + v2 from "block: Simplify drain"
v4:
* use v2 commit messages
* introduce coroutine_wrapper to simplify patches
v3:
* Remove patch 1, base on kevin "drain semplification serie"
v2:
* clarified commit message in patches 2/3/6 on why we add coroutine_fn
Emanuele Giuseppe Esposito (14):
block-io: introduce coroutine_fn duplicates for
bdrv_common_block_status_above callers
block-copy: add missing coroutine_fn annotations nbd/server.c: add missing coroutine_fn annotations
block-backend: replace bdrv_*_above with blk_*_above block/vmdk: add missing coroutine_fn annotations
block: avoid duplicating filename string in bdrv_create
block: distinguish between bdrv_create running in coroutine and not
block: bdrv_create_file is a coroutine_fn
block: rename generated_co_wrapper in co_wrapper_mixed block-coroutine-wrapper.py: introduce co_wrapper block-coroutine-wrapper.py: default to main loop aiocontext if
function does not have a BlockDriverState parameter
block-coroutine-wrapper.py: support also basic return types
block: convert bdrv_create to co_wrapper block/dirty-bitmap: convert coroutine-only functions to co_wrapper
block.c | 65 +++---------- block/block-backend.c | 21 +++++ block/block-copy.c | 21 +++-- block/block-gen.h | 11 +-- block/commit.c | 4 +- block/coroutines.h | 4 +- block/crypto.c | 2 +- block/dirty-bitmap.c | 88 +----------------- block/io.c | 58 +++++++++++- block/meson.build | 1 + block/parallels.c | 2 +- block/qcow.c | 2 +- block/qcow2.c | 4 +- block/qed.c | 2 +- block/raw-format.c | 2 +- block/vdi.c | 2 +- block/vhdx.c | 2 +- block/vmdk.c | 38 ++++---- block/vpc.c | 2 +- docs/devel/block-coroutine-wrapper.rst | 6 +- include/block/block-common.h | 20 ++-- include/block/block-copy.h | 5 +- include/block/block-global-state.h | 11 ++- include/block/block-io.h | 69 +++++++++----- include/block/dirty-bitmap.h | 10 +- include/sysemu/block-backend-io.h | 77 +++++++++------- nbd/server.c | 47 +++++----- scripts/block-coroutine-wrapper.py | 122 +++++++++++++++++-------- 28 files changed, 376 insertions(+), 322 deletions(-)
Signature · 1 line
2.31.1
PATCH v6 1/14 block-io: introduce coroutine_fn duplicates for bdrv_common_block_status_above callers
bdrv_common_block_status_above() is a g_c_w, and it is being called by many "wrapper" functions like bdrv_is_allocated(), bdrv_is_allocated_above() and bdrv_block_status_above().
Because we want to eventually split the coroutine from non-coroutine case in g_c_w, create duplicate wrappers that take care of directly calling the same coroutine functions called in the g_c_w.
--- block/io.c | 58 +++++++++++++++++++++++++++++++++++++--- include/block/block-io.h | 15 +++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-)
block/io.c +55 -3
@@ -2533,6 +2533,17 @@ bdrv_co_common_block_status_above(BlockDriverState *bs,return ret; } +int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs, +BlockDriverState *base, +int64_t offset,int64_t bytes, +int64_t *pnum,int64_t *map, +BlockDriverState **file) +{ +IO_CODE (); +return bdrv_co_common_block_status_above (bs, base, false, true, offset, + bytes, pnum, map, file,NULL ); +} +int bdrv_block_status_above (BlockDriverState *bs,BlockDriverState *base,int64_t offset,int64_t bytes,int64_t *pnum,int64_t *map,BlockDriverState **file)
@@ -2578,6 +2589,22 @@ int coroutine_fn bdrv_co_is_zero_fast(BlockDriverState *bs, int64_t offset,return (pnum == bytes) && (ret &BDRV_BLOCK_ZERO ); } +int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t offset, +int64_t bytes,int64_t *pnum) +{ +int ret; +int64_t dummy; +IO_CODE (); + + ret =bdrv_co_common_block_status_above (bs, bs, true, false, offset, + bytes, pnum ? pnum : &dummy,NULL , +NULL ,NULL ); +if (ret <0 ) { +return ret; + } +return !!(ret &BDRV_BLOCK_ALLOCATED ); +} +int bdrv_is_allocated (BlockDriverState *bs,int64_t offset,int64_t bytes,int64_t *pnum) {
@@ -2594,6 +2621,29 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t offset, int64_t bytes,return !!(ret &BDRV_BLOCK_ALLOCATED ); } +/* See bdrv_is_allocated_above for documentation */ +int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top, +BlockDriverState *base, +bool include_base,int64_t offset, +int64_t bytes,int64_t *pnum) +{ +int depth; +int ret; +IO_CODE (); + + ret =bdrv_co_common_block_status_above (top, base, include_base, false, + offset, bytes, pnum,NULL ,NULL , + &depth); +if (ret <0 ) { +return ret; + } + +if (ret &BDRV_BLOCK_ALLOCATED ) { +return depth; + } +return 0 ; +} +/* * Given an image chain: ... -> [BASE] -> [INTER1] -> [INTER2] -> [TOP] *
@@ -2617,10 +2667,12 @@ int bdrv_is_allocated_above(BlockDriverState *top, int64_t bytes, int64_t *pnum) { int depth; -int ret =bdrv_common_block_status_above (top, base, include_base, false, - offset, bytes, pnum,NULL ,NULL , - &depth); +int ret;IO_CODE (); + + ret =bdrv_common_block_status_above (top, base, include_base, false, + offset, bytes, pnum,NULL ,NULL , + &depth);if (ret <0 ) {return ret; }
include/block/block-io.h +15 -0
@@ -94,14 +94,29 @@ bool bdrv_can_write_zeroes_with_unmap(BlockDriverState *bs);int bdrv_block_status (BlockDriverState *bs,int64_t offset,int64_t bytes,int64_t *pnum,int64_t *map,BlockDriverState **file); + +int coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs, +BlockDriverState *base, +int64_t offset,int64_t bytes, +int64_t *pnum,int64_t *map, +BlockDriverState **file);int bdrv_block_status_above (BlockDriverState *bs,BlockDriverState *base,int64_t offset,int64_t bytes,int64_t *pnum,int64_t *map,BlockDriverState **file); + +int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t offset, +int64_t bytes,int64_t *pnum);int bdrv_is_allocated (BlockDriverState *bs,int64_t offset,int64_t bytes,int64_t *pnum); + +int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top, +BlockDriverState *base, +bool include_base,int64_t offset, +int64_t bytes,int64_t *pnum);int bdrv_is_allocated_above (BlockDriverState *top,BlockDriverState *base,bool include_base,int64_t offset,int64_t bytes,int64_t *pnum); + int coroutine_fn bdrv_co_is_zero_fast(BlockDriverState *bs, int64_t offset,int64_t bytes);
Signature · 1 line
2.31.1
Re: [PATCH v6 01/14] block-io: introduce coroutine_fn duplicates for bdrv_common_block_status_above callers
Quoted 10 lines · Emanuele Giuseppe Esposito
bdrv_common_block_status_above()is ag_c_w, and it is being called by many "wrapper" functions likebdrv_is_allocated(),bdrv_is_allocated_above()andbdrv_block_status_above().Because we want to eventually split the coroutine from non-coroutine case in
g_c_w, create duplicate wrappers that take care of directly calling the same coroutine functions called in theg_c_w.Signed-off-by Emanuele Giuseppe Esposito<[email protected]>Reviewed-by Kevin Wolf<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH v6 2/14 block-copy: add missing coroutine_fn annotations
In reply to Emanuele Giuseppe EspositoThese functions end up calling bdrv_common_block_status_above(), a generated_co_wrapper function.
In addition, they also happen to be always called in coroutine context, meaning all callers are coroutine_fn.
This means that the g_c_w function will enter the qemu_in_coroutine() case and eventually suspend (or in other words call qemu_coroutine_yield()). Therefore we need to mark such functions coroutine_fn too.
--- block/block-copy.c | 21 ++++++++++++--------- include/block/block-copy.h | 5 +++-- 2 files changed, 15 insertions(+), 11 deletions(-)
block/block-copy.c +12 -9
@@ -577,8 +577,9 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)return ret; } -static int block_copy_block_status (BlockCopyState *s,int64_t offset, -int64_t bytes,int64_t *pnum) +static coroutine_fn int block_copy_block_status(BlockCopyState *s, +int64_t offset, +int64_t bytes,int64_t *pnum) {int64_t num;BlockDriverState *base;
@@ -590,8 +591,8 @@ static int block_copy_block_status(BlockCopyState *s, int64_t offset, base =NULL ; } - ret =bdrv_block_status_above (s->source->bs, base, offset, bytes, &num, -NULL ,NULL ); + ret =bdrv_co_block_status_above (s->source->bs, base, offset, bytes, &num, +NULL ,NULL );if (ret <0 || num < s->cluster_size) {/* * On error or if failed to obtain large enough chunk just fallback to
@@ -613,8 +614,9 @@ static int block_copy_block_status(BlockCopyState *s, int64_t offset,* Check if the cluster starting at offset is allocated or not. * return via pnum the number of contiguous clusters sharing this allocation. */ -static int block_copy_is_cluster_allocated (BlockCopyState *s,int64_t offset, -int64_t *pnum) +static int coroutine_fn block_copy_is_cluster_allocated(BlockCopyState *s, +int64_t offset, +int64_t *pnum) {BlockDriverState *bs = s->source->bs;int64_t count, total_count =0 ;
@@ -624,7 +626,7 @@ static int block_copy_is_cluster_allocated(BlockCopyState *s, int64_t offset,assert (QEMU_IS_ALIGNED (offset, s->cluster_size));while (true) { - ret =bdrv_is_allocated (bs, offset, bytes, &count); + ret =bdrv_co_is_allocated (bs, offset, bytes, &count);if (ret <0 ) {return ret; }
@@ -669,8 +671,9 @@ void block_copy_reset(BlockCopyState *s, int64_t offset, int64_t bytes)* @return 0 when the cluster at @offset was unallocated, * 1 otherwise, and -ret on error. */ -int64_t block_copy_reset_unallocated (BlockCopyState *s, -int64_t offset,int64_t *count) +int64_t coroutine_fn block_copy_reset_unallocated(BlockCopyState *s, +int64_t offset, +int64_t *count) {int ret;int64_t clusters, bytes;
include/block/block-copy.h +3 -2
@@ -36,8 +36,9 @@ void block_copy_set_progress_meter(BlockCopyState *s, ProgressMeter *pm);void block_copy_state_free (BlockCopyState *s);void block_copy_reset (BlockCopyState *s,int64_t offset,int64_t bytes); -int64_t block_copy_reset_unallocated (BlockCopyState *s, -int64_t offset,int64_t *count); +int64_t coroutine_fn block_copy_reset_unallocated(BlockCopyState *s, +int64_t offset, +int64_t *count); int coroutine_fn block_copy(BlockCopyState *s, int64_t offset, int64_t bytes, bool ignore_ratelimit, uint64_t timeout_ns,
Signature · 1 line
2.31.1
Re: [PATCH v6 02/14] block-copy: add missing coroutine_fn annotations
Quoted 7 lines · Emanuele Giuseppe Esposito
These functions end up calling
bdrv_common_block_status_above(), agenerated_co_wrapperfunction.
In addition, they also happen to be always called in coroutine context, meaning all callers arecoroutine_fn.
This means that theg_c_wfunction will enter theqemu_in_coroutine()case and eventually suspend (or in other words callqemu_coroutine_yield()). Therefore we need to mark such functionscoroutine_fntoo.
I still think that "we need to mark" is not quite correct. Actually "we can mark", as such marking doesn't brake things. And we do have a reason for it, which comes in the following patches, but the commit message say nothing about it.
As well as in subject: they are not "missing", as nothing wrong for function not to be "coroutine_fn", when it doesn't call other "coroutine_fn"s.
Quoted 4 lines
Signed-off-by Emanuele Giuseppe Esposito <[email protected]>Reviewed-by Paolo Bonzini <[email protected]>Reviewed-by Kevin Wolf <[email protected]>
change is OK:
Signature · 2 lines
Best regards, Vladimir
PATCH v6 3/14 nbd/server.c: add missing coroutine_fn annotations
In reply to Emanuele Giuseppe EspositoThese functions end up calling bdrv_*() implemented as generated_co_wrapper functions.
In addition, they also happen to be always called in coroutine context, meaning all callers are coroutine_fn.
This means that the g_c_w function will enter the qemu_in_coroutine() case and eventually suspend (or in other words call qemu_coroutine_yield()). Therefore we need to mark such functions coroutine_fn too.
--- nbd/server.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
nbd/server.c +16 -13
@@ -2141,14 +2141,15 @@ static int nbd_extent_array_add(NBDExtentArray *ea,return 0 ; } -static int blockstatus_to_extents (BlockDriverState *bs,uint64_t offset, -uint64_t bytes,NBDExtentArray *ea) +static int coroutine_fn blockstatus_to_extents(BlockDriverState *bs, +uint64_t offset,uint64_t bytes, +NBDExtentArray *ea) {while (bytes) {uint32_t flags;int64_t num; -int ret =bdrv_block_status_above (bs,NULL , offset, bytes, &num, -NULL ,NULL ); +int ret =bdrv_co_block_status_above (bs,NULL , offset, bytes, &num, +NULL ,NULL );if (ret <0 ) {return ret;
@@ -2168,13 +2169,14 @@ static int blockstatus_to_extents(BlockDriverState *bs, uint64_t offset,return 0 ; } -static int blockalloc_to_extents (BlockDriverState *bs,uint64_t offset, -uint64_t bytes,NBDExtentArray *ea) +static int coroutine_fn blockalloc_to_extents(BlockDriverState *bs, +uint64_t offset,uint64_t bytes, +NBDExtentArray *ea) {while (bytes) {int64_t num; -int ret =bdrv_is_allocated_above (bs,NULL , false, offset, bytes, - &num); +int ret =bdrv_co_is_allocated_above (bs,NULL , false, offset, bytes, + &num);if (ret <0 ) {return ret;
@@ -2220,11 +2222,12 @@ static int nbd_co_send_extents(NBDClient *client, uint64_t handle, }/* Get block status from the exported device and send it to the client */ -static int nbd_co_send_block_status (NBDClient *client,uint64_t handle, -BlockDriverState *bs,uint64_t offset, -uint32_t length,bool dont_fragment, -bool last,uint32_t context_id, -Error **errp) +static int +coroutine_fn nbd_co_send_block_status(NBDClient *client, uint64_t handle, +BlockDriverState *bs,uint64_t offset, +uint32_t length,bool dont_fragment, +bool last,uint32_t context_id, +Error **errp) {int ret;unsigned int nb_extents = dont_fragment ?1 :NBD_MAX_BLOCK_STATUS_EXTENTS ;
Signature · 1 line
2.31.1
Re: [PATCH v6 03/14] nbd/server.c: add missing coroutine_fn annotations
Quoted 7 lines · Emanuele Giuseppe Esposito
These functions end up calling bdrv_*() implemented as
generated_co_wrapperfunctions.
In addition, they also happen to be always called in coroutine context, meaning all callers arecoroutine_fn.
This means that theg_c_wfunction will enter theqemu_in_coroutine()case and eventually suspend (or in other words callqemu_coroutine_yield()). Therefore we need to mark such functionscoroutine_fntoo.
Same here about "need" and "missing".
Quoted 4 lines
Signed-off-by Emanuele Giuseppe Esposito<[email protected]>Reviewed-by Kevin Wolf<[email protected]>Reviewed-by Paolo Bonzini<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH v6 4/14 block-backend: replace bdrv_*_above with blk_*_above
In reply to Emanuele Giuseppe EspositoAvoid mixing bdrv_* functions with blk_*, so create blk_* counterparts for bdrv_block_status_above and bdrv_is_allocated_above.
Note that since blk_co_block_status_above only calls the g_c_w function bdrv_common_block_status_above and is marked as coroutine_fn, call directly bdrv_co_common_block_status_above() to avoid using a g_c_w. Same applies to blk_co_is_allocated_above.
--- block/block-backend.c | 21 ++++++++++++++++++++ block/commit.c | 4 ++-- include/sysemu/block-backend-io.h | 9 +++++++++ nbd/server.c | 32 +++++++++++++++---------------- 4 files changed, 48 insertions(+), 18 deletions(-)
block/block-backend.c +21 -0
@@ -1424,6 +1424,27 @@ int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,return blk_co_pwritev_part (blk, offset, bytes, qiov,0 , flags); } +int coroutine_fn blk_co_block_status_above(BlockBackend *blk, +BlockDriverState *base, +int64_t offset,int64_t bytes, +int64_t *pnum,int64_t *map, +BlockDriverState **file) +{ +IO_CODE (); +return bdrv_co_block_status_above (blk_bs (blk), base, offset, bytes, pnum, + map, file); +} + +int coroutine_fn blk_co_is_allocated_above(BlockBackend *blk, +BlockDriverState *base, +bool include_base,int64_t offset, +int64_t bytes,int64_t *pnum) +{ +IO_CODE (); +return bdrv_co_is_allocated_above (blk_bs (blk), base, include_base, offset, + bytes, pnum); +} + typedef struct BlkRwCo { BlockBackend *blk; int64_t offset;
block/commit.c +2 -2
@@ -155,8 +155,8 @@ static int coroutine_fn commit_run(Job *job, Error **errp)break ; }/* Copy if allocated above the base */ - ret =bdrv_is_allocated_above (blk_bs (s->top), s->base_overlay, true, - offset,COMMIT_BUFFER_SIZE , &n); + ret =blk_co_is_allocated_above (s->top, s->base_overlay, true, + offset,COMMIT_BUFFER_SIZE , &n); copy = (ret >0 );trace_commit_one_iteration (s, offset, n, ret);if (copy) {
include/sysemu/block-backend-io.h +9 -0
@@ -92,6 +92,15 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in, int64_t bytes, BdrvRequestFlags read_flags, BdrvRequestFlags write_flags); +int coroutine_fn blk_co_block_status_above(BlockBackend *blk, +BlockDriverState *base, +int64_t offset,int64_t bytes, +int64_t *pnum,int64_t *map, +BlockDriverState **file); +int coroutine_fn blk_co_is_allocated_above(BlockBackend *blk, +BlockDriverState *base, +bool include_base,int64_t offset, +int64_t bytes,int64_t *pnum);/* * "I/O or GS" API functions. These functions can run without
nbd/server.c +16 -16
@@ -1991,7 +1991,7 @@ static int coroutine_fn nbd_co_send_structured_error(NBDClient *client, }/* Do a sparse read and send the structured reply to the client. -* Returns -errno if sending fails. bdrv_block_status_above() failure is +* Returns -errno if sending fails. blk_co_block_status_above() failure is * reported to the client, at which point this function succeeds. */ static int coroutine_fn nbd_co_send_sparse_read(NBDClient *client,
@@ -2007,10 +2007,10 @@ static int coroutine_fn nbd_co_send_sparse_read(NBDClient *client,while (progress < size) {int64_t pnum; -int status =bdrv_block_status_above (blk_bs (exp->common.blk),NULL , - offset + progress, - size - progress, &pnum,NULL , -NULL ); +int status =blk_co_block_status_above (exp->common.blk,NULL , + offset + progress, + size - progress, &pnum,NULL , +NULL );bool final;if (status <0 ) {
@@ -2141,15 +2141,15 @@ static int nbd_extent_array_add(NBDExtentArray *ea,return 0 ; } -static int coroutine_fn blockstatus_to_extents(BlockDriverState *bs, +static int coroutine_fn blockstatus_to_extents(BlockBackend *blk,uint64_t offset,uint64_t bytes,NBDExtentArray *ea) {while (bytes) {uint32_t flags;int64_t num; -int ret =bdrv_co_block_status_above (bs,NULL , offset, bytes, &num, -NULL ,NULL ); +int ret =blk_co_block_status_above (blk,NULL , offset, bytes, &num, +NULL ,NULL );if (ret <0 ) {return ret;
@@ -2169,14 +2169,14 @@ static int coroutine_fn blockstatus_to_extents(BlockDriverState *bs,return 0 ; } -static int coroutine_fn blockalloc_to_extents(BlockDriverState *bs, +static int coroutine_fn blockalloc_to_extents(BlockBackend *blk,uint64_t offset,uint64_t bytes,NBDExtentArray *ea) {while (bytes) {int64_t num; -int ret =bdrv_co_is_allocated_above (bs,NULL , false, offset, bytes, - &num); +int ret =blk_co_is_allocated_above (blk,NULL , false, offset, bytes, + &num);if (ret <0 ) {return ret;
@@ -2224,7 +2224,7 @@ static int nbd_co_send_extents(NBDClient *client, uint64_t handle,/* Get block status from the exported device and send it to the client */ static int coroutine_fn nbd_co_send_block_status(NBDClient *client, uint64_t handle, -BlockDriverState *bs,uint64_t offset, +BlockBackend *blk,uint64_t offset,uint32_t length,bool dont_fragment,bool last,uint32_t context_id,Error **errp)
@@ -2234,9 +2234,9 @@ coroutine_fn nbd_co_send_block_status(NBDClient *client, uint64_t handle,g_autoptr (NBDExtentArray) ea =nbd_extent_array_new (nb_extents);if (context_id ==NBD_META_ID_BASE_ALLOCATION ) { - ret =blockstatus_to_extents (bs, offset, length, ea); + ret =blockstatus_to_extents (blk, offset, length, ea); }else { - ret =blockalloc_to_extents (bs, offset, length, ea); + ret =blockalloc_to_extents (blk, offset, length, ea); }if (ret <0 ) { return nbd_co_send_structured_error(
@@ -2563,7 +2563,7 @@ static coroutine_fn int nbd_handle_request(NBDClient *client,if (client->export_meta.base_allocation) { ret = nbd_co_send_block_status(client, request->handle, - blk_bs(exp->common.blk), + exp->common.blk, request->from, request->len, dont_fragment, !--contexts_remaining,
@@ -2576,7 +2576,7 @@ static coroutine_fn int nbd_handle_request(NBDClient *client,if (client->export_meta.allocation_depth) { ret = nbd_co_send_block_status(client, request->handle, - blk_bs(exp->common.blk), + exp->common.blk, request->from, request->len, dont_fragment, !--contexts_remaining,
Signature · 1 line
2.31.1
Re: [PATCH v6 04/14] block-backend: replace bdrv_*_above with blk_*_above
Quoted 9 lines · Emanuele Giuseppe Esposito
Avoid mixing bdrv_* functions with blk_*, so create blk_* counterparts for
bdrv_block_status_aboveandbdrv_is_allocated_above.Note that since
blk_co_block_status_aboveonly calls theg_c_wfunctionbdrv_common_block_status_aboveand is marked ascoroutine_fn, call directlybdrv_co_common_block_status_above()to avoid using ag_c_w. Same applies toblk_co_is_allocated_above.Signed-off-by Emanuele Giuseppe Esposito<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH v6 5/14 block/vmdk: add missing coroutine_fn annotations
In reply to Emanuele Giuseppe EspositoThese functions end up calling bdrv_create() implemented as generated_co_wrapper functions.
In addition, they also happen to be always called in coroutine context, meaning all callers are coroutine_fn.
This means that the g_c_w function will enter the qemu_in_coroutine() case and eventually suspend (or in other words call qemu_coroutine_yield()). Therefore we need to mark such functions coroutine_fn too.
--- block/vmdk.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)
block/vmdk.c +19 -17
@@ -2285,10 +2285,11 @@ exit:return ret; } -static int vmdk_create_extent (const char *filename,int64_t filesize, -bool flat,bool compress,bool zeroed_grain, -BlockBackend **pbb, -QemuOpts *opts,Error **errp) +static int coroutine_fn vmdk_create_extent(const char *filename, +int64_t filesize,bool flat, +bool compress,bool zeroed_grain, +BlockBackend **pbb, +QemuOpts *opts,Error **errp) {int ret;BlockBackend *blk =NULL ;
@@ -2366,14 +2367,14 @@ static int filename_decompose(const char *filename, char *path, char *prefix,* non-split format. * idx >= 1: get the n-th extent if in a split subformat */ -typedef BlockBackend *(*vmdk_create_extent_fn )(int64_t size, -int idx, -bool flat, -bool split, -bool compress, -bool zeroed_grain, -void *opaque, -Error **errp); +typedef BlockBackend * coroutine_fn (*vmdk_create_extent_fn)(int64_t size, +int idx, +bool flat, +bool split, +bool compress, +bool zeroed_grain, +void *opaque, +Error **errp); static void vmdk_desc_add_extent(GString *desc, const char *extent_line_fmt,
@@ -2616,7 +2617,7 @@ typedef struct {QemuOpts *opts; } VMDKCreateOptsData; -static BlockBackend *vmdk_co_create_opts_cb (int64_t size,int idx, +static BlockBackend * coroutine_fn vmdk_co_create_opts_cb(int64_t size, int idx,bool flat,bool split,bool compress,bool zeroed_grain,void *opaque,Error **errp)
@@ -2768,10 +2769,11 @@ exit:return ret; } -static BlockBackend *vmdk_co_create_cb (int64_t size,int idx, -bool flat,bool split,bool compress, -bool zeroed_grain,void *opaque, -Error **errp) +static BlockBackend * coroutine_fn vmdk_co_create_cb(int64_t size, int idx, +bool flat,bool split, +bool compress, +bool zeroed_grain, +void *opaque,Error **errp) {int ret;BlockDriverState *bs;
Signature · 1 line
2.31.1
Re: [PATCH v6 05/14] block/vmdk: add missing coroutine_fn annotations
Quoted 7 lines · Emanuele Giuseppe Esposito
These functions end up calling
bdrv_create()implemented asgenerated_co_wrapperfunctions.
In addition, they also happen to be always called in coroutine context, meaning all callers arecoroutine_fn.
This means that theg_c_wfunction will enter theqemu_in_coroutine()case and eventually suspend (or in other words callqemu_coroutine_yield()). Therefore we need to mark such functionscoroutine_fntoo.
same as 02 and 03
Quoted 4 lines
Signed-off-by Emanuele Giuseppe Esposito<[email protected]>Reviewed-by Paolo Bonzini<[email protected]>Reviewed-by Kevin Wolf<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH v6 6/14 block: avoid duplicating filename string in bdrv_create
In reply to Emanuele Giuseppe EspositoWe know that the string will stay around until the function returns, and the parameter of drv->bdrv_co_create_opts is const char*, so it must not be modified either.
--- block.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
block.c +2 -5
@@ -553,7 +553,7 @@ int bdrv_create(BlockDriver *drv, const char* filename,Coroutine *co;CreateCo cco = { .drv = drv, - .filename =g_strdup (filename), + .filename = filename, .opts = opts, .ret =NOT_DONE , .err =NULL ,
@@ -561,8 +561,7 @@ int bdrv_create(BlockDriver *drv, const char* filename,if (!drv->bdrv_co_create_opts) {error_setg (errp,"Driver '%s' does not support image creation" , drv->format_name); - ret = -ENOTSUP ; - goto out; +return -ENOTSUP ; }if (qemu_in_coroutine ()) {
@@ -585,8 +584,6 @@ int bdrv_create(BlockDriver *drv, const char* filename, } } -out: -g_free (cco.filename);return ret; }
Signature · 1 line
2.31.1
Re: [PATCH v6 06/14] block: avoid duplicating filename string in bdrv_create
Quoted 7 lines · Emanuele Giuseppe Esposito
We know that the string will stay around until the function returns, and the parameter of
drv->bdrv_co_create_optsis const char*, so it must not be modified either.Suggested-by Kevin Wolf<[email protected]>Signed-off-by Emanuele Giuseppe Esposito<[email protected]>Reviewed-by Kevin Wolf<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH v6 7/14 block: distinguish between bdrv_create running in coroutine and not
In reply to Emanuele Giuseppe EspositoCall two different functions depending on whether bdrv_create is in coroutine or not, following the same pattern as generated_co_wrapper functions.
This allows to also call the coroutine function directly, without using CreateCo or relying in bdrv_create().
--- block.c | 71 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 35 deletions(-)
block.c +36 -35
@@ -528,63 +528,64 @@ typedef struct CreateCo {Error *err; } CreateCo; -static void coroutine_fn bdrv_create_co_entry(void *opaque) +static int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename, +QemuOpts *opts,Error **errp) { -Error *local_err =NULL ;int ret; +GLOBAL_STATE_CODE (); +ERRP_GUARD (); +assert (*errp ==NULL ); +assert (drv); + +if (!drv->bdrv_co_create_opts) { +error_setg (errp,"Driver '%s' does not support image creation" , + drv->format_name); +return -ENOTSUP ; + } + + ret = drv->bdrv_co_create_opts (drv, filename, opts, errp); +if (ret <0 && !*errp) { +error_setg_errno (errp, -ret,"Could not create image" ); + } + +return ret; +} + +static void coroutine_fn bdrv_create_co_entry(void *opaque) +{CreateCo *cco = opaque; -assert (cco->drv);GLOBAL_STATE_CODE (); - ret = cco->drv->bdrv_co_create_opts (cco->drv, - cco->filename, cco->opts, &local_err); -error_propagate (&cco->err, local_err); - cco->ret = ret; + cco->ret =bdrv_co_create (cco->drv, cco->filename, cco->opts, &cco->err); }int bdrv_create (BlockDriver *drv,const char * filename,QemuOpts *opts,Error **errp) { -int ret; -GLOBAL_STATE_CODE (); -Coroutine *co; -CreateCo cco = { - .drv = drv, - .filename = filename, - .opts = opts, - .ret =NOT_DONE , - .err =NULL , - }; - -if (!drv->bdrv_co_create_opts) { -error_setg (errp,"Driver '%s' does not support image creation" , drv->format_name); -return -ENOTSUP ; - } -if (qemu_in_coroutine ()) {/* Fast-path if already in coroutine context */ -bdrv_create_co_entry (&cco); +return bdrv_co_create (drv, filename, opts, errp); }else { +Coroutine *co; +CreateCo cco = { + .drv = drv, + .filename = filename, + .opts = opts, + .ret =NOT_DONE , + .err =NULL , + }; + co =qemu_coroutine_create (bdrv_create_co_entry, &cco);qemu_coroutine_enter (co);while (cco.ret ==NOT_DONE ) {aio_poll (qemu_get_aio_context (), true); } +error_propagate (errp, cco.err); +return cco.ret; } - - ret = cco.ret; -if (ret <0 ) { -if (cco.err) { -error_propagate (errp, cco.err); - }else { -error_setg_errno (errp, -ret,"Could not create image" ); - } - } - -return ret; }/**
Signature · 1 line
2.31.1
Re: [PATCH v6 07/14] block: distinguish between bdrv_create running in coroutine and not
Quoted 21 lines · Emanuele Giuseppe Esposito
Call two different functions depending on whether
bdrv_createis in coroutine or not, following the same pattern asgenerated_co_wrapperfunctions.This allows to also call the coroutine function directly, without using CreateCo or relying in
bdrv_create().Signed-off-by Emanuele Giuseppe Esposito <[email protected]>Reviewed-by Kevin Wolf <[email protected]>--- block.c | 71 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 35 deletions(-)block.c +0
-0@@ -528,63 +528,64 @@ typedef struct CreateCo {Error *err; } CreateCo;
block.c typedef struct CreateCo { · line 538
Quoted 10 lines
block.c +6
-2-static void coroutine_fn bdrv_create_co_entry(void *opaque) +static int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename, +QemuOpts *opts,Error **errp) { -Error *local_err =NULL ;int ret; +GLOBAL_STATE_CODE (); +ERRP_GUARD (); +assert (*errp ==NULL ); +assert (drv);
Why we need these two assertions? These are general assumptions, and we don't assert it in all functions. Dereference of NULL will crash not worse than assertion. I'd drop them.
block.c typedef struct CreateCo { · line 547
Quoted 9 lines
block.c +8
-0+ +if (!drv->bdrv_co_create_opts) { +error_setg (errp,"Driver '%s' does not support image creation" , + drv->format_name); +return -ENOTSUP ; + } + + ret = drv->bdrv_co_create_opts (drv, filename, opts, errp);
and this empty line, looks accidental.
Offtopic: hope one day we fix *open* functions to always set errp on error paths.
Quoted 8 lines
block.c +8
-0+if (ret <0 && !*errp) { +error_setg_errno (errp, -ret,"Could not create image" ); + } + +return ret; +} + +static void coroutine_fn bdrv_create_co_entry(void *opaque)
block.c typedef struct CreateCo { · line 560
Quoted 10 lines
block.c +2
-5+{CreateCo *cco = opaque; -assert (cco->drv);GLOBAL_STATE_CODE (); - ret = cco->drv->bdrv_co_create_opts (cco->drv, - cco->filename, cco->opts, &local_err); -error_propagate (&cco->err, local_err); - cco->ret = ret; + cco->ret =bdrv_co_create (cco->drv, cco->filename, cco->opts, &cco->err);
We need aio_wait_kick() call here, like in other co_entry() functions. Otherwise we may stuck in aio_poll()
with it:
Hmm actually, we can simply merge this patch into patch 13 (and move 08 to be after 13). Why to refactor bdrv_create twice?
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 07/14] block: distinguish between bdrv_create running in coroutine and not
Am 25/11/2022 um 19:03 schrieb Vladimir Sementsov-Ogievskiy:
Quoted 75 lines · Emanuele Giuseppe Esposito
Quoted 21 lines
Call two different functions depending on whether
bdrv_createis in coroutine or not, following the same pattern asgenerated_co_wrapperfunctions.This allows to also call the coroutine function directly, without using CreateCo or relying in
bdrv_create().Signed-off-by Emanuele Giuseppe Esposito <[email protected]>Reviewed-by Kevin Wolf <[email protected]>---
block.c| 71 +++++++++++++++++++++++++++++----------------------------1 file changed, 36 insertions(+), 35 deletions(-)block.c +0
-0@@ -528,63 +528,64 @@ typedef struct CreateCo { Error *err; } CreateCo; -static void coroutine_fn bdrv_create_co_entry(void *opaque)block.c typedef struct CreateCo { · line 539
Quoted 10 lines
block.c +6
-1+static int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename, + QemuOpts *opts, Error **errp) { - Error *local_err = NULL; int ret; + GLOBAL_STATE_CODE(); + ERRP_GUARD(); + assert(*errp == NULL); + assert(drv);Why we need these two assertions? These are general assumptions, and we don't assert it in all functions. Dereference of NULL will crash not worse than assertion. I'd drop them.
Quoted 9 lines
block.c +8
-0+ + if (!drv->bdrv_co_create_opts) { + error_setg(errp, "Driver '%s' does not support image creation", + drv->format_name); + return -ENOTSUP; + } + + ret = drv->bdrv_co_create_opts(drv, filename, opts, errp);and this empty line, looks accidental.
Offtopic: hope one day we fix *open* functions to always set errp on error paths.
Quoted 11 lines
+ if (ret < 0 && !*errp) {
+error_setg_errno(errp, -ret, "Could not create image"); + }block.c +6
-0+ + return ret; +} + +static void coroutine_fn bdrv_create_co_entry(void *opaque) +{CreateCo *cco = opaque;
-assert(cco->drv);Quoted 8 lines
GLOBAL_STATE_CODE();
- ret = cco->drv->bdrv_co_create_opts(cco->drv,
-cco->filename,cco->opts,&local_err);
-error_propagate(&cco->err, local_err);
-cco->ret= ret;
+cco->ret=bdrv_co_create(cco->drv, cco->filename, cco->opts, &cco->err);We need
aio_wait_kick()call here, like in otherco_entry()functions. Otherwise we may stuck inaio_poll()
Quoted 7 lines
with it:
Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>Hmm actually, we can simply merge this patch into patch 13 (and move 08 to be after 13). Why to refactor
bdrv_createtwice?
I think I'll leave the patches separate, otherwise I am worried that it will be difficult to understand what is happending and why when we merge these 2 operations (move all logic to _co_ and using co_wrapper) together.
I agree with the rest.
Thank you,
Emanuele
PATCH v6 8/14 block: bdrv_create_file is a coroutine_fn
In reply to Emanuele Giuseppe EspositoIt is always called in coroutine_fn callbacks, therefore it can directly call bdrv_co_create().
Rename it to bdrv_co_create_file too.
--- block.c | 5 +++-- block/crypto.c | 2 +- block/parallels.c | 2 +- block/qcow.c | 2 +- block/qcow2.c | 4 ++-- block/qed.c | 2 +- block/raw-format.c | 2 +- block/vdi.c | 2 +- block/vhdx.c | 2 +- block/vmdk.c | 2 +- block/vpc.c | 2 +- include/block/block-global-state.h | 3 ++- 12 files changed, 16 insertions(+), 14 deletions(-)
block.c +3 -2
@@ -723,7 +723,8 @@ out:return ret; } -int bdrv_create_file (const char *filename,QemuOpts *opts,Error **errp) +int coroutine_fn bdrv_co_create_file(const char *filename, QemuOpts *opts, +Error **errp) {QemuOpts *protocol_opts;BlockDriver *drv;
@@ -764,7 +765,7 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp) goto out; } - ret =bdrv_create (drv, filename, protocol_opts, errp); + ret =bdrv_co_create (drv, filename, protocol_opts, errp); out:qemu_opts_del (protocol_opts);qobject_unref (qdict);
block/crypto.c +1 -1
@@ -703,7 +703,7 @@ static int coroutine_fn block_crypto_co_create_opts_luks(BlockDriver *drv, }/* Create protocol layer */ - ret =bdrv_create_file (filename, opts, errp); + ret =bdrv_co_create_file (filename, opts, errp);if (ret <0 ) { goto fail; }
block/parallels.c +1 -1
@@ -646,7 +646,7 @@ static int coroutine_fn parallels_co_create_opts(BlockDriver *drv, }/* Create and open the file (protocol layer) */ - ret =bdrv_create_file (filename, opts, errp); + ret =bdrv_co_create_file (filename, opts, errp);if (ret <0 ) { goto done; }
block/qcow.c +1 -1
@@ -973,7 +973,7 @@ static int coroutine_fn qcow_co_create_opts(BlockDriver *drv, }/* Create and open the file (protocol layer) */ - ret =bdrv_create_file (filename, opts, errp); + ret =bdrv_co_create_file (filename, opts, errp);if (ret <0 ) { goto fail; }
block/qcow2.c +2 -2
@@ -3871,7 +3871,7 @@ static int coroutine_fn qcow2_co_create_opts(BlockDriver *drv, }/* Create and open the file (protocol layer) */ - ret =bdrv_create_file (filename, opts, errp); + ret =bdrv_co_create_file (filename, opts, errp);if (ret <0 ) { goto finish; }
@@ -3886,7 +3886,7 @@ static int coroutine_fn qcow2_co_create_opts(BlockDriver *drv,/* Create and open an external data file (protocol layer) */ val =qdict_get_try_str (qdict,BLOCK_OPT_DATA_FILE );if (val) { - ret =bdrv_create_file (val, opts, errp); + ret =bdrv_co_create_file (val, opts, errp);if (ret <0 ) { goto finish; }
block/qed.c +1 -1
@@ -778,7 +778,7 @@ static int coroutine_fn bdrv_qed_co_create_opts(BlockDriver *drv, }/* Create and open the file (protocol layer) */ - ret =bdrv_create_file (filename, opts, errp); + ret =bdrv_co_create_file (filename, opts, errp);if (ret <0 ) { goto fail; }
block/raw-format.c +1 -1
@@ -433,7 +433,7 @@ static int coroutine_fn raw_co_create_opts(BlockDriver *drv, QemuOpts *opts, Error **errp) { -return bdrv_create_file (filename, opts, errp); +return bdrv_co_create_file (filename, opts, errp); } static int raw_open(BlockDriverState *bs, QDict *options, int flags,
block/vdi.c +1 -1
@@ -934,7 +934,7 @@ static int coroutine_fn vdi_co_create_opts(BlockDriver *drv, qdict =qemu_opts_to_qdict_filtered (opts,NULL , &vdi_create_opts, true);/* Create and open the file (protocol layer) */ - ret =bdrv_create_file (filename, opts, errp); + ret =bdrv_co_create_file (filename, opts, errp);if (ret <0 ) { goto done; }
block/vhdx.c +1 -1
@@ -2084,7 +2084,7 @@ static int coroutine_fn vhdx_co_create_opts(BlockDriver *drv, }/* Create and open the file (protocol layer) */ - ret =bdrv_create_file (filename, opts, errp); + ret =bdrv_co_create_file (filename, opts, errp);if (ret <0 ) { goto fail; }
block/vmdk.c +1 -1
@@ -2294,7 +2294,7 @@ static int coroutine_fn vmdk_create_extent(const char *filename,int ret;BlockBackend *blk =NULL ; - ret =bdrv_create_file (filename, opts, errp); + ret =bdrv_co_create_file (filename, opts, errp);if (ret <0 ) { goto exit; }
block/vpc.c +1 -1
@@ -1111,7 +1111,7 @@ static int coroutine_fn vpc_co_create_opts(BlockDriver *drv, }/* Create and open the file (protocol layer) */ - ret =bdrv_create_file (filename, opts, errp); + ret =bdrv_co_create_file (filename, opts, errp);if (ret <0 ) { goto fail; }
include/block/block-global-state.h +2 -1
@@ -57,7 +57,8 @@ BlockDriver *bdrv_find_protocol(const char *filename,BlockDriver *bdrv_find_format (const char *format_name);int bdrv_create (BlockDriver *drv,const char * filename,QemuOpts *opts,Error **errp); -int bdrv_create_file (const char *filename,QemuOpts *opts,Error **errp); +int coroutine_fn bdrv_co_create_file(const char *filename, QemuOpts *opts, +Error **errp);BlockDriverState *bdrv_new (void ); int bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top,
Signature · 1 line
2.31.1
Re: [PATCH v6 08/14] block: bdrv_create_file is a coroutine_fn
Quoted 7 lines · Emanuele Giuseppe Esposito
It is always called in
coroutine_fncallbacks, therefore it can directly callbdrv_co_create().Rename it to
bdrv_co_create_filetoo.Signed-off-by Emanuele Giuseppe Esposito<[email protected]>Reviewed-by Kevin Wolf<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH v6 9/14 block: rename generated_co_wrapper in co_wrapper_mixed
In reply to Emanuele Giuseppe EspositoIn preparation to the incoming new function specifiers, rename g_c_w with a more meaningful name and document it.
--- block/coroutines.h | 4 +- docs/devel/block-coroutine-wrapper.rst | 6 +-- include/block/block-common.h | 11 +++-- include/block/block-io.h | 44 ++++++++--------- include/sysemu/block-backend-io.h | 68 +++++++++++++------------- scripts/block-coroutine-wrapper.py | 6 +-- 6 files changed, 71 insertions(+), 68 deletions(-)
block/coroutines.h +2 -2
@@ -71,7 +71,7 @@ nbd_co_do_establish_connection(BlockDriverState *bs, bool blocking,* the "I/O or GS" API. */ -int generated_co_wrapper +int co_wrapper_mixed bdrv_common_block_status_above(BlockDriverState *bs, BlockDriverState *base, bool include_base,
@@ -82,7 +82,7 @@ bdrv_common_block_status_above(BlockDriverState *bs,int64_t *map, BlockDriverState **file, int *depth); -int generated_co_wrapper +int co_wrapper_mixednbd_do_establish_connection (BlockDriverState *bs,bool blocking,Error **errp);#endif /* BLOCK_COROUTINES_H */
docs/devel/block-coroutine-wrapper.rst +3 -3
@@ -26,12 +26,12 @@ called ``bdrv_foo(<same args>)``. In this case the script can help. To trigger the generation: 1. You need ``bdrv_foo`` declaration somewhere (for example, in - ``block/coroutines.h``) with the ``generated_co_wrapper`` mark, + ``block/coroutines.h``) with the ``co_wrapper_mixed`` mark, like this: .. code-block:: c - int generated_co_wrapper bdrv_foo(<some args>); + int co_wrapper_mixed bdrv_foo(<some args>); 2. You need to feed this declaration to block-coroutine-wrapper script. For this, add the .h (or .c) file with the declaration to the
@@ -46,7 +46,7 @@ Links 1. The script location is ``scripts/block-coroutine-wrapper.py``. -2. Generic place for private ``generated_co_wrapper`` declarations is +2. Generic place for private ``co_wrapper_mixed`` declarations is ``block/coroutines.h``, for public declarations: ``include/block/block.h``
include/block/block-common.h +7 -4
@@ -35,14 +35,17 @@#include "qemu/transactions.h" /* -* generated_co_wrapper +* co_wrapper{*}: Function specifiers used by block-coroutine-wrapper.py * -* Function specifier, which does nothing but mark functions to be +* Function specifiers, which do nothing but mark functions to be * generated by scripts/block-coroutine-wrapper.py * -* Read more in docs/devel/block-coroutine-wrapper.rst +* Usage: read docs/devel/block-coroutine-wrapper.rst +* +* co_wrapper_mixed functions can be called by both coroutine and +* non-coroutine context. */ -#define generated_co_wrapper +#define co_wrapper_mixed/* block.c */ typedef struct BlockDriver BlockDriver ;
include/block/block-io.h +22 -22
63 lines not on this page · raw message
include/sysemu/block-backend-io.h +34 -34
111 lines not on this page · raw message
scripts/block-coroutine-wrapper.py +3 -3
@@ -2,7 +2,7 @@ """Generate coroutine wrappers for block subsystem. The program parses one or several concatenated c files from stdin, -searches for functions with the 'generated_co_wrapper' specifier +searches for functions with the 'co_wrapper_mixed' specifier and generates corresponding wrappers on stdout. Usage: block-coroutine-wrapper.py generated-file.c FILE.[ch]...
@@ -74,8 +74,8 @@ def gen_block(self, format: str) -> str: return '\n'.join(format.format_map(arg.__dict__) for arg in self.args) -# Match wrappers declared with a generated_co_wrapper mark -func_decl_re = re.compile(r'^int\s*generated_co_wrapper\s*' +# Match wrappers declared with a co_wrapper_mixed mark +func_decl_re = re.compile(r'^int\s*co_wrapper_mixed\s*' r'(?P<wrapper_name>[a-z][a-z0-9_]*)' r'\((?P<args>[^)]*)\);$', re.MULTILINE)
Signature · 1 line
2.31.1
Re: [PATCH v6 09/14] block: rename generated_co_wrapper in co_wrapper_mixed
Quoted 4 lines · Emanuele Giuseppe Esposito
In preparation to the incoming new function specifiers, rename
g_c_wwith a more meaningful name and document it.Signed-off-by Emanuele Giuseppe Esposito<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH v6 10/14 block-coroutine-wrapper.py: introduce co_wrapper
In reply to Emanuele Giuseppe EspositoThis new annotation creates just a function wrapper that creates a new coroutine. It assumes the caller is not a coroutine. It will be the default annotation to be used in the future.
This is much better as c_w_mixed, because it is clear if the caller is a coroutine or not, and provides the advantage of automating the code creation. In the future all c_w_mixed functions will be substituted by co_wrapper.
--- docs/devel/block-coroutine-wrapper.rst | 6 +- include/block/block-common.h | 8 +- scripts/block-coroutine-wrapper.py | 109 +++++++++++++++++-------- 3 files changed, 85 insertions(+), 38 deletions(-)
docs/devel/block-coroutine-wrapper.rst +3 -3
@@ -26,12 +26,12 @@ called ``bdrv_foo(<same args>)``. In this case the script can help. To trigger the generation: 1. You need ``bdrv_foo`` declaration somewhere (for example, in - ``block/coroutines.h``) with the ``co_wrapper_mixed`` mark, + ``block/coroutines.h``) with the ``co_wrapper`` mark, like this: .. code-block:: c - int co_wrapper_mixed bdrv_foo(<some args>); + int co_wrapper bdrv_foo(<some args>); 2. You need to feed this declaration to block-coroutine-wrapper script. For this, add the .h (or .c) file with the declaration to the
@@ -46,7 +46,7 @@ Links 1. The script location is ``scripts/block-coroutine-wrapper.py``. -2. Generic place for private ``co_wrapper_mixed`` declarations is +2. Generic place for private ``co_wrapper`` declarations is ``block/coroutines.h``, for public declarations: ``include/block/block.h``
include/block/block-common.h +6 -2
@@ -42,9 +42,13 @@* * Usage: read docs/devel/block-coroutine-wrapper.rst * -* co_wrapper_mixed functions can be called by both coroutine and -* non-coroutine context. +* There are 2 kind of specifiers: +* - co_wrapper functions can be called by only non-coroutine context, because +* they always generate a new coroutine. +* - co_wrapper_mixed functions can be called by both coroutine and +* non-coroutine context. */ +#define co_wrapper#define co_wrapper_mixed/* block.c */
scripts/block-coroutine-wrapper.py +76 -33
155 lines not on this page · raw message
Signature · 1 line
2.31.1
Re: [PATCH v6 10/14] block-coroutine-wrapper.py: introduce co_wrapper
Quoted 2 lines · Emanuele Giuseppe Esposito
This new annotation creates just a function wrapper that creates a new coroutine.
Actually, not just create, but create, start and wait for finish.. Maybe s/creates/starts/
Quoted 11 lines
It assumes the caller is not a coroutine.
It will be the default annotation to be used in the future.This is much better as
c_w_mixed, because it is clear if the caller is a coroutine or not, and provides the advantage of automating the code creation. In the future allc_w_mixedfunctions will be substituted byco_wrapper.Signed-off-by Emanuele Giuseppe Esposito <[email protected]>Reviewed-by Kevin Wolf <[email protected]>---
[..]
scripts/block-coroutine-wrapper.py def __init__(self, param_decl: str) -> None: · line 66
Quoted 5 lines
class FuncDecl:
scripts/block-coroutine-wrapper.py +2
-1- def __init__(self, return_type: str, name: str, args: str) -> None: + def __init__(self, return_type: str, name: str, args: str, + variant: str) -> None:
I'd prefer mixed: bool parameter instead, to be more strict.
scripts/block-coroutine-wrapper.py def __init__(self, param_decl: str) -> None: · line 74
Quoted 8 lines
self.return_type =
return_type.strip()
self.name =name.strip()scripts/block-coroutine-wrapper.py +5
-0+ self.struct_name = snake_to_camel(self.name) self.args = [ParamDecl(arg.strip()) for arg in args.split(',')] + self.create_only_co = True + + if 'mixed' in variant: + self.create_only_co = False
hmm, just
self.create_only_co = 'mixed' not in variant
? And even better with boolean argument.
Quoted 16 lines
scripts/block-coroutine-wrapper.py +12
-0+ + subsystem, subname = self.name.split('_', 1) + self.co_name = f'{subsystem}_co_{subname}' + + t = self.args[0].type + if t == 'BlockDriverState *': + bs = 'bs' + elif t == 'BdrvChild *': + bs = 'child->bs' + else: + bs = 'blk_bs(blk)' + self.bs = bs def gen_list(self, format: str) -> str: return ', '.join(format.format_map(arg.__dict__) for arg in self.args)
scripts/block-coroutine-wrapper.py def gen_block(self, format: str) -> str: · line 97
Quoted 8 lines
scripts/block-coroutine-wrapper.py +3
-2@@ -74,8 +92,9 @@ def gen_block(self, format: str) -> str: return '\n'.join(format.format_map(arg.__dict__) for arg in self.args) -# Match wrappers declared with a co_wrapper_mixed mark -func_decl_re = re.compile(r'^int\s*co_wrapper_mixed\s*' +# Match wrappers declared with a co_wrapper mark +func_decl_re = re.compile(r'^int\s*co_wrapper' + r'(?P<variant>(_[a-z][a-z0-9_]*)?)\s*'
Why you allow everything here?
I'd write just
(?P<mixed>(_mixed)?)
or
(?P<marker>co_wrapper(_mixed)?)
Quoted 14 lines
scripts/block-coroutine-wrapper.py +2
-1r'(?P<wrapper_name>[a-z][a-z0-9_]*)' r'\((?P<args>[^)]*)\);$', re.MULTILINE)@@ -84,7 +103,8 @@ def func_decl_iter(text: str) -> Iterator: for m in func_decl_re.finditer(text): yield FuncDecl(return_type='int', name=m.group('wrapper_name'), - args=m.group('args')) + args=m.group('args'), + variant=m.group('variant')) def snake_to_camel(func_name: str) -> str:
scripts/block-coroutine-wrapper.py def snake_to_camel(func_name: str) -> str: · line 120
Quoted 4 lines
scripts/block-coroutine-wrapper.py +1
-0@@ -97,24 +117,63 @@ def snake_to_camel(func_name: str) -> str: return ''.join(words) +# Checks if we are already in coroutine
Please, do function documentation in doc-sting
scripts/block-coroutine-wrapper.py def snake_to_camel(func_name: str) -> str: · line 121
Quoted 1 line
scripts/block-coroutine-wrapper.py +1
-0+def create_g_c_w(func: FuncDecl) -> str:
maybe, create_mixed_wrapper?
g_c_w refer to "generated_co_wrapper" and it was dropped from everywhere already
Quoted 3 lines
scripts/block-coroutine-wrapper.py +3
-0+ name = func.co_name + struct_name = func.struct_name + return f"""\
[..]
Review
Quoted 2 lines
(quoted diff) +2
-0+ +# Assumes we are not in coroutine, and creates one
move to doc-string
Quoted 1 line
+def
create_coroutine_only(func: FuncDecl)-> str:
maybe, create_co_wrapper ?
Also, in the file functions that generate code are called gen_*,
so better gen_co_wrapper() and gen_co_wrapper_mixed()
Quoted 5 lines
scripts/block-coroutine-wrapper.py +5
-0+ name = func.co_name + struct_name = func.struct_name + return f"""\ +int {func.name}({ func.gen_list('{decl}') }) +{{
[..]
Quoted 2 lines
def
gen_wrappers(input_code: str)-> str:
With at least comments for new functions turned into doc-strings:
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH v6 10/14] block-coroutine-wrapper.py: introduce co_wrapper
Am 25/11/2022 um 21:32 schrieb Vladimir Sementsov-Ogievskiy:
Quoted 52 lines
Quoted 5 lines
class FuncDecl:
- def__init__(self, return_type: str, name: str, args: str)-> None:
+ def__init__(self, return_type: str, name: str, args: str, + variant: str)-> None:I'd prefer mixed: bool parameter instead, to be more strict.
Quoted 8 lines
self.return_type =
return_type.strip()
self.name =name.strip()
+ self.struct_name =snake_to_camel(self.name)self.args = [ParamDecl(arg.strip()) for arg inargs.split(',')] + self.create_only_co = True
+
+ if 'mixed' in variant:
+ self.create_only_co = Falsehmm, just
self.create_only_co = 'mixed' not in variant
? And even better with boolean argument.
Quoted 19 lines
scripts/block-coroutine-wrapper.py +12
-0+ + subsystem, subname = self.name.split('_', 1) + self.co_name = f'{subsystem}_co_{subname}' + + t = self.args[0].type + if t == 'BlockDriverState *': + bs = 'bs' + elif t == 'BdrvChild *': + bs = 'child->bs' + else: + bs = 'blk_bs(blk)' + self.bs = bsdef
gen_list(self, format: str)-> str:
return ', '.join(format.format_map(arg.__dict__) for arg in self.args)(quoted diff) +0
-0@@ -74,8 +92,9 @@ def gen_block(self, format: str) -> str:return '\n'.join(format.format_map(arg.__dict__) for arg in self.args)
-# Match wrappers declared with aco_wrapper_mixedmarkscripts/block-coroutine-wrapper.py def gen_block(self, format: str) -> str: · line 97
Quoted 4 lines
scripts/block-coroutine-wrapper.py +3
-1-func_decl_re = re.compile(r'^int\s*co_wrapper_mixed\s*' +# Match wrappers declared with a co_wrapper mark +func_decl_re = re.compile(r'^int\s*co_wrapper' + r'(?P<variant>(_[a-z][a-z0-9_]*)?)\s*'Why you allow everything here?
I'd write just
(?P<mixed>(_mixed)?)
Quoted 3 lines
or
(?P<marker>co_wrapper(_mixed)?)
Ok you couldn't possibly know that, but we are also adding other type of "variants":co_wrapperco_wrapper_mixedco_wrapper_bdrv_rdlockco_wrapper_mixed_bdrv_rdlock
Therefore I need to keep variant : str and the regex as it is, but maybe get rid of the if else condition. I'll change the docstring of course.
If you want to know more, see the thread in
"[PATCH 00/15] Protect the block layer with a rwlock: part 3"
Thank you,
Emanuele
PATCH v6 11/14 block-coroutine-wrapper.py: default to main loop aiocontext if function does not have a BlockDriverState parameter
In reply to Emanuele Giuseppe EspositoRight now, we take the first parameter of the function to get the BlockDriverState to pass to bdrv_poll_co(), that internally calls functions that figure in which aiocontext the coroutine should run.
However, it is useless to pass a bs just to get its own AioContext, so instead pass it directly, and default to the main loop if no BlockDriverState is passed as parameter.
--- block/block-gen.h | 6 +++--- scripts/block-coroutine-wrapper.py | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-)
block/block-gen.h +3 -3
@@ -30,7 +30,7 @@/* Base structure for argument packing structures */ typedef struct BdrvPollCo { - BlockDriverState *bs; + AioContext *ctx; bool in_progress; int ret; Coroutine *co; /* Keep pointer here for debugging */
@@ -40,8 +40,8 @@ static inline int bdrv_poll_co(BdrvPollCo *s) {assert (!qemu_in_coroutine ()); -bdrv_coroutine_enter (s->bs, s->co); -BDRV_POLL_WHILE (s->bs, s->in_progress); +aio_co_enter (s->ctx, s->co); +AIO_WAIT_WHILE (s->ctx, s->in_progress);return s->ret; }
scripts/block-coroutine-wrapper.py +8 -8
@@ -78,12 +78,14 @@ def __init__(self, return_type: str, name: str, args: str, t = self.args[0].type if t == 'BlockDriverState *': - bs = 'bs' + ctx = 'bdrv_get_aio_context(bs)' elif t == 'BdrvChild *': - bs = 'child->bs' + ctx = 'bdrv_get_aio_context(child->bs)' + elif t == 'BlockBackend *': + ctx = 'blk_get_aio_context(blk)' else: - bs = 'blk_bs(blk)' - self.bs = bs + ctx = 'qemu_get_aio_context()' + self.ctx = ctx def gen_list(self, format: str) -> str: return ', '.join(format.format_map(arg.__dict__) for arg in self.args)
@@ -128,7 +130,7 @@ def create_g_c_w(func: FuncDecl) -> str: return {name}({ func.gen_list('{name}') }); }} else {{ {struct_name} s = {{ - .poll_state.bs = {func.bs}, + .poll_state.ctx = {func.ctx}, .poll_state.in_progress = true, { func.gen_block(' .{name} = {name},') }
@@ -149,7 +151,7 @@ def create_coroutine_only(func: FuncDecl) -> str: int {func.name}({ func.gen_list('{decl}') }) {{ {struct_name} s = {{ - .poll_state.bs = {func.bs}, + .poll_state.ctx = {func.ctx}, .poll_state.in_progress = true, { func.gen_block(' .{name} = {name},') }
@@ -165,8 +167,6 @@ def create_coroutine_only(func: FuncDecl) -> str: def gen_wrapper(func: FuncDecl) -> str: assert not '_co_' in func.name assert func.return_type == 'int' - assert func.args[0].type in ['BlockDriverState *', 'BdrvChild *', - 'BlockBackend *'] name = func.co_name struct_name = func.struct_name
Signature · 1 line
2.31.1
Re: [PATCH v6 11/14] block-coroutine-wrapper.py: default to main loop aiocontext if function does not have a BlockDriverState parameter
too long subject.
suggest:
block-coroutine-wrapper.py: support functions without bs arg
Quoted 7 lines · Emanuele Giuseppe Esposito
Right now, we take the first parameter of the function to get the BlockDriverState to pass to
bdrv_poll_co(), that internally calls functions that figure in which aiocontext the coroutine should run.However, it is useless to pass a bs just to get its own AioContext, so instead pass it directly, and default to the main loop if no BlockDriverState is passed as parameter.
Great!
Quoted 2 lines
Signed-off-by Emanuele Giuseppe Esposito <[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH v6 12/14 block-coroutine-wrapper.py: support also basic return types
In reply to Emanuele Giuseppe EspositoExtend the regex to cover also return type, pointers included. This implies that the value returned by the function cannot be a simple "int" anymore, but the custom return type. Therefore remove poll_state->ret and instead use a per-function custom "ret" field.
--- block/block-gen.h | 5 +---- scripts/block-coroutine-wrapper.py | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-)
block/block-gen.h +1 -4
@@ -32,18 +32,15 @@typedef struct BdrvPollCo {AioContext *ctx;bool in_progress; -int ret;Coroutine *co;/* Keep pointer here for debugging */ }BdrvPollCo ; -static inline int bdrv_poll_co (BdrvPollCo *s) +static inline void bdrv_poll_co (BdrvPollCo *s) {assert (!qemu_in_coroutine ());aio_co_enter (s->ctx, s->co);AIO_WAIT_WHILE (s->ctx, s->in_progress); - -return s->ret; }#endif /* BLOCK_BLOCK_GEN_H */
scripts/block-coroutine-wrapper.py +11 -8
@@ -95,7 +95,8 @@ def gen_block(self, format: str) -> str: # Match wrappers declared with a co_wrapper mark -func_decl_re = re.compile(r'^int\s*co_wrapper' +func_decl_re = re.compile(r'^(?P<return_type>[a-zA-Z][a-zA-Z0-9_]* [*]?)' + r'\s*co_wrapper' r'(?P<variant>(_[a-z][a-z0-9_]*)?)\s*' r'(?P<wrapper_name>[a-z][a-z0-9_]*)' r'\((?P<args>[^)]*)\);$', re.MULTILINE)
@@ -103,7 +104,7 @@ def gen_block(self, format: str) -> str: def func_decl_iter(text: str) -> Iterator: for m in func_decl_re.finditer(text): - yield FuncDecl(return_type='int', + yield FuncDecl(return_type=m.group('return_type'), name=m.group('wrapper_name'), args=m.group('args'), variant=m.group('variant'))
@@ -124,7 +125,7 @@ def create_g_c_w(func: FuncDecl) -> str: name = func.co_name struct_name = func.struct_name return f"""\ -int {func.name}({ func.gen_list('{decl}') }) +{func.return_type} {func.name}({ func.gen_list('{decl}') }) {{ if (qemu_in_coroutine()) {{ return {name}({ func.gen_list('{name}') });
@@ -138,7 +139,8 @@ def create_g_c_w(func: FuncDecl) -> str: s.poll_state.co = qemu_coroutine_create({name}_entry, &s); - return bdrv_poll_co(&s.poll_state); + bdrv_poll_co(&s.poll_state); + return s.ret; }} }}"""
@@ -148,7 +150,7 @@ def create_coroutine_only(func: FuncDecl) -> str: name = func.co_name struct_name = func.struct_name return f"""\ -int {func.name}({ func.gen_list('{decl}') }) +{func.return_type} {func.name}({ func.gen_list('{decl}') }) {{ {struct_name} s = {{ .poll_state.ctx = {func.ctx},
@@ -160,13 +162,13 @@ def create_coroutine_only(func: FuncDecl) -> str: s.poll_state.co = qemu_coroutine_create({name}_entry, &s); - return bdrv_poll_co(&s.poll_state); + bdrv_poll_co(&s.poll_state); + return s.ret; }}""" def gen_wrapper(func: FuncDecl) -> str: assert not '_co_' in func.name - assert func.return_type == 'int' name = func.co_name struct_name = func.struct_name
@@ -182,6 +184,7 @@ def gen_wrapper(func: FuncDecl) -> str: typedef struct {struct_name} {{ BdrvPollCo poll_state; + {func.return_type} ret; { func.gen_block(' {decl};') } }} {struct_name};
@@ -189,7 +192,7 @@ def gen_wrapper(func: FuncDecl) -> str: {{ {struct_name} *s = opaque; - s->poll_state.ret = {name}({ func.gen_list('s->{name}') }); + s->ret = {name}({ func.gen_list('s->{name}') }); s->poll_state.in_progress = false; aio_wait_kick();
Signature · 1 line
2.31.1
Re: [PATCH v6 12/14] block-coroutine-wrapper.py: support also basic return types
Quoted 8 lines · Emanuele Giuseppe Esposito
Extend the regex to cover also return type, pointers included. This implies that the value returned by the function cannot be a simple "int" anymore, but the custom return type. Therefore remove
poll_state->retand instead use a per-function custom "ret" field.Signed-off-by Emanuele Giuseppe Esposito <[email protected]>Reviewed-by Kevin Wolf <[email protected]>
Quoted 9 lines
--- block/block-gen.h | 5 +---- scripts/block-coroutine-wrapper.py | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-)block/block-gen.h +0
-0
[..]
block/block-gen.h
Quoted 4 lines
# Match wrappers declared with a
co_wrappermarkblock/block-gen.h +1
-1-func_decl_re = re.compile(r'^int\s*co_wrapper' +func_decl_re = re.compile(r'^(?P<return_type>[a-zA-Z][a-zA-Z0-9_]* [*]?)'
hmm interesting. I'd just write \* to mean '*' symbol. Probably it's a tiny bit faster (and tiny bit shorter:)
Signature · 2 lines
Best regards, Vladimir
PATCH v6 13/14 block: convert bdrv_create to co_wrapper
In reply to Emanuele Giuseppe EspositoThis function is never called in coroutine context, therefore instead of manually creating a new coroutine, delegate it to the block-coroutine-wrapper script, defining it as co_wrapper.
--- block.c | 40 ++---------------------------- include/block/block-global-state.h | 8 ++++-- 2 files changed, 8 insertions(+), 40 deletions(-)
block.c +2 -38
@@ -528,8 +528,8 @@ typedef struct CreateCo {Error *err; } CreateCo; -static int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename, -QemuOpts *opts,Error **errp) +int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename, +QemuOpts *opts,Error **errp) {int ret;GLOBAL_STATE_CODE ();
@@ -552,42 +552,6 @@ static int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename,return ret; } -static void coroutine_fn bdrv_create_co_entry(void *opaque) -{ -CreateCo *cco = opaque; -GLOBAL_STATE_CODE (); - - cco->ret =bdrv_co_create (cco->drv, cco->filename, cco->opts, &cco->err); -} - -int bdrv_create (BlockDriver *drv,const char * filename, -QemuOpts *opts,Error **errp) -{ -GLOBAL_STATE_CODE (); - -if (qemu_in_coroutine ()) { -/* Fast-path if already in coroutine context */ -return bdrv_co_create (drv, filename, opts, errp); - }else { -Coroutine *co; -CreateCo cco = { - .drv = drv, - .filename = filename, - .opts = opts, - .ret =NOT_DONE , - .err =NULL , - }; - - co =qemu_coroutine_create (bdrv_create_co_entry, &cco); -qemu_coroutine_enter (co); -while (cco.ret ==NOT_DONE ) { -aio_poll (qemu_get_aio_context (), true); - } -error_propagate (errp, cco.err); -return cco.ret; - } -} -/** * Helper function for bdrv_create_file_fallback(): Resize @blk to at * least the given @minimum_size.
include/block/block-global-state.h +6 -2
@@ -55,8 +55,12 @@ BlockDriver *bdrv_find_protocol(const char *filename,bool allow_protocol_prefix, Error **errp);BlockDriver *bdrv_find_format (const char *format_name); -int bdrv_create (BlockDriver *drv,const char * filename, -QemuOpts *opts,Error **errp); + +int coroutine_fn bdrv_co_create(BlockDriver *drv, const char *filename, +QemuOpts *opts,Error **errp); +int co_wrapper bdrv_create(BlockDriver *drv, const char *filename, +QemuOpts *opts,Error **errp); + int coroutine_fn bdrv_co_create_file(const char *filename, QemuOpts *opts,Error **errp);
Signature · 1 line
2.31.1
Re: [PATCH v6 13/14] block: convert bdrv_create to co_wrapper
Quoted 6 lines · Emanuele Giuseppe Esposito
This function is never called in coroutine context, therefore instead of manually creating a new coroutine, delegate it to the block-coroutine-wrapper script, defining it as
co_wrapper.Signed-off-by Emanuele Giuseppe Esposito<[email protected]>Reviewed-by Kevin Wolf<[email protected]>
(if you merge 07 here, keep my r-b)
Signature · 2 lines
Best regards, Vladimir
PATCH v6 14/14 block/dirty-bitmap: convert coroutine-only functions to co_wrapper
In reply to Emanuele Giuseppe Espositobdrv_can_store_new_dirty_bitmap and bdrv_remove_persistent_dirty_bitmap check if they are running in a coroutine, directly calling the coroutine callback if it's the case.
Except that no coroutine calls such functions, therefore that check can be removed, and function creation can be offloaded to c_w.
--- block/dirty-bitmap.c | 88 +----------------------------------- block/meson.build | 1 + include/block/block-common.h | 5 +- include/block/block-io.h | 10 +++- include/block/dirty-bitmap.h | 10 +++- 5 files changed, 22 insertions(+), 92 deletions(-)
block/dirty-bitmap.c +2 -86
@@ -388,7 +388,7 @@ void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs)* not fail. * This function doesn't release corresponding BdrvDirtyBitmap. */ -static int coroutine_fn +int coroutine_fnbdrv_co_remove_persistent_dirty_bitmap (BlockDriverState *bs,const char *name,Error **errp) {
@@ -399,45 +399,6 @@ bdrv_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, const char *name,return 0 ; } -typedef struct BdrvRemovePersistentDirtyBitmapCo { -BlockDriverState *bs; -const char *name; -Error **errp; -int ret; -}BdrvRemovePersistentDirtyBitmapCo ; - -static void coroutine_fn -bdrv_co_remove_persistent_dirty_bitmap_entry (void *opaque) -{ -BdrvRemovePersistentDirtyBitmapCo *s = opaque; - - s->ret =bdrv_co_remove_persistent_dirty_bitmap (s->bs, s->name, s->errp); -aio_wait_kick (); -} - -int bdrv_remove_persistent_dirty_bitmap (BlockDriverState *bs,const char *name, -Error **errp) -{ -if (qemu_in_coroutine ()) { -return bdrv_co_remove_persistent_dirty_bitmap (bs, name, errp); - }else { -Coroutine *co; -BdrvRemovePersistentDirtyBitmapCo s = { - .bs = bs, - .name = name, - .errp = errp, - .ret = -EINPROGRESS , - }; - - co =qemu_coroutine_create (bdrv_co_remove_persistent_dirty_bitmap_entry, - &s); -bdrv_coroutine_enter (bs, co); -BDRV_POLL_WHILE (bs, s.ret == -EINPROGRESS ); - -return s.ret; - } -} -bool bdrv_supports_persistent_dirty_bitmap (BlockDriverState *bs) {
@@ -447,7 +408,7 @@ bdrv_supports_persistent_dirty_bitmap(BlockDriverState *bs)return false; } -static bool coroutine_fn +bool coroutine_fnbdrv_co_can_store_new_dirty_bitmap (BlockDriverState *bs,const char *name,uint32_t granularity,Error **errp) {
@@ -470,51 +431,6 @@ bdrv_co_can_store_new_dirty_bitmap(BlockDriverState *bs, const char *name,return drv->bdrv_co_can_store_new_dirty_bitmap (bs, name, granularity, errp); } -typedef struct BdrvCanStoreNewDirtyBitmapCo { -BlockDriverState *bs; -const char *name; -uint32_t granularity; -Error **errp; -bool ret; - -bool in_progress; -}BdrvCanStoreNewDirtyBitmapCo ; - -static void coroutine_fn bdrv_co_can_store_new_dirty_bitmap_entry(void *opaque) -{ -BdrvCanStoreNewDirtyBitmapCo *s = opaque; - - s->ret =bdrv_co_can_store_new_dirty_bitmap (s->bs, s->name, s->granularity, - s->errp); - s->in_progress = false; -aio_wait_kick (); -} - -bool bdrv_can_store_new_dirty_bitmap (BlockDriverState *bs,const char *name, -uint32_t granularity,Error **errp) -{ -IO_CODE (); -if (qemu_in_coroutine ()) { -return bdrv_co_can_store_new_dirty_bitmap (bs, name, granularity, errp); - }else { -Coroutine *co; -BdrvCanStoreNewDirtyBitmapCo s = { - .bs = bs, - .name = name, - .granularity = granularity, - .errp = errp, - .in_progress = true, - }; - - co =qemu_coroutine_create (bdrv_co_can_store_new_dirty_bitmap_entry, - &s); -bdrv_coroutine_enter (bs, co); -BDRV_POLL_WHILE (bs, s.in_progress); - -return s.ret; - } -} -void bdrv_disable_dirty_bitmap (BdrvDirtyBitmap *bitmap) {bdrv_dirty_bitmaps_lock (bitmap->bs);
block/meson.build +1 -0
@@ -137,6 +137,7 @@ block_gen_c = custom_target('block-gen.c', output: 'block-gen.c', input: files( '../include/block/block-io.h', + '../include/block/dirty-bitmap.h', '../include/block/block-global-state.h', '../include/sysemu/block-backend-io.h', 'coroutines.h'
include/block/block-common.h +3 -2
@@ -29,8 +29,6 @@#include "qemu/iov.h" #include "qemu/coroutine.h" #include "block/accounting.h" -#include "block/dirty-bitmap.h" -#include "block/blockjob.h" #include "qemu/hbitmap.h" #include "qemu/transactions.h"
@@ -51,6 +49,9 @@#define co_wrapper#define co_wrapper_mixed +#include "block/dirty-bitmap.h" +#include "block/blockjob.h" +/* block.c */ typedef struct BlockDriver BlockDriver ;typedef struct BdrvChild BdrvChild ;
include/block/block-io.h +8 -2
@@ -215,8 +215,14 @@ AioContext *child_of_bds_get_parent_aio_context(BdrvChild *c);void bdrv_io_plug (BlockDriverState *bs);void bdrv_io_unplug (BlockDriverState *bs); -bool bdrv_can_store_new_dirty_bitmap (BlockDriverState *bs,const char *name, -uint32_t granularity,Error **errp); +bool coroutine_fn bdrv_co_can_store_new_dirty_bitmap(BlockDriverState *bs, +const char *name, +uint32_t granularity, +Error **errp); +bool co_wrapper bdrv_can_store_new_dirty_bitmap(BlockDriverState *bs, +const char *name, +uint32_t granularity, +Error **errp);/** *
include/block/dirty-bitmap.h +8 -2
@@ -34,8 +34,14 @@ int bdrv_dirty_bitmap_check(const BdrvDirtyBitmap *bitmap, uint32_t flags, Error **errp);void bdrv_release_dirty_bitmap (BdrvDirtyBitmap *bitmap);void bdrv_release_named_dirty_bitmaps (BlockDriverState *bs); -int bdrv_remove_persistent_dirty_bitmap (BlockDriverState *bs,const char *name, -Error **errp); + +int coroutine_fn bdrv_co_remove_persistent_dirty_bitmap(BlockDriverState *bs, +const char *name, +Error **errp); +int co_wrapper bdrv_remove_persistent_dirty_bitmap(BlockDriverState *bs, +const char *name, +Error **errp); +void bdrv_disable_dirty_bitmap (BdrvDirtyBitmap *bitmap);void bdrv_enable_dirty_bitmap (BdrvDirtyBitmap *bitmap);void bdrv_enable_dirty_bitmap_locked (BdrvDirtyBitmap *bitmap);
Signature · 1 line
2.31.1
Re: [PATCH v6 14/14] block/dirty-bitmap: convert coroutine-only functions to co_wrapper
Quoted 9 lines · Emanuele Giuseppe Esposito
bdrv_can_store_new_dirty_bitmapandbdrv_remove_persistent_dirty_bitmapcheck if they are running in a coroutine, directly calling the coroutine callback if it's the case.
Except that no coroutine calls such functions, therefore that check can be removed, and function creation can be offloaded toc_w.Signed-off-by Emanuele Giuseppe Esposito <[email protected]>Reviewed-by Kevin Wolf <[email protected]>
block/dirty-bitmap.c
Quoted 12 lines
--- block/dirty-bitmap.c | 88 +----------------------------------- block/meson.build | 1 + include/block/block-common.h | 5 +- include/block/block-io.h | 10 +++- include/block/dirty-bitmap.h | 10 +++- 5 files changed, 22 insertions(+), 92 deletions(-)block/dirty-bitmap.c +0
-0
Please do
git config diff.orderFile scripts/git.orderfile
so that .h files appear first.
Quoted 9 lines
block/dirty-bitmap.c +1
-1@@ -388,7 +388,7 @@ void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs)* not fail. * This function doesn't release corresponding BdrvDirtyBitmap. */ -static int coroutine_fn +int coroutine_fnbdrv_co_remove_persistent_dirty_bitmap (BlockDriverState *bs,const char *name,Error **errp) {
[..]
Quoted 12 lines
include/block/block-common.h +0
-2@@ -29,8 +29,6 @@#include "qemu/iov.h" #include "qemu/coroutine.h" #include "block/accounting.h" -#include "block/dirty-bitmap.h" -#include "block/blockjob.h" #include "qemu/hbitmap.h" #include "qemu/transactions.h"
include/block/block-common.h line 54
Quoted 6 lines
include/block/block-common.h +3
-0@@ -51,6 +49,9 @@#define co_wrapper#define co_wrapper_mixed +#include "block/dirty-bitmap.h" +#include "block/blockjob.h" +
that's not good.. we have unclean dependency on include order and these wrapper definitions.
Actually that means that we want separate header file for co_wrapper and co_wrapper_mixed.. But OK, let's keep it as is for now, not hard to fix it later if really needed.
Signature · 2 lines
Best regards, Vladimir