Skip to content

Commit

Permalink
block-backend: replace bdrv_*_above with blk_*_above
Browse files Browse the repository at this point in the history 
Avoid 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.

Signed-off-by: Emanuele Giuseppe Esposito <[email protected]>
Reviewed-by: Vladimir Sementsov-Ogievskiy <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Kevin Wolf <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>
  • Loading branch information
@esposem @kevmw
esposem authored and kevmw committed Dec 15, 2022
1 parent 6f58ac5 commit ff7e261
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 18 deletions.
21 changes: 21 additions & 0 deletions block/block-backend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions block/commit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
9 changes: 9 additions & 0 deletions include/sysemu/block-backend-io.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 16 additions & 16 deletions nbd/server.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1988,7 +1988,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,
Expand All @@ -2004,10 +2004,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) {
Expand Down Expand Up @@ -2138,15 +2138,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;
Expand All @@ -2166,14 +2166,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;
Expand Down Expand Up @@ -2221,7 +2221,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)
Expand All @@ -2231,9 +2231,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(
Expand Down Expand Up @@ -2560,7 +2560,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,
Expand All @@ -2573,7 +2573,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,
Expand Down

0 comments on commit ff7e261

Please sign in to comment.