We are generally moving to int64_t for both offset and bytes parameters on all io paths.
Main motivation is realization of 64-bit write_zeroes operation for fast zeroing large disk chunks, up to the whole disk. We chose signed type, to be consistent with off_t (which is signed) and with possibility for signed return type (where negative value means error). So, convert driver discard handlers bytes parameter to int64_t. This patch just converts handlers where it is obvious that bytes parameter is passed further to 64bit interfaces, and add simple wrappers where it is not obvious. Series: 64bit-block-status Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> --- include/block/block_int.h | 2 +- block/backup-top.c | 2 +- block/blkdebug.c | 2 +- block/blklogwrites.c | 4 ++-- block/blkreplay.c | 2 +- block/copy-on-read.c | 2 +- block/file-posix.c | 18 ++++++++++++++++-- block/filter-compress.c | 2 +- block/gluster.c | 6 ++++-- block/iscsi.c | 10 +++++++++- block/mirror.c | 2 +- block/nbd.c | 4 +++- block/nvme.c | 13 ++++++++++--- block/qcow2.c | 2 +- block/raw-format.c | 2 +- block/sheepdog.c | 11 +++++++++-- block/throttle.c | 2 +- 17 files changed, 63 insertions(+), 23 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index c98d591a56..ff8860fee8 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -248,7 +248,7 @@ struct BlockDriver { int coroutine_fn (*bdrv_co_pwrite_zeroes)(BlockDriverState *bs, int64_t offset, int64_t bytes, BdrvRequestFlags flags); int coroutine_fn (*bdrv_co_pdiscard)(BlockDriverState *bs, - int64_t offset, int bytes); + int64_t offset, int64_t bytes); /* Map [offset, offset + nbytes) range onto a child of @bs to copy from, * and invoke bdrv_co_copy_range_from(child, ...), or invoke diff --git a/block/backup-top.c b/block/backup-top.c index 2484293fb0..8c02fa3a58 100644 --- a/block/backup-top.c +++ b/block/backup-top.c @@ -65,7 +65,7 @@ static coroutine_fn int backup_top_cbw(BlockDriverState *bs, uint64_t offset, } static int coroutine_fn backup_top_co_pdiscard(BlockDriverState *bs, - int64_t offset, int bytes) + int64_t offset, int64_t bytes) { int ret = backup_top_cbw(bs, offset, bytes, 0); if (ret < 0) { diff --git a/block/blkdebug.c b/block/blkdebug.c index d593d6c85d..e1d91cf707 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -705,7 +705,7 @@ static int coroutine_fn blkdebug_co_pwrite_zeroes(BlockDriverState *bs, } static int coroutine_fn blkdebug_co_pdiscard(BlockDriverState *bs, - int64_t offset, int bytes) + int64_t offset, int64_t bytes) { uint32_t align = bs->bl.pdiscard_alignment; int err; diff --git a/block/blklogwrites.c b/block/blklogwrites.c index 8ca41d09cd..f488864106 100644 --- a/block/blklogwrites.c +++ b/block/blklogwrites.c @@ -490,9 +490,9 @@ static int coroutine_fn blk_log_writes_co_flush_to_disk(BlockDriverState *bs) } static int coroutine_fn -blk_log_writes_co_pdiscard(BlockDriverState *bs, int64_t offset, int count) +blk_log_writes_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes) { - return blk_log_writes_co_log(bs, offset, count, NULL, 0, + return blk_log_writes_co_log(bs, offset, bytes, NULL, 0, blk_log_writes_co_do_file_pdiscard, LOG_DISCARD_FLAG, false); } diff --git a/block/blkreplay.c b/block/blkreplay.c index 186d28cc6a..34a12ad5ac 100644 --- a/block/blkreplay.c +++ b/block/blkreplay.c @@ -106,7 +106,7 @@ static int coroutine_fn blkreplay_co_pwrite_zeroes(BlockDriverState *bs, } static int coroutine_fn blkreplay_co_pdiscard(BlockDriverState *bs, - int64_t offset, int bytes) + int64_t offset, int64_t bytes) { uint64_t reqid = blkreplay_next_id(); int ret = bdrv_co_pdiscard(bs->file, offset, bytes); diff --git a/block/copy-on-read.c b/block/copy-on-read.c index d99e07e99f..5bf1fabee6 100644 --- a/block/copy-on-read.c +++ b/block/copy-on-read.c @@ -102,7 +102,7 @@ static int coroutine_fn cor_co_pwrite_zeroes(BlockDriverState *bs, static int coroutine_fn cor_co_pdiscard(BlockDriverState *bs, - int64_t offset, int bytes) + int64_t offset, int64_t bytes) { return bdrv_co_pdiscard(bs->file, offset, bytes); } diff --git a/block/file-posix.c b/block/file-posix.c index fa9ac5b13e..132001dba8 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2791,11 +2791,18 @@ raw_do_pdiscard(BlockDriverState *bs, int64_t offset, int bytes, bool blkdev) } static coroutine_fn int -raw_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes) +raw_co_pdiscard_old(BlockDriverState *bs, int64_t offset, int bytes) { return raw_do_pdiscard(bs, offset, bytes, false); } +static coroutine_fn int +raw_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes) +{ + assert(bytes <= INT_MAX); + return raw_co_pdiscard_old(bs, offset, bytes); +} + static int coroutine_fn raw_do_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int64_t bytes, BdrvRequestFlags flags, bool blkdev) @@ -3475,7 +3482,7 @@ static int fd_open(BlockDriverState *bs) } static coroutine_fn int -hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes) +hdev_co_pdiscard_old(BlockDriverState *bs, int64_t offset, int bytes) { BDRVRawState *s = bs->opaque; int ret; @@ -3488,6 +3495,13 @@ hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes) return raw_do_pdiscard(bs, offset, bytes, true); } +static coroutine_fn int +hdev_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes) +{ + assert(bytes <= INT_MAX); + return hdev_co_pdiscard_old(bs, offset, bytes); +} + static coroutine_fn int hdev_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int64_t bytes, BdrvRequestFlags flags) { diff --git a/block/filter-compress.c b/block/filter-compress.c index 7cf47608b5..477dfaf959 100644 --- a/block/filter-compress.c +++ b/block/filter-compress.c @@ -93,7 +93,7 @@ static int coroutine_fn compress_co_pwrite_zeroes(BlockDriverState *bs, static int coroutine_fn compress_co_pdiscard(BlockDriverState *bs, - int64_t offset, int bytes) + int64_t offset, int64_t bytes) { return bdrv_co_pdiscard(bs->file, offset, bytes); } diff --git a/block/gluster.c b/block/gluster.c index 88130c3d2d..87cf69199d 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -1312,18 +1312,20 @@ error: #ifdef CONFIG_GLUSTERFS_DISCARD static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs, - int64_t offset, int size) + int64_t offset, int64_t bytes) { int ret; GlusterAIOCB acb; BDRVGlusterState *s = bs->opaque; + assert(bytes <= INT_MAX); + acb.size = 0; acb.ret = 0; acb.coroutine = qemu_coroutine_self(); acb.aio_context = bdrv_get_aio_context(bs); - ret = glfs_discard_async(s->fd, offset, size, gluster_finish_aiocb, &acb); + ret = glfs_discard_async(s->fd, offset, bytes, gluster_finish_aiocb, &acb); if (ret < 0) { return -errno; } diff --git a/block/iscsi.c b/block/iscsi.c index c4183ef12f..c06521b74f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1141,7 +1141,8 @@ iscsi_getlength(BlockDriverState *bs) } static int -coroutine_fn iscsi_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes) +coroutine_fn iscsi_co_pdiscard_old(BlockDriverState *bs, int64_t offset, + int bytes) { IscsiLun *iscsilun = bs->opaque; struct IscsiTask iTask; @@ -1203,6 +1204,13 @@ out_unlock: return r; } +static int +coroutine_fn iscsi_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes) +{ + assert(bytes <= INT_MAX); + return iscsi_co_pdiscard_old(bs, offset, bytes); +} + static int coroutine_fn iscsi_co_pwrite_zeroes_old(BlockDriverState *bs, int64_t offset, int bytes, BdrvRequestFlags flags) diff --git a/block/mirror.c b/block/mirror.c index 7f4fdfb470..bd01c032fa 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1471,7 +1471,7 @@ static int coroutine_fn bdrv_mirror_top_pwrite_zeroes(BlockDriverState *bs, } static int coroutine_fn bdrv_mirror_top_pdiscard(BlockDriverState *bs, - int64_t offset, int bytes) + int64_t offset, int64_t bytes) { return bdrv_mirror_top_do_write(bs, MIRROR_METHOD_DISCARD, offset, bytes, NULL, 0); diff --git a/block/nbd.c b/block/nbd.c index 0e52b76d72..93d0ced28c 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1295,7 +1295,7 @@ static int nbd_client_co_flush(BlockDriverState *bs) } static int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, - int bytes) + int64_t bytes) { BDRVNBDState *s = (BDRVNBDState *)bs->opaque; NBDRequest request = { @@ -1304,6 +1304,8 @@ static int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, .len = bytes, }; + assert(bytes < INT_MAX); + assert(!(s->info.flags & NBD_FLAG_READ_ONLY)); if (!(s->info.flags & NBD_FLAG_SEND_TRIM) || !bytes) { return 0; diff --git a/block/nvme.c b/block/nvme.c index 724f894b00..adc19ee9e6 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -1166,9 +1166,9 @@ static coroutine_fn int nvme_co_pwrite_zeroes(BlockDriverState *bs, return nvme_co_pwrite_zeroes_old(bs, offset, bytes, flags); } -static int coroutine_fn nvme_co_pdiscard(BlockDriverState *bs, - int64_t offset, - int bytes) +static int coroutine_fn nvme_co_pdiscard_old(BlockDriverState *bs, + int64_t offset, + int bytes) { BDRVNVMeState *s = bs->opaque; NVMeQueuePair *ioq = s->queues[1]; @@ -1245,6 +1245,13 @@ out: } +static int coroutine_fn nvme_co_pdiscard(BlockDriverState *bs, + int64_t offset, + int64_t bytes) +{ + assert(bytes <= INT_MAX); + return nvme_co_pdiscard_old(bs, offset, bytes); +} static int nvme_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, Error **errp) diff --git a/block/qcow2.c b/block/qcow2.c index 0800d0378a..c85f5a8331 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3787,7 +3787,7 @@ static coroutine_fn int qcow2_co_pwrite_zeroes(BlockDriverState *bs, } static coroutine_fn int qcow2_co_pdiscard(BlockDriverState *bs, - int64_t offset, int bytes) + int64_t offset, int64_t bytes) { int ret; BDRVQcow2State *s = bs->opaque; diff --git a/block/raw-format.c b/block/raw-format.c index 0996741056..f31bc4338f 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -292,7 +292,7 @@ static int coroutine_fn raw_co_pwrite_zeroes(BlockDriverState *bs, } static int coroutine_fn raw_co_pdiscard(BlockDriverState *bs, - int64_t offset, int bytes) + int64_t offset, int64_t bytes) { int ret; diff --git a/block/sheepdog.c b/block/sheepdog.c index 59f7ebb171..750bfae016 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -3091,8 +3091,8 @@ static int sd_load_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, } -static coroutine_fn int sd_co_pdiscard(BlockDriverState *bs, int64_t offset, - int bytes) +static coroutine_fn int sd_co_pdiscard_old(BlockDriverState *bs, int64_t offset, + int bytes) { SheepdogAIOCB acb; BDRVSheepdogState *s = bs->opaque; @@ -3121,6 +3121,13 @@ static coroutine_fn int sd_co_pdiscard(BlockDriverState *bs, int64_t offset, return acb.ret; } +static coroutine_fn int sd_co_pdiscard(BlockDriverState *bs, int64_t offset, + int64_t bytes) +{ + assert(bytes <= INT_MAX); + return sd_co_pdiscard_old(bs, offset, bytes); +} + static coroutine_fn int sd_co_block_status(BlockDriverState *bs, bool want_zero, int64_t offset, int64_t bytes, int64_t *pnum, int64_t *map, diff --git a/block/throttle.c b/block/throttle.c index c97da1d6a7..61f6c291e7 100644 --- a/block/throttle.c +++ b/block/throttle.c @@ -147,7 +147,7 @@ static int coroutine_fn throttle_co_pwrite_zeroes(BlockDriverState *bs, } static int coroutine_fn throttle_co_pdiscard(BlockDriverState *bs, - int64_t offset, int bytes) + int64_t offset, int64_t bytes) { ThrottleGroupMember *tgm = bs->opaque; throttle_group_co_io_limits_intercept(tgm, bytes, true); -- 2.21.0