Consider discard option when writing zeros
v3 cover Consider discard option when writing zeros
Punch holes only when the image is opened with discard=on or discard=unmap.
Tested by:
- new write-zeroes-unmap iotest on xfs, ext4, and tmpfs
- tests/qemu-iotests/check -raw
- tests/qemu-iotests/check -qcow2
Changes since v2
- Add write-zeroes-unmap iotest
- Fix iotest missing discard=unmap
v2 was here:
https://lists.nongnu.org/archive/html/qemu-block/2024-06/msg00231.html
Nir Soffer (2):
qemu-iotest/245: Add missing discard=unmap
Consider discard option when writing zeros
block/io.c | 9 +- tests/qemu-iotests/245 | 2 +- tests/qemu-iotests/tests/write-zeroes-unmap | 127 ++++++++++++++++++ .../qemu-iotests/tests/write-zeroes-unmap.out | 81 +++++++++++ 4 files changed, 214 insertions(+), 5 deletions(-) create mode 100755 tests/qemu-iotests/tests/write-zeroes-unmap create mode 100644 tests/qemu-iotests/tests/write-zeroes-unmap.out
Signature · 1 line
2.45.2
PATCH v3 1/2 qemu-iotest/245: Add missing discard=unmap
The test works since we punch holes by default even when opening the image without discard=on or discard=unmap. Fix the test to enable discard.
--- tests/qemu-iotests/245 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qemu-iotests/245 +1 -1
@@ -590,11 +590,11 @@ class TestBlockdevReopen(iotests.QMPTestCase): # Insert (and remove) a compress filter @iotests.skip_if_unsupported(['compress']) def test_insert_compress_filter(self): # Add an image to the VM: hd (raw) -> hd0 (qcow2) -> hd0-file (file) - opts = {'driver': 'raw', 'node-name': 'hd', 'file': hd_opts(0)} + opts = {'driver': 'raw', 'node-name': 'hd', 'file': hd_opts(0), 'discard': 'unmap'} self.vm.cmd('blockdev-add', conv_keys = False, **opts) # Add a 'compress' filter filter_opts = {'driver': 'compress', 'node-name': 'compress0',
Signature · 1 line
2.45.2
Re: [PATCH v3 1/2] qemu-iotest/245: Add missing discard=unmap
Quoted 6 lines · Nir Soffer
The test works since we punch holes by default even when opening the image without discard=on or discard=unmap. Fix the test to enable discard.
--- tests/qemu-iotests/245 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v3 2/2 Consider discard option when writing zeros
In reply to Nir SofferWhen opening an image with discard=off, we punch hole in the image when writing zeroes, making the image sparse. This breaks users that want to ensure that writes cannot fail with ENOSPACE by using fully allocated images[1].
bdrv_co_pwrite_zeroes() correctly disables BDRV_REQ_MAY_UNMAP if we opened the child without discard=unmap or discard=on. But we don't go through this function when accessing the top node. Move the check down to bdrv_co_do_pwrite_zeroes() which seems to be used in all code paths.
This change implements the documented behavior, punching holes only when opening the image with discard=on or discard=unmap. This may not be the best default but can improve it later.
The test depends on a file system supporting discard, deallocating the entire file when punching hole with the length of the entire file. Tested with xfs, ext4, and tmpfs.
[1] https://lists.nongnu.org/archive/html/qemu-discuss/2024-06/msg00003.html
--- block/io.c | 9 +- tests/qemu-iotests/tests/write-zeroes-unmap | 127 ++++++++++++++++++ .../qemu-iotests/tests/write-zeroes-unmap.out | 81 +++++++++++ 3 files changed, 213 insertions(+), 4 deletions(-) create mode 100755 tests/qemu-iotests/tests/write-zeroes-unmap create mode 100644 tests/qemu-iotests/tests/write-zeroes-unmap.out
block/io.c +5 -4
@@ -1860,10 +1860,15 @@ bdrv_co_do_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int64_t bytes,/* By definition there is no user buffer so this flag doesn't make sense */ if (flags &BDRV_REQ_REGISTERED_BUF ) {return -EINVAL ; } +/* If opened with discard=off we should never unmap. */ +if (!(bs->open_flags &BDRV_O_UNMAP )) { + flags &= ~BDRV_REQ_MAY_UNMAP ; + } +/* Invalidate the cached block-status data range if this write overlaps */ bdrv_bsc_invalidate_range (bs, offset, bytes);assert (alignment % bs->bl.request_alignment ==0 ); head = offset % alignment;
@@ -2313,14 +2318,10 @@ int coroutine_fn bdrv_co_pwrite_zeroes(BdrvChild *child, int64_t offset, {IO_CODE ();trace_bdrv_co_pwrite_zeroes (child->bs, offset, bytes, flags);assert_bdrv_graph_readable (); -if (!(child->bs->open_flags &BDRV_O_UNMAP )) { - flags &= ~BDRV_REQ_MAY_UNMAP ; - } -return bdrv_co_pwritev (child, offset, bytes,NULL ,BDRV_REQ_ZERO_WRITE | flags); }/*
tests/qemu-iotests/tests/write-zeroes-unmap new file +127 -0
127 lines not on this page · raw message
tests/qemu-iotests/tests/write-zeroes-unmap.out new file +81 -0
81 lines not on this page · raw message
Signature · 1 line
2.45.2
Quoted 20 lines · Nir Soffer
When opening an image with discard=off, we punch hole in the image when writing zeroes, making the image sparse. This breaks users that want to ensure that writes cannot fail with ENOSPACE by using fully allocated images[1].
bdrv_co_pwrite_zeroes()correctly disablesBDRV_REQ_MAY_UNMAPif we opened the child without discard=unmap or discard=on. But we don't go through this function when accessing the top node. Move the check down tobdrv_co_do_pwrite_zeroes()which seems to be used in all code paths.This change implements the documented behavior, punching holes only when opening the image with discard=on or discard=unmap. This may not be the best default but can improve it later.
The test depends on a file system supporting discard, deallocating the entire file when punching hole with the length of the entire file. Tested with xfs, ext4, and tmpfs.
[1] https://lists.nongnu.org/archive/html/qemu-discuss/2024-06/msg00003.html
Quoted 8 lines
Signed-off-by Nir Soffer <[email protected]>--- block/io.c | 9 +- tests/qemu-iotests/tests/write-zeroes-unmap | 127 ++++++++++++++++++ .../qemu-iotests/tests/write-zeroes-unmap.out | 81 +++++++++++ 3 files changed, 213 insertions(+), 4 deletions(-) create mode 100755 tests/qemu-iotests/tests/write-zeroes-unmap create mode 100644 tests/qemu-iotests/tests/write-zeroes-unmap.out
Stefan Hajnoczi
AppliedQuoted 18 lines · Nir Soffer
Punch holes only when the image is opened with discard=on or discard=unmap.
Tested by:
- new write-zeroes-unmap iotest on xfs, ext4, and tmpfs
- tests/qemu-iotests/check -raw
- tests/qemu-iotests/check -qcow2Changes since v2
- Add write-zeroes-unmap iotest
- Fix iotest missing discard=unmapv2 was here:
https://lists.nongnu.org/archive/html/qemu-block/2024-06/msg00231.htmlNir Soffer (2):
qemu-iotest/245: Add missing discard=unmap
Consider discard option when writing zeros
Quoted 11 lines
block/io.c | 9 +- tests/qemu-iotests/245 | 2 +- tests/qemu-iotests/tests/write-zeroes-unmap | 127 ++++++++++++++++++ .../qemu-iotests/tests/write-zeroes-unmap.out | 81 +++++++++++ 4 files changed, 214 insertions(+), 5 deletions(-) create mode 100755 tests/qemu-iotests/tests/write-zeroes-unmap create mode 100644 tests/qemu-iotests/tests/write-zeroes-unmap.outSignature · 1 line
2.45.2
Thanks, applied to my block tree:
https://gitlab.com/stefanha/qemu/commits/block
Stefan