Skip to content

Commit a5215b8

Browse files
Vladimir Sementsov-Ogievskiyebblake
Vladimir Sementsov-Ogievskiy
authored and
ebblake
committed
block/io: use int64_t bytes in copy_range
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 now copy_range parameters which are already 64bit to signed type. It's safe as we don't work with requests overflowing BDRV_MAX_LENGTH (which is less than INT64_MAX), and do check the requests in bdrv_co_copy_range_internal() (by bdrv_check_request32(), which calls bdrv_check_request()). Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]> Message-Id: <[email protected]> Reviewed-by: Eric Blake <[email protected]> Signed-off-by: Eric Blake <[email protected]>
1 parent e9e52ef commit a5215b8

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎block/io.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3201,8 +3201,8 @@ void bdrv_unregister_buf(BlockDriverState *bs, void *host)
32013201
}
32023202

32033203
static int coroutine_fn bdrv_co_copy_range_internal(
3204-
BdrvChild *src, uint64_t src_offset, BdrvChild *dst,
3205-
uint64_t dst_offset, uint64_t bytes,
3204+
BdrvChild *src, int64_t src_offset, BdrvChild *dst,
3205+
int64_t dst_offset, int64_t bytes,
32063206
BdrvRequestFlags read_flags, BdrvRequestFlags write_flags,
32073207
bool recurse_src)
32083208
{
@@ -3280,9 +3280,9 @@ static int coroutine_fn bdrv_co_copy_range_internal(
32803280
*
32813281
* See the comment of bdrv_co_copy_range for the parameter and return value
32823282
* semantics. */
3283-
int coroutine_fn bdrv_co_copy_range_from(BdrvChild *src, uint64_t src_offset,
3284-
BdrvChild *dst, uint64_t dst_offset,
3285-
uint64_t bytes,
3283+
int coroutine_fn bdrv_co_copy_range_from(BdrvChild *src, int64_t src_offset,
3284+
BdrvChild *dst, int64_t dst_offset,
3285+
int64_t bytes,
32863286
BdrvRequestFlags read_flags,
32873287
BdrvRequestFlags write_flags)
32883288
{
@@ -3296,9 +3296,9 @@ int coroutine_fn bdrv_co_copy_range_from(BdrvChild *src, uint64_t src_offset,
32963296
*
32973297
* See the comment of bdrv_co_copy_range for the parameter and return value
32983298
* semantics. */
3299-
int coroutine_fn bdrv_co_copy_range_to(BdrvChild *src, uint64_t src_offset,
3300-
BdrvChild *dst, uint64_t dst_offset,
3301-
uint64_t bytes,
3299+
int coroutine_fn bdrv_co_copy_range_to(BdrvChild *src, int64_t src_offset,
3300+
BdrvChild *dst, int64_t dst_offset,
3301+
int64_t bytes,
33023302
BdrvRequestFlags read_flags,
33033303
BdrvRequestFlags write_flags)
33043304
{
@@ -3308,9 +3308,9 @@ int coroutine_fn bdrv_co_copy_range_to(BdrvChild *src, uint64_t src_offset,
33083308
bytes, read_flags, write_flags, false);
33093309
}
33103310

3311-
int coroutine_fn bdrv_co_copy_range(BdrvChild *src, uint64_t src_offset,
3312-
BdrvChild *dst, uint64_t dst_offset,
3313-
uint64_t bytes, BdrvRequestFlags read_flags,
3311+
int coroutine_fn bdrv_co_copy_range(BdrvChild *src, int64_t src_offset,
3312+
BdrvChild *dst, int64_t dst_offset,
3313+
int64_t bytes, BdrvRequestFlags read_flags,
33143314
BdrvRequestFlags write_flags)
33153315
{
33163316
return bdrv_co_copy_range_from(src, src_offset,

‎block/trace-events‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ bdrv_co_preadv_part(void *bs, int64_t offset, int64_t bytes, unsigned int flags)
1515
bdrv_co_pwritev_part(void *bs, int64_t offset, int64_t bytes, unsigned int flags) "bs %p offset %" PRId64 " bytes %" PRId64 " flags 0x%x"
1616
bdrv_co_pwrite_zeroes(void *bs, int64_t offset, int64_t bytes, int flags) "bs %p offset %" PRId64 " bytes %" PRId64 " flags 0x%x"
1717
bdrv_co_do_copy_on_readv(void *bs, int64_t offset, int64_t bytes, int64_t cluster_offset, int64_t cluster_bytes) "bs %p offset %" PRId64 " bytes %" PRId64 " cluster_offset %" PRId64 " cluster_bytes %" PRId64
18-
bdrv_co_copy_range_from(void *src, uint64_t src_offset, void *dst, uint64_t dst_offset, uint64_t bytes, int read_flags, int write_flags) "src %p offset %"PRIu64" dst %p offset %"PRIu64" bytes %"PRIu64" rw flags 0x%x 0x%x"
19-
bdrv_co_copy_range_to(void *src, uint64_t src_offset, void *dst, uint64_t dst_offset, uint64_t bytes, int read_flags, int write_flags) "src %p offset %"PRIu64" dst %p offset %"PRIu64" bytes %"PRIu64" rw flags 0x%x 0x%x"
18+
bdrv_co_copy_range_from(void *src, int64_t src_offset, void *dst, int64_t dst_offset, int64_t bytes, int read_flags, int write_flags) "src %p offset %" PRId64 " dst %p offset %" PRId64 " bytes %" PRId64 " rw flags 0x%x 0x%x"
19+
bdrv_co_copy_range_to(void *src, int64_t src_offset, void *dst, int64_t dst_offset, int64_t bytes, int read_flags, int write_flags) "src %p offset %" PRId64 " dst %p offset %" PRId64 " bytes %" PRId64 " rw flags 0x%x 0x%x"
2020

2121
# stream.c
2222
stream_one_iteration(void *s, int64_t offset, uint64_t bytes, int is_allocated) "s %p offset %" PRId64 " bytes %" PRIu64 " is_allocated %d"

‎include/block/block.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -845,8 +845,8 @@ void bdrv_unregister_buf(BlockDriverState *bs, void *host);
845845
*
846846
* Returns: 0 if succeeded; negative error code if failed.
847847
**/
848-
int coroutine_fn bdrv_co_copy_range(BdrvChild *src, uint64_t src_offset,
849-
BdrvChild *dst, uint64_t dst_offset,
850-
uint64_t bytes, BdrvRequestFlags read_flags,
848+
int coroutine_fn bdrv_co_copy_range(BdrvChild *src, int64_t src_offset,
849+
BdrvChild *dst, int64_t dst_offset,
850+
int64_t bytes, BdrvRequestFlags read_flags,
851851
BdrvRequestFlags write_flags);
852852
#endif

‎include/block/block_int.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,14 +1357,14 @@ void bdrv_dec_in_flight(BlockDriverState *bs);
13571357

13581358
void blockdev_close_all_bdrv_states(void);
13591359

1360-
int coroutine_fn bdrv_co_copy_range_from(BdrvChild *src, uint64_t src_offset,
1361-
BdrvChild *dst, uint64_t dst_offset,
1362-
uint64_t bytes,
1360+
int coroutine_fn bdrv_co_copy_range_from(BdrvChild *src, int64_t src_offset,
1361+
BdrvChild *dst, int64_t dst_offset,
1362+
int64_t bytes,
13631363
BdrvRequestFlags read_flags,
13641364
BdrvRequestFlags write_flags);
1365-
int coroutine_fn bdrv_co_copy_range_to(BdrvChild *src, uint64_t src_offset,
1366-
BdrvChild *dst, uint64_t dst_offset,
1367-
uint64_t bytes,
1365+
int coroutine_fn bdrv_co_copy_range_to(BdrvChild *src, int64_t src_offset,
1366+
BdrvChild *dst, int64_t dst_offset,
1367+
int64_t bytes,
13681368
BdrvRequestFlags read_flags,
13691369
BdrvRequestFlags write_flags);
13701370

0 commit comments

Comments
 (0)