qemu direct io alignment fix
Subsystems (2)
v3 cover qemu direct io alignment fix
From: Keith Busch <[email protected]>
Changes from v2:
Split the patch so that the function move is separate from the functional change. This makes it immediately obvious what criteria is changing. (Kevin Wolf)
Added received Tested-by tag in the changelog.
Keith Busch (2):
block: move bdrv_qiov_is_aligned to file-posix
block: use the request length for iov alignment
block/file-posix.c | 22 ++++++++++++++++++++++ block/io.c | 21 --------------------- include/block/block-io.h | 1 - 3 files changed, 22 insertions(+), 22 deletions(-)
Signature · 1 line
2.30.2
PATCH v3 1/2 block: move bdrv_qiov_is_aligned to file-posix
From: Keith Busch <[email protected]>
There is only user of bdrv_qiov_is_aligned(), so move the alignment function to there and make it static.
--- block/file-posix.c | 21 +++++++++++++++++++++ block/io.c | 21 --------------------- include/block/block-io.h | 1 - 3 files changed, 21 insertions(+), 22 deletions(-)
block/file-posix.c +21 -0
@@ -2061,6 +2061,27 @@ static int coroutine_fn raw_thread_pool_submit(BlockDriverState *bs,return thread_pool_submit_co (pool, func, arg); } +/* +* Check if all memory in this vector is sector aligned. +*/ +static bool bdrv_qiov_is_aligned (BlockDriverState *bs,QEMUIOVector *qiov) +{ +int i; +size_t alignment =bdrv_min_mem_align (bs); +IO_CODE (); + +for (i =0 ; i < qiov->niov; i++) { +if ((uintptr_t ) qiov->iov[i].iov_base % alignment) { +return false; + } +if (qiov->iov[i].iov_len % alignment) { +return false; + } + } + +return true; +} + static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset,uint64_t bytes,QEMUIOVector *qiov,int type) {
block/io.c +0 -21
@@ -3236,27 +3236,6 @@ void *qemu_try_blockalign0(BlockDriverState *bs, size_t size)return mem; } -/* -* Check if all memory in this vector is sector aligned. -*/ -bool bdrv_qiov_is_aligned (BlockDriverState *bs,QEMUIOVector *qiov) -{ -int i; -size_t alignment =bdrv_min_mem_align (bs); -IO_CODE (); - -for (i =0 ; i < qiov->niov; i++) { -if ((uintptr_t ) qiov->iov[i].iov_base % alignment) { -return false; - } -if (qiov->iov[i].iov_len % alignment) { -return false; - } - } - -return true; -} -void bdrv_io_plug (BlockDriverState *bs) {BdrvChild *child;
include/block/block-io.h +0 -1
@@ -150,7 +150,6 @@ void *qemu_blockalign(BlockDriverState *bs, size_t size);void *qemu_blockalign0 (BlockDriverState *bs,size_t size);void *qemu_try_blockalign (BlockDriverState *bs,size_t size);void *qemu_try_blockalign0 (BlockDriverState *bs,size_t size); -bool bdrv_qiov_is_aligned (BlockDriverState *bs,QEMUIOVector *qiov);void bdrv_enable_copy_on_read (BlockDriverState *bs);void bdrv_disable_copy_on_read (BlockDriverState *bs);
Signature · 1 line
2.30.2
PATCH v3 2/2 block: use the request length for iov alignment
In reply to Keith BuschFrom: Keith Busch <[email protected]>
An iov length needs to be aligned to the logical block size, which may be larger than the memory alignment.
--- block/file-posix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/file-posix.c +2 -1
@@ -2068,13 +2068,14 @@ static bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov) {int i;size_t alignment =bdrv_min_mem_align (bs); +size_t len = bs->bl.request_alignment;IO_CODE ();for (i =0 ; i < qiov->niov; i++) {if ((uintptr_t ) qiov->iov[i].iov_base % alignment) {return false; } -if (qiov->iov[i].iov_len % alignment) { +if (qiov->iov[i].iov_len % len) {return false; } }
Signature · 1 line
2.30.2
Kevin Wolf
AppliedAm 29.09.2022 um 22:05 hat Keith Busch geschrieben:
Quoted 8 lines
From: Keith Busch <[email protected]>
Changes from v2:
Split the patch so that the function move is separate from the functional change. This makes it immediately obvious what criteria is changing. (Kevin Wolf)
Quoted 5 lines
Added received Tested-by tag in the changelog.
Keith Busch (2):
block: movebdrv_qiov_is_alignedto file-posix
block: use the request length for iov alignment
Thanks, applied to the block branch.
Kevin