block: Convert bdrv_get_allocated_file_size() to co_wrapper

bdrv_get_allocated_file_size() is categorized as an I/O function, and it
currently doesn't run in a coroutine. We should let it take a graph
rdlock since it traverses the block nodes graph, which however is only
possible in a coroutine.

Therefore turn it into a co_wrapper to move the actual function into a
coroutine where the lock can be taken.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230113204212.359076-10-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2023-01-13 21:42:07 +01:00 committed by Kevin Wolf
parent bd53086e82
commit 82618d7bc3
10 changed files with 39 additions and 38 deletions

12
block.c
View File

@ -5720,7 +5720,7 @@ exit:
} }
/** /**
* Implementation of BlockDriver.bdrv_get_allocated_file_size() that * Implementation of BlockDriver.bdrv_co_get_allocated_file_size() that
* sums the size of all data-bearing children. (This excludes backing * sums the size of all data-bearing children. (This excludes backing
* children.) * children.)
*/ */
@ -5733,7 +5733,7 @@ static int64_t bdrv_sum_allocated_file_size(BlockDriverState *bs)
if (child->role & (BDRV_CHILD_DATA | BDRV_CHILD_METADATA | if (child->role & (BDRV_CHILD_DATA | BDRV_CHILD_METADATA |
BDRV_CHILD_FILTERED)) BDRV_CHILD_FILTERED))
{ {
child_size = bdrv_get_allocated_file_size(child->bs); child_size = bdrv_co_get_allocated_file_size(child->bs);
if (child_size < 0) { if (child_size < 0) {
return child_size; return child_size;
} }
@ -5748,7 +5748,7 @@ static int64_t bdrv_sum_allocated_file_size(BlockDriverState *bs)
* Length of a allocated file in bytes. Sparse files are counted by actual * Length of a allocated file in bytes. Sparse files are counted by actual
* allocated space. Return < 0 if error or unknown. * allocated space. Return < 0 if error or unknown.
*/ */
int64_t bdrv_get_allocated_file_size(BlockDriverState *bs) int64_t coroutine_fn bdrv_co_get_allocated_file_size(BlockDriverState *bs)
{ {
BlockDriver *drv = bs->drv; BlockDriver *drv = bs->drv;
IO_CODE(); IO_CODE();
@ -5756,8 +5756,8 @@ int64_t bdrv_get_allocated_file_size(BlockDriverState *bs)
if (!drv) { if (!drv) {
return -ENOMEDIUM; return -ENOMEDIUM;
} }
if (drv->bdrv_get_allocated_file_size) { if (drv->bdrv_co_get_allocated_file_size) {
return drv->bdrv_get_allocated_file_size(bs); return drv->bdrv_co_get_allocated_file_size(bs);
} }
if (drv->bdrv_file_open) { if (drv->bdrv_file_open) {
@ -5769,7 +5769,7 @@ int64_t bdrv_get_allocated_file_size(BlockDriverState *bs)
return -ENOTSUP; return -ENOTSUP;
} else if (drv->is_filter) { } else if (drv->is_filter) {
/* Filter drivers default to the size of their filtered child */ /* Filter drivers default to the size of their filtered child */
return bdrv_get_allocated_file_size(bdrv_filter_bs(bs)); return bdrv_co_get_allocated_file_size(bdrv_filter_bs(bs));
} else { } else {
/* Other drivers default to summing their children's sizes */ /* Other drivers default to summing their children's sizes */
return bdrv_sum_allocated_file_size(bs); return bdrv_sum_allocated_file_size(bs);

View File

@ -2464,7 +2464,7 @@ static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs)
} }
#endif #endif
static int64_t raw_get_allocated_file_size(BlockDriverState *bs) static int64_t coroutine_fn raw_co_get_allocated_file_size(BlockDriverState *bs)
{ {
struct stat st; struct stat st;
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
@ -3324,8 +3324,7 @@ BlockDriver bdrv_file = {
.bdrv_co_truncate = raw_co_truncate, .bdrv_co_truncate = raw_co_truncate,
.bdrv_co_getlength = raw_co_getlength, .bdrv_co_getlength = raw_co_getlength,
.bdrv_get_info = raw_get_info, .bdrv_get_info = raw_get_info,
.bdrv_get_allocated_file_size .bdrv_co_get_allocated_file_size = raw_co_get_allocated_file_size,
= raw_get_allocated_file_size,
.bdrv_get_specific_stats = raw_get_specific_stats, .bdrv_get_specific_stats = raw_get_specific_stats,
.bdrv_check_perm = raw_check_perm, .bdrv_check_perm = raw_check_perm,
.bdrv_set_perm = raw_set_perm, .bdrv_set_perm = raw_set_perm,
@ -3696,8 +3695,7 @@ static BlockDriver bdrv_host_device = {
.bdrv_co_truncate = raw_co_truncate, .bdrv_co_truncate = raw_co_truncate,
.bdrv_co_getlength = raw_co_getlength, .bdrv_co_getlength = raw_co_getlength,
.bdrv_get_info = raw_get_info, .bdrv_get_info = raw_get_info,
.bdrv_get_allocated_file_size .bdrv_co_get_allocated_file_size = raw_co_get_allocated_file_size,
= raw_get_allocated_file_size,
.bdrv_get_specific_stats = hdev_get_specific_stats, .bdrv_get_specific_stats = hdev_get_specific_stats,
.bdrv_check_perm = raw_check_perm, .bdrv_check_perm = raw_check_perm,
.bdrv_set_perm = raw_set_perm, .bdrv_set_perm = raw_set_perm,
@ -3820,8 +3818,7 @@ static BlockDriver bdrv_host_cdrom = {
.bdrv_co_truncate = raw_co_truncate, .bdrv_co_truncate = raw_co_truncate,
.bdrv_co_getlength = raw_co_getlength, .bdrv_co_getlength = raw_co_getlength,
.has_variable_length = true, .has_variable_length = true,
.bdrv_get_allocated_file_size .bdrv_co_get_allocated_file_size = raw_co_get_allocated_file_size,
= raw_get_allocated_file_size,
/* removable device support */ /* removable device support */
.bdrv_co_is_inserted = cdrom_co_is_inserted, .bdrv_co_is_inserted = cdrom_co_is_inserted,
@ -3950,8 +3947,7 @@ static BlockDriver bdrv_host_cdrom = {
.bdrv_co_truncate = raw_co_truncate, .bdrv_co_truncate = raw_co_truncate,
.bdrv_co_getlength = raw_co_getlength, .bdrv_co_getlength = raw_co_getlength,
.has_variable_length = true, .has_variable_length = true,
.bdrv_get_allocated_file_size .bdrv_co_get_allocated_file_size = raw_co_get_allocated_file_size,
= raw_get_allocated_file_size,
/* removable device support */ /* removable device support */
.bdrv_co_is_inserted = cdrom_co_is_inserted, .bdrv_co_is_inserted = cdrom_co_is_inserted,

View File

@ -559,7 +559,7 @@ static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs)
return l.QuadPart; return l.QuadPart;
} }
static int64_t raw_get_allocated_file_size(BlockDriverState *bs) static int64_t coroutine_fn raw_co_get_allocated_file_size(BlockDriverState *bs)
{ {
typedef DWORD (WINAPI * get_compressed_t)(const char *filename, typedef DWORD (WINAPI * get_compressed_t)(const char *filename,
DWORD * high); DWORD * high);
@ -765,8 +765,8 @@ BlockDriver bdrv_file = {
.bdrv_co_truncate = raw_co_truncate, .bdrv_co_truncate = raw_co_truncate,
.bdrv_co_getlength = raw_co_getlength, .bdrv_co_getlength = raw_co_getlength,
.bdrv_get_allocated_file_size .bdrv_co_get_allocated_file_size
= raw_get_allocated_file_size, = raw_co_get_allocated_file_size,
.create_opts = &raw_create_opts, .create_opts = &raw_create_opts,
}; };
@ -935,9 +935,7 @@ static BlockDriver bdrv_host_device = {
.bdrv_co_getlength = raw_co_getlength, .bdrv_co_getlength = raw_co_getlength,
.has_variable_length = true, .has_variable_length = true,
.bdrv_co_get_allocated_file_size = raw_co_get_allocated_file_size,
.bdrv_get_allocated_file_size
= raw_get_allocated_file_size,
}; };
static void bdrv_file_init(void) static void bdrv_file_init(void)

View File

@ -1331,7 +1331,8 @@ static int64_t coroutine_fn qemu_gluster_co_getlength(BlockDriverState *bs)
} }
} }
static int64_t qemu_gluster_allocated_file_size(BlockDriverState *bs) static int64_t coroutine_fn
qemu_gluster_co_get_allocated_file_size(BlockDriverState *bs)
{ {
BDRVGlusterState *s = bs->opaque; BDRVGlusterState *s = bs->opaque;
struct stat st; struct stat st;
@ -1560,7 +1561,7 @@ static BlockDriver bdrv_gluster = {
.bdrv_co_create = qemu_gluster_co_create, .bdrv_co_create = qemu_gluster_co_create,
.bdrv_co_create_opts = qemu_gluster_co_create_opts, .bdrv_co_create_opts = qemu_gluster_co_create_opts,
.bdrv_co_getlength = qemu_gluster_co_getlength, .bdrv_co_getlength = qemu_gluster_co_getlength,
.bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size, .bdrv_co_get_allocated_file_size = qemu_gluster_co_get_allocated_file_size,
.bdrv_co_truncate = qemu_gluster_co_truncate, .bdrv_co_truncate = qemu_gluster_co_truncate,
.bdrv_co_readv = qemu_gluster_co_readv, .bdrv_co_readv = qemu_gluster_co_readv,
.bdrv_co_writev = qemu_gluster_co_writev, .bdrv_co_writev = qemu_gluster_co_writev,
@ -1589,7 +1590,7 @@ static BlockDriver bdrv_gluster_tcp = {
.bdrv_co_create = qemu_gluster_co_create, .bdrv_co_create = qemu_gluster_co_create,
.bdrv_co_create_opts = qemu_gluster_co_create_opts, .bdrv_co_create_opts = qemu_gluster_co_create_opts,
.bdrv_co_getlength = qemu_gluster_co_getlength, .bdrv_co_getlength = qemu_gluster_co_getlength,
.bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size, .bdrv_co_get_allocated_file_size = qemu_gluster_co_get_allocated_file_size,
.bdrv_co_truncate = qemu_gluster_co_truncate, .bdrv_co_truncate = qemu_gluster_co_truncate,
.bdrv_co_readv = qemu_gluster_co_readv, .bdrv_co_readv = qemu_gluster_co_readv,
.bdrv_co_writev = qemu_gluster_co_writev, .bdrv_co_writev = qemu_gluster_co_writev,
@ -1618,7 +1619,7 @@ static BlockDriver bdrv_gluster_unix = {
.bdrv_co_create = qemu_gluster_co_create, .bdrv_co_create = qemu_gluster_co_create,
.bdrv_co_create_opts = qemu_gluster_co_create_opts, .bdrv_co_create_opts = qemu_gluster_co_create_opts,
.bdrv_co_getlength = qemu_gluster_co_getlength, .bdrv_co_getlength = qemu_gluster_co_getlength,
.bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size, .bdrv_co_get_allocated_file_size = qemu_gluster_co_get_allocated_file_size,
.bdrv_co_truncate = qemu_gluster_co_truncate, .bdrv_co_truncate = qemu_gluster_co_truncate,
.bdrv_co_readv = qemu_gluster_co_readv, .bdrv_co_readv = qemu_gluster_co_readv,
.bdrv_co_writev = qemu_gluster_co_writev, .bdrv_co_writev = qemu_gluster_co_writev,
@ -1653,7 +1654,7 @@ static BlockDriver bdrv_gluster_rdma = {
.bdrv_co_create = qemu_gluster_co_create, .bdrv_co_create = qemu_gluster_co_create,
.bdrv_co_create_opts = qemu_gluster_co_create_opts, .bdrv_co_create_opts = qemu_gluster_co_create_opts,
.bdrv_co_getlength = qemu_gluster_co_getlength, .bdrv_co_getlength = qemu_gluster_co_getlength,
.bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size, .bdrv_co_get_allocated_file_size = qemu_gluster_co_get_allocated_file_size,
.bdrv_co_truncate = qemu_gluster_co_truncate, .bdrv_co_truncate = qemu_gluster_co_truncate,
.bdrv_co_readv = qemu_gluster_co_readv, .bdrv_co_readv = qemu_gluster_co_readv,
.bdrv_co_writev = qemu_gluster_co_writev, .bdrv_co_writev = qemu_gluster_co_writev,

View File

@ -732,7 +732,7 @@ nfs_get_allocated_file_size_cb(int ret, struct nfs_context *nfs, void *data,
bdrv_wakeup(task->bs); bdrv_wakeup(task->bs);
} }
static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) static int64_t coroutine_fn nfs_co_get_allocated_file_size(BlockDriverState *bs)
{ {
NFSClient *client = bs->opaque; NFSClient *client = bs->opaque;
NFSRPC task = {0}; NFSRPC task = {0};
@ -885,7 +885,7 @@ static BlockDriver bdrv_nfs = {
.bdrv_has_zero_init = nfs_has_zero_init, .bdrv_has_zero_init = nfs_has_zero_init,
/* libnfs does not provide the allocated filesize of a file on win32. */ /* libnfs does not provide the allocated filesize of a file on win32. */
#if !defined(_WIN32) #if !defined(_WIN32)
.bdrv_get_allocated_file_size = nfs_get_allocated_file_size, .bdrv_co_get_allocated_file_size = nfs_co_get_allocated_file_size,
#endif #endif
.bdrv_co_truncate = nfs_file_co_truncate, .bdrv_co_truncate = nfs_file_co_truncate,

View File

@ -265,7 +265,8 @@ static void null_refresh_filename(BlockDriverState *bs)
bs->drv->format_name); bs->drv->format_name);
} }
static int64_t null_allocated_file_size(BlockDriverState *bs) static int64_t coroutine_fn
null_co_get_allocated_file_size(BlockDriverState *bs)
{ {
return 0; return 0;
} }
@ -285,7 +286,7 @@ static BlockDriver bdrv_null_co = {
.bdrv_file_open = null_file_open, .bdrv_file_open = null_file_open,
.bdrv_parse_filename = null_co_parse_filename, .bdrv_parse_filename = null_co_parse_filename,
.bdrv_co_getlength = null_co_getlength, .bdrv_co_getlength = null_co_getlength,
.bdrv_get_allocated_file_size = null_allocated_file_size, .bdrv_co_get_allocated_file_size = null_co_get_allocated_file_size,
.bdrv_co_preadv = null_co_preadv, .bdrv_co_preadv = null_co_preadv,
.bdrv_co_pwritev = null_co_pwritev, .bdrv_co_pwritev = null_co_pwritev,
@ -306,7 +307,7 @@ static BlockDriver bdrv_null_aio = {
.bdrv_file_open = null_file_open, .bdrv_file_open = null_file_open,
.bdrv_parse_filename = null_aio_parse_filename, .bdrv_parse_filename = null_aio_parse_filename,
.bdrv_co_getlength = null_co_getlength, .bdrv_co_getlength = null_co_getlength,
.bdrv_get_allocated_file_size = null_allocated_file_size, .bdrv_co_get_allocated_file_size = null_co_get_allocated_file_size,
.bdrv_aio_preadv = null_aio_preadv, .bdrv_aio_preadv = null_aio_preadv,
.bdrv_aio_pwritev = null_aio_pwritev, .bdrv_aio_pwritev = null_aio_pwritev,

View File

@ -3720,7 +3720,7 @@ int coroutine_fn qcow2_detect_metadata_preallocation(BlockDriverState *bs)
return file_length; return file_length;
} }
real_allocation = bdrv_get_allocated_file_size(bs->file->bs); real_allocation = bdrv_co_get_allocated_file_size(bs->file->bs);
if (real_allocation < 0) { if (real_allocation < 0) {
return real_allocation; return real_allocation;
} }

View File

@ -2856,14 +2856,15 @@ static void vmdk_close(BlockDriverState *bs)
error_free(s->migration_blocker); error_free(s->migration_blocker);
} }
static int64_t vmdk_get_allocated_file_size(BlockDriverState *bs) static int64_t coroutine_fn
vmdk_co_get_allocated_file_size(BlockDriverState *bs)
{ {
int i; int i;
int64_t ret = 0; int64_t ret = 0;
int64_t r; int64_t r;
BDRVVmdkState *s = bs->opaque; BDRVVmdkState *s = bs->opaque;
ret = bdrv_get_allocated_file_size(bs->file->bs); ret = bdrv_co_get_allocated_file_size(bs->file->bs);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -2871,7 +2872,7 @@ static int64_t vmdk_get_allocated_file_size(BlockDriverState *bs)
if (s->extents[i].file == bs->file) { if (s->extents[i].file == bs->file) {
continue; continue;
} }
r = bdrv_get_allocated_file_size(s->extents[i].file->bs); r = bdrv_co_get_allocated_file_size(s->extents[i].file->bs);
if (r < 0) { if (r < 0) {
return r; return r;
} }
@ -3124,7 +3125,7 @@ static BlockDriver bdrv_vmdk = {
.bdrv_co_create_opts = vmdk_co_create_opts, .bdrv_co_create_opts = vmdk_co_create_opts,
.bdrv_co_create = vmdk_co_create, .bdrv_co_create = vmdk_co_create,
.bdrv_co_block_status = vmdk_co_block_status, .bdrv_co_block_status = vmdk_co_block_status,
.bdrv_get_allocated_file_size = vmdk_get_allocated_file_size, .bdrv_co_get_allocated_file_size = vmdk_co_get_allocated_file_size,
.bdrv_has_zero_init = vmdk_has_zero_init, .bdrv_has_zero_init = vmdk_has_zero_init,
.bdrv_get_specific_info = vmdk_get_specific_info, .bdrv_get_specific_info = vmdk_get_specific_info,
.bdrv_refresh_limits = vmdk_refresh_limits, .bdrv_refresh_limits = vmdk_refresh_limits,

View File

@ -82,7 +82,9 @@ int64_t co_wrapper_mixed bdrv_nb_sectors(BlockDriverState *bs);
int64_t coroutine_fn bdrv_co_getlength(BlockDriverState *bs); int64_t coroutine_fn bdrv_co_getlength(BlockDriverState *bs);
int64_t co_wrapper_mixed bdrv_getlength(BlockDriverState *bs); int64_t co_wrapper_mixed bdrv_getlength(BlockDriverState *bs);
int64_t bdrv_get_allocated_file_size(BlockDriverState *bs); int64_t coroutine_fn bdrv_co_get_allocated_file_size(BlockDriverState *bs);
int64_t co_wrapper bdrv_get_allocated_file_size(BlockDriverState *bs);
BlockMeasureInfo *bdrv_measure(BlockDriver *drv, QemuOpts *opts, BlockMeasureInfo *bdrv_measure(BlockDriver *drv, QemuOpts *opts,
BlockDriverState *in_bs, Error **errp); BlockDriverState *in_bs, Error **errp);
void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr); void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr);

View File

@ -681,7 +681,9 @@ struct BlockDriver {
bool exact, PreallocMode prealloc, bool exact, PreallocMode prealloc,
BdrvRequestFlags flags, Error **errp); BdrvRequestFlags flags, Error **errp);
int64_t coroutine_fn (*bdrv_co_getlength)(BlockDriverState *bs); int64_t coroutine_fn (*bdrv_co_getlength)(BlockDriverState *bs);
int64_t (*bdrv_get_allocated_file_size)(BlockDriverState *bs); int64_t coroutine_fn (*bdrv_co_get_allocated_file_size)(
BlockDriverState *bs);
BlockMeasureInfo *(*bdrv_measure)(QemuOpts *opts, BlockDriverState *in_bs, BlockMeasureInfo *(*bdrv_measure)(QemuOpts *opts, BlockDriverState *in_bs,
Error **errp); Error **errp);