block: Reject misaligned write requests with BDRV_REQ_NO_FALLBACK
PATCH v2 1/1 block: Reject misaligned write requests with BDRV_REQ_NO_FALLBACK
The BDRV_REQ_NO_FALLBACK flag means that an operation should only be performed if it can be offloaded or otherwise performed efficiently.
However a misaligned write request requires a RMW so we should return an error and let the caller decide how to proceed.
This hits an assertion since commit c8bb23cbdb if the required alignment is larger than the cluster size:
qemu-img create -f qcow2 -o cluster_size=2k img.qcow2 4G
qemu-io -c "open -o driver=qcow2,file.align=4k blkdebug::img.qcow2" \
-c 'write 0 512'qemu-io: block/io.c:1127: bdrv_driver_pwritev: Assertion `!(flags & BDRV_REQ_NO_FALLBACK)' failed. Aborted
The reason is that when writing to an unallocated cluster we try to skip the copy-on-write part and zeroize it using BDRV_REQ_NO_FALLBACK instead, resulting in a write request that is too small (2KB cluster size vs 4KB required alignment).
---
v2:
- Use QEMU_IS_ALIGNED and (offset | bytes) [Nir]
- Fix typo in comment in iotest
- Expand commit message
v1:
- Initial version
block/io.c | 6 +++++ tests/qemu-iotests/268 | 55 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/268.out | 7 +++++ tests/qemu-iotests/group | 1 + 4 files changed, 69 insertions(+) create mode 100755 tests/qemu-iotests/268 create mode 100644 tests/qemu-iotests/268.out
block/io.c +6 -0
@@ -2071,6 +2071,12 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,return ret; } +/* If the request is misaligned then we can't make it efficient */ +if (!QEMU_IS_ALIGNED (offset | bytes, align) && + (flags &BDRV_REQ_NO_FALLBACK )) { +return -ENOTSUP ; + } +bdrv_inc_in_flight (bs);/* * Align write if necessary by performing a read-modify-write cycle.
tests/qemu-iotests/268 new file +55 -0
55 lines not on this page · raw message
tests/qemu-iotests/268.out new file +7 -0
@@ -0,0 +1,7 @@ +QA output created by 268 + +== Required alignment larger than cluster size == +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 +wrote 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +*** done
tests/qemu-iotests/group +1 -0
@@ -278,3 +278,4 @@ 265 rw auto quick 266 rw quick 267 rw auto quick snapshot +268 rw auto quick
Signature · 1 line
2.20.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#! /bin/bash
export ARCH=x86_64
make docker-image-fedora V=1 NETWORK=1
time make docker-test-mingw@fedora J=14 NETWORK=1
=== TEST SCRIPT END ===
CC block/qed-table.o CC block/qed-cluster.o CC block/qed-check.o
make: *** [Makefile:994: docs/interop/index.html] Error 2
make: *** Waiting for unfinished jobs....
CC block/vhdx.o
Traceback (most recent call last):
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=5e3c9ceb0d0e48f1b7fdaee32bfbd2c2', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-t_sgxpzt/src/docker-src.2019-10-14-04.39.53.16659:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-mingw']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=5e3c9ceb0d0e48f1b7fdaee32bfbd2c2
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-t_sgxpzt/src'
make: *** [docker-run-test-mingw@fedora] Error 2
real 1m53.697s
user 0m7.411s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Kevin Wolf
AppliedAm 14.10.2019 um 10:15 hat Alberto Garcia geschrieben:
Quoted 15 lines
The
BDRV_REQ_NO_FALLBACKflag means that an operation should only be performed if it can be offloaded or otherwise performed efficiently.However a misaligned write request requires a RMW so we should return an error and let the caller decide how to proceed.
This hits an assertion since commit
c8bb23cbdbif the required alignment is larger than the cluster size:qemu-img create -f qcow2 -o cluster_size=2k img.qcow2 4G
qemu-io -c "open -o driver=qcow2,file.align=4k blkdebug::img.qcow2" \ -c 'write 0 512'qemu-io:
block/io.c:1127:bdrv_driver_pwritev: Assertion `!(flags &BDRV_REQ_NO_FALLBACK)' failed. Aborted
Quoted 6 lines
The reason is that when writing to an unallocated cluster we try to skip the copy-on-write part and zeroize it using
BDRV_REQ_NO_FALLBACKinstead, resulting in a write request that is too small (2KB cluster size vs 4KB required alignment).Signed-off-by Alberto Garcia <[email protected]>
Thanks, applied to the block branch.
Kevin
Quoted 3 lines · Kevin Wolf
Quoted 1 line
Signed-off-by Alberto Garcia <[email protected]>Thanks, applied to the block branch.
I'm a bit late now, but a possible trivial optimization is to flip the conditions, because checking the flag should be faster than checking the alignment and it's going to be false in almost all cases:
if ((flags & BDRV_REQ_NO_FALLBACK) &&
!QEMU_IS_ALIGNED(offset | bytes, align)) {
return -ENOTSUP;
}Feel free to edit the commit if you want.
Berto
Am 14.10.2019 um 13:22 hat Alberto Garcia geschrieben:
Quoted 9 lines · Kevin Wolf
Quoted 3 lines
Quoted 1 line
Signed-off-by Alberto Garcia <[email protected]>Thanks, applied to the block branch.
I'm a bit late now, but a possible trivial optimization is to flip the conditions, because checking the flag should be faster than checking the alignment and it's going to be false in almost all cases:
Quoted 6 lines
if ((flags & BDRV_REQ_NO_FALLBACK) && !QEMU_IS_ALIGNED(offset | bytes, align)) { return -ENOTSUP; }Feel free to edit the commit if you want.
Ok, I'll update it.
Kevin