| Message ID | 20221116122241.2856527-4-eesposit@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Still more coroutine and various fixes in block layer | expand |
Am 16.11.2022 um 13:22 hat Emanuele Giuseppe Esposito geschrieben: > Avoid mixing bdrv_* functions with blk_*, so create blk_* counterparts > for: > - bdrv_block_status_above > - bdrv_is_allocated_above > > Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> > --- > block/block-backend.c | 21 +++++++++++++++++++++ > block/commit.c | 4 ++-- > include/sysemu/block-backend-io.h | 9 +++++++++ > nbd/server.c | 28 ++++++++++++++-------------- > qemu-img.c | 4 ++-- > 5 files changed, 48 insertions(+), 18 deletions(-) > > diff --git a/block/block-backend.c b/block/block-backend.c > index 742efa7955..333d50fb3f 100644 > --- a/block/block-backend.c > +++ b/block/block-backend.c > @@ -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_block_status_above(BlockBackend *blk, Let's call it blk_co_block_status_above() to stay consistent with other functions. > + BlockDriverState *base, > + int64_t offset, int64_t bytes, > + int64_t *pnum, int64_t *map, > + BlockDriverState **file) > +{ > + IO_CODE(); > + return bdrv_block_status_above(blk_bs(blk), base, offset, bytes, pnum, map, > + file); coroutine_fn calling into a g_c_w. As mentioned in the first patch, we really want a bdrv_co_block_status_above() than can be called without the g_c_w wrapper. > +} > + > +int coroutine_fn blk_is_allocated_above(BlockBackend *blk, blk_co_is_allocated_above() > + BlockDriverState *base, > + bool include_base, int64_t offset, > + int64_t bytes, int64_t *pnum) > +{ > + IO_CODE(); > + return bdrv_is_allocated_above(blk_bs(blk), base, include_base, offset, > + bytes, pnum); Again a g_c_w. > +} > + > typedef struct BlkRwCo { > BlockBackend *blk; > int64_t offset; > diff --git a/block/commit.c b/block/commit.c > index 0029b31944..9d4d908344 100644 > --- a/block/commit.c > +++ b/block/commit.c > @@ -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_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) { > diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backend-io.h > index 50f5aa2e07..a47cb825e5 100644 > --- a/include/sysemu/block-backend-io.h > +++ b/include/sysemu/block-backend-io.h > @@ -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_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_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 > diff --git a/nbd/server.c b/nbd/server.c > index e2eec0cf46..6389b46396 100644 > --- a/nbd/server.c > +++ b/nbd/server.c > @@ -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_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_block_status_above(exp->common.blk, NULL, > + offset + progress, > + size - progress, &pnum, NULL, > + NULL); > bool final; > > if (status < 0) { > @@ -2141,14 +2141,14 @@ 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_block_status_above(bs, NULL, offset, bytes, &num, > + int ret = blk_block_status_above(blk, NULL, offset, bytes, &num, > NULL, NULL); Indentation is off now. > > if (ret < 0) { > @@ -2169,13 +2169,13 @@ 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_is_allocated_above(bs, NULL, false, offset, bytes, > + int ret = blk_is_allocated_above(blk, NULL, false, offset, bytes, > &num); Here, too. > if (ret < 0) { > @@ -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, > diff --git a/qemu-img.c b/qemu-img.c > index a3b64c88af..4282a34bc0 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -1730,8 +1730,8 @@ static int convert_iteration_sectors(ImgConvertState *s, int64_t sector_num) > do { > count = n * BDRV_SECTOR_SIZE; > > - ret = bdrv_block_status_above(src_bs, base, offset, count, &count, > - NULL, NULL); > + ret = bdrv_block_status_above(src_bs, base, offset, count, > + &count, NULL, NULL); This one looks odd. Did you intend to change more than the line wrapping here? Kevin
diff --git a/block/block-backend.c b/block/block-backend.c index 742efa7955..333d50fb3f 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -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_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_block_status_above(blk_bs(blk), base, offset, bytes, pnum, map, + file); +} + +int coroutine_fn blk_is_allocated_above(BlockBackend *blk, + BlockDriverState *base, + bool include_base, int64_t offset, + int64_t bytes, int64_t *pnum) +{ + IO_CODE(); + return bdrv_is_allocated_above(blk_bs(blk), base, include_base, offset, + bytes, pnum); +} + typedef struct BlkRwCo { BlockBackend *blk; int64_t offset; diff --git a/block/commit.c b/block/commit.c index 0029b31944..9d4d908344 100644 --- a/block/commit.c +++ b/block/commit.c @@ -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_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) { diff --git a/include/sysemu/block-backend-io.h b/include/sysemu/block-backend-io.h index 50f5aa2e07..a47cb825e5 100644 --- a/include/sysemu/block-backend-io.h +++ b/include/sysemu/block-backend-io.h @@ -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_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_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 diff --git a/nbd/server.c b/nbd/server.c index e2eec0cf46..6389b46396 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -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_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_block_status_above(exp->common.blk, NULL, + offset + progress, + size - progress, &pnum, NULL, + NULL); bool final; if (status < 0) { @@ -2141,14 +2141,14 @@ 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_block_status_above(bs, NULL, offset, bytes, &num, + int ret = blk_block_status_above(blk, NULL, offset, bytes, &num, NULL, NULL); if (ret < 0) { @@ -2169,13 +2169,13 @@ 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_is_allocated_above(bs, NULL, false, offset, bytes, + int ret = blk_is_allocated_above(blk, NULL, false, offset, bytes, &num); if (ret < 0) { @@ -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, diff --git a/qemu-img.c b/qemu-img.c index a3b64c88af..4282a34bc0 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1730,8 +1730,8 @@ static int convert_iteration_sectors(ImgConvertState *s, int64_t sector_num) do { count = n * BDRV_SECTOR_SIZE; - ret = bdrv_block_status_above(src_bs, base, offset, count, &count, - NULL, NULL); + ret = bdrv_block_status_above(src_bs, base, offset, count, + &count, NULL, NULL); if (ret < 0) { if (s->salvage) {
Avoid mixing bdrv_* functions with blk_*, so create blk_* counterparts for: - bdrv_block_status_above - bdrv_is_allocated_above Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> --- block/block-backend.c | 21 +++++++++++++++++++++ block/commit.c | 4 ++-- include/sysemu/block-backend-io.h | 9 +++++++++ nbd/server.c | 28 ++++++++++++++-------------- qemu-img.c | 4 ++-- 5 files changed, 48 insertions(+), 18 deletions(-)