block: qiov_offset parameter for io
cover block: qiov_offset parameter for io
Hi all!
Here is idea of adding qiov_offset parameter to io path, to avoid a lot of places with same pattern of creating local_qiov or hd_qiov variables. Here is only read path for qcow2, if we like it, I'll make v2 with both read and write paths for qcow2.
Vladimir Sementsov-Ogievskiy (3):
block/io: introduce bdrv_co_preadv_part block/qcow2: refactor qcow2_co_preadv to use buffer-based io block/qcow2: implement .bdrv_co_preadv_part
include/block/block_int.h | 6 +++ block/io.c | 87 ++++++++++++++++++++++++++------------- block/qcow2.c | 67 +++++++++++++++--------------- 3 files changed, 97 insertions(+), 63 deletions(-)
Signature · 1 line
2.18.0
RFC PATCH 1/3 block/io: introduce bdrv_co_preadv_part
Introduce extended variant of bdrv_co_preadv with qiov_offset parameter, to finally get rid of (most of) local_qiov workarounds.
--- include/block/block_int.h | 6 +++ block/io.c | 87 ++++++++++++++++++++++++++------------- 2 files changed, 64 insertions(+), 29 deletions(-)
include/block/block_int.h +6 -0
@@ -211,6 +211,9 @@ struct BlockDriver {*/ int coroutine_fn (*bdrv_co_preadv)(BlockDriverState *bs,uint64_t offset,uint64_t bytes,QEMUIOVector *qiov,int flags); + int coroutine_fn (*bdrv_co_preadv_part)(BlockDriverState *bs, +uint64_t offset,uint64_t bytes, +QEMUIOVector *qiov,size_t qiov_offset,int flags); int coroutine_fn (*bdrv_co_writev)(BlockDriverState *bs,int64_t sector_num,int nb_sectors,QEMUIOVector *qiov,int flags);/**
@@ -921,6 +924,9 @@ extern BlockDriver bdrv_qcow2; int coroutine_fn bdrv_co_preadv(BdrvChild *child,int64_t offset,unsigned int bytes,QEMUIOVector *qiov,BdrvRequestFlags flags); +int coroutine_fn bdrv_co_preadv_part(BdrvChild *child, +int64_t offset,unsigned int bytes, +QEMUIOVector *qiov,size_t qiov_offset,BdrvRequestFlags flags); int coroutine_fn bdrv_co_pwritev(BdrvChild *child,int64_t offset,unsigned int bytes,QEMUIOVector *qiov,BdrvRequestFlags flags);
block/io.c +58 -29
216 lines not on this page · raw message
Signature · 1 line
2.18.0
RFC PATCH 2/3 block/qcow2: refactor qcow2_co_preadv to use buffer-based io
In reply to Vladimir Sementsov-OgievskiyUse buffer based io in encrypted case.
--- block/qcow2.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
block/qcow2.c +16 -12
@@ -2047,19 +2047,15 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, }assert (cur_bytes <=QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size); -qemu_iovec_reset (&hd_qiov); -qemu_iovec_add (&hd_qiov, cluster_data, cur_bytes); - } -BLKDBG_EVENT (bs->file,BLKDBG_READ_AIO ); - ret =bdrv_co_preadv (s->data_file, - cluster_offset + offset_in_cluster, - cur_bytes, &hd_qiov,0 ); -if (ret <0 ) { - goto fail; - } -if (bs->encrypted) { -assert (s->crypto); +BLKDBG_EVENT (bs->file,BLKDBG_READ_AIO ); + ret =bdrv_co_pread (s->data_file, + cluster_offset + offset_in_cluster, + cur_bytes, cluster_data,0 ); +if (ret <0 ) { + goto fail; + } +assert ((offset & (BDRV_SECTOR_SIZE -1 )) ==0 );assert ((cur_bytes & (BDRV_SECTOR_SIZE -1 )) ==0 ); if (qcow2_co_decrypt(bs, cluster_offset, offset,
@@ -2068,6 +2064,14 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, goto fail; }qemu_iovec_from_buf (qiov, bytes_done, cluster_data, cur_bytes); + }else { +BLKDBG_EVENT (bs->file,BLKDBG_READ_AIO ); + ret =bdrv_co_preadv (s->data_file, + cluster_offset + offset_in_cluster, + cur_bytes, &hd_qiov,0 ); +if (ret <0 ) { + goto fail; + } }break ;
Signature · 1 line
2.18.0
Quoted 7 lines · Vladimir Sementsov-Ogievskiy
Hi all!
Here is idea of adding
qiov_offsetparameter to io path, to avoid a lot of places with same pattern of creatinglocal_qiovorhd_qiovvariables. Here is only read path for qcow2, if we like it, I'll make v2 with both read and write paths for qcow2.
Based on Max's block tree
Based-on: https://github.com/XanClic/qemu block
Signature · 2 lines
Best regards, Vladimir
RFC PATCH 3/3 block/qcow2: implement .bdrv_co_preadv_part
In reply to Vladimir Sementsov-OgievskiyImplement and use new interface to get rid of hd_qiov.
--- block/qcow2.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-)
block/qcow2.c +20 -25
@@ -75,7 +75,8 @@ qcow2_co_preadv_compressed(BlockDriverState *bs,uint64_t file_cluster_offset, uint64_t offset, uint64_t bytes, - QEMUIOVector *qiov); + QEMUIOVector *qiov, + size_t qiov_offset);static int qcow2_probe (const uint8_t *buf,int buf_size,const char *filename) {
@@ -1955,21 +1956,18 @@ out:return ret; } -static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, -uint64_t bytes,QEMUIOVector *qiov, -int flags) +static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs, +uint64_t offset,uint64_t bytes, +QEMUIOVector *qiov, +size_t qiov_offset,int flags) {BDRVQcow2State *s = bs->opaque;int offset_in_cluster;int ret;unsigned int cur_bytes;/* number of bytes in current iteration */ uint64_t cluster_offset =0 ; -uint64_t bytes_done =0 ; -QEMUIOVector hd_qiov;uint8_t *cluster_data =NULL ; -qemu_iovec_init (&hd_qiov, qiov->niov); -while (bytes !=0 ) {/* prepare next request */
@@ -1988,34 +1986,31 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, offset_in_cluster =offset_into_cluster (s, offset); -qemu_iovec_reset (&hd_qiov); -qemu_iovec_concat (&hd_qiov, qiov, bytes_done, cur_bytes); -switch (ret) {case QCOW2_CLUSTER_UNALLOCATED :if (bs->backing) {BLKDBG_EVENT (bs->file,BLKDBG_READ_BACKING_AIO ); - ret =bdrv_co_preadv (bs->backing, offset, cur_bytes, - &hd_qiov,0 ); + ret =bdrv_co_preadv_part (bs->backing, offset, cur_bytes, + qiov, qiov_offset,0 );if (ret <0 ) { goto fail; } }else {/* Note: in this case, no need to wait */ -qemu_iovec_memset (&hd_qiov,0 ,0 , cur_bytes); +qemu_iovec_memset (qiov, qiov_offset,0 , cur_bytes); }break ;case QCOW2_CLUSTER_ZERO_PLAIN :case QCOW2_CLUSTER_ZERO_ALLOC : -qemu_iovec_memset (&hd_qiov,0 ,0 , cur_bytes); +qemu_iovec_memset (qiov, qiov_offset,0 , cur_bytes);break ;case QCOW2_CLUSTER_COMPRESSED : ret =qcow2_co_preadv_compressed (bs, cluster_offset, offset, cur_bytes, - &hd_qiov); + qiov, qiov_offset);if (ret <0 ) { goto fail; }
@@ -2063,12 +2058,12 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, ret = -EIO ; goto fail; } -qemu_iovec_from_buf (qiov, bytes_done, cluster_data, cur_bytes); +qemu_iovec_from_buf (qiov, qiov_offset, cluster_data, cur_bytes); }else {BLKDBG_EVENT (bs->file,BLKDBG_READ_AIO ); - ret =bdrv_co_preadv (s->data_file, - cluster_offset + offset_in_cluster, - cur_bytes, &hd_qiov,0 ); + ret =bdrv_co_preadv_part (s->data_file, + cluster_offset + offset_in_cluster, + cur_bytes, qiov, qiov_offset,0 );if (ret <0 ) { goto fail; }
@@ -2083,12 +2078,11 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverState *bs, uint64_t offset, bytes -= cur_bytes; offset += cur_bytes; - bytes_done += cur_bytes; + qiov_offset += cur_bytes; } ret =0 ; fail: -qemu_iovec_destroy (&hd_qiov);qemu_vfree (cluster_data);return ret;
@@ -4002,7 +3996,8 @@ qcow2_co_preadv_compressed(BlockDriverState *bs,uint64_t file_cluster_offset, uint64_t offset, uint64_t bytes, - QEMUIOVector *qiov) + QEMUIOVector *qiov, + size_t qiov_offset) { BDRVQcow2State *s = bs->opaque;int ret =0 , csize, nb_csectors;
@@ -4032,7 +4027,7 @@ qcow2_co_preadv_compressed(BlockDriverState *bs, goto fail; } -qemu_iovec_from_buf (qiov,0 , out_buf + offset_in_cluster, bytes); +qemu_iovec_from_buf (qiov, qiov_offset, out_buf + offset_in_cluster, bytes); fail:qemu_vfree (out_buf);
@@ -5093,7 +5088,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_co_block_status = qcow2_co_block_status, - .bdrv_co_preadv = qcow2_co_preadv, + .bdrv_co_preadv_part = qcow2_co_preadv_part, .bdrv_co_pwritev = qcow2_co_pwritev, .bdrv_co_flush_to_os = qcow2_co_flush_to_os,
Signature · 1 line
2.18.0
Quoted 12 lines · Vladimir Sementsov-Ogievskiy
Hi all!
Here is idea of adding
qiov_offsetparameter to io path, to avoid a lot of places with same pattern of creatinglocal_qiovorhd_qiovvariables. Here is only read path for qcow2, if we like it, I'll make v2 with both read and write paths for qcow2.Vladimir Sementsov-Ogievskiy (3):
block/io: introducebdrv_co_preadv_partblock/qcow2: refactorqcow2_co_preadvto use buffer-based io block/qcow2: implement .bdrv_co_preadv_part
Quoted 4 lines
include/block/block_int.h | 6 +++ block/io.c | 87 ++++++++++++++++++++++++++------------- block/qcow2.c | 67 +++++++++++++++--------------- 3 files changed, 97 insertions(+), 63 deletions(-)
I like it!
Stefan