The following changes since commit ee59483267de29056b5b2ee2421ef3844e5c9932:

Merge tag 'qemu-openbios-20230307' of https://github.com/mcayland/qemu into staging (2023-03-09 16:55:03 +0000)

https://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to ecf8191314798391b1df80bcb829c0ead4f8acc9:

qed: remove spurious BDRV_POLL_WHILE() (2023-03-10 15:14:46 +0100)

Block layer patches

- fuse: Fix fallocate(PUNCH_HOLE) to zero out the range

- qed: remove spurious BDRV_POLL_WHILE()

Hanna Czenczek (2):

block/fuse: Let PUNCH_HOLE write zeroes

iotests/308: Add test for 'write -zu'

Stefan Hajnoczi (1):

qed: remove spurious BDRV_POLL_WHILE()

block/export/fuse.c | 11 ++++++++++-

block/qed.c | 1 -

tests/qemu-iotests/308 | 43 +++++++++++++++++++++++++++++++++++++++++++

tests/qemu-iotests/308.out | 35 +++++++++++++++++++++++++++++++++++

4 files changed, 88 insertions(+), 2 deletions(-)

From: Hanna Czenczek <hreitz@redhat.com>

fallocate(2) says about PUNCH_HOLE: "After a successful call, subsequent

reads from this range will return zeros." As it is, PUNCH_HOLE is

implemented as a call to blk_pdiscard(), which does not guarantee this.

We must call blk_pwrite_zeroes() instead. The difference to ZERO_RANGE

is that we pass the `BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK` flags to

the call -- the storage is supposed to be unmapped, and a slow fallback

by actually writing zeroes as data is not allowed.

Closes: https://gitlab.com/qemu-project/qemu/-/issues/1507

Signed-off-by: Hanna Czenczek <hreitz@redhat.com>

Message-Id: <20230227104725.33511-2-hreitz@redhat.com>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

block/export/fuse.c | 11 ++++++++++-

1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/block/export/fuse.c b/block/export/fuse.c

--- a/block/export/fuse.c

+++ b/block/export/fuse.c

@@ -XXX,XX +XXX,XX @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode,

do {

int size = MIN(length, BDRV_REQUEST_MAX_BYTES);

- ret = blk_pdiscard(exp->common.blk, offset, size);

+ ret = blk_pwrite_zeroes(exp->common.blk, offset, size,

+ BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK);

+ if (ret == -ENOTSUP) {

+ /*

+ * fallocate() specifies to return EOPNOTSUPP for unsupported

+ * operations

+ */

+ ret = -EOPNOTSUPP;

+ }

+

offset += size;

length -= size;

} while (ret == 0 && length > 0);

2.39.2

From: Hanna Czenczek <hreitz@redhat.com>

Try writing zeroes to a FUSE export while allowing the area to be

unmapped; block/file-posix.c generally implements writing zeroes with

BDRV_REQ_MAY_UNMAP ('write -zu') by calling fallocate(PUNCH_HOLE). This

used to lead to a blk_pdiscard() in the FUSE export, which may or may

not lead to the area being zeroed. HEAD^ fixed this to use

blk_pwrite_zeroes() instead (again with BDRV_REQ_MAY_UNMAP), so verify

that running `qemu-io 'write -zu'` on a FUSE exports always results in

zeroes being written.

Signed-off-by: Hanna Czenczek <hreitz@redhat.com>

Message-Id: <20230227104725.33511-3-hreitz@redhat.com>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

tests/qemu-iotests/308 | 43 ++++++++++++++++++++++++++++++++++++++

tests/qemu-iotests/308.out | 35 +++++++++++++++++++++++++++++++

2 files changed, 78 insertions(+)

diff --git a/tests/qemu-iotests/308 b/tests/qemu-iotests/308

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/308

+++ b/tests/qemu-iotests/308

@@ -XXX,XX +XXX,XX @@ echo

echo '=== Compare copy with original ==='

$QEMU_IMG compare -f raw -F $IMGFMT "$COPIED_IMG" "$TEST_IMG"

+_cleanup_test_img

+

+echo

+echo '=== Writing zeroes while unmapping ==='

+# Regression test for https://gitlab.com/qemu-project/qemu/-/issues/1507

+_make_test_img 64M

+$QEMU_IO -c 'write -s /dev/urandom 0 64M' "$TEST_IMG" | _filter_qemu_io

+

+_launch_qemu

+_send_qemu_cmd $QEMU_HANDLE \

+ "{'execute': 'qmp_capabilities'}" \

+ 'return'

+

+_send_qemu_cmd $QEMU_HANDLE \

+ "{'execute': 'blockdev-add',

+ 'arguments': {

+ 'driver': '$IMGFMT',

+ 'node-name': 'node-format',

+ 'file': {

+ 'driver': 'file',

+ 'filename': '$TEST_IMG'

+ }

+ } }" \

+ 'return'

+

+fuse_export_add 'export' "'mountpoint': '$EXT_MP', 'writable': true"

+

+# Try writing zeroes by unmapping

+$QEMU_IO -f raw -c 'write -zu 0 64M' "$EXT_MP" | _filter_qemu_io

+

+# Check the result

+$QEMU_IO -f raw -c 'read -P 0 0 64M' "$EXT_MP" | _filter_qemu_io

+

+_send_qemu_cmd $QEMU_HANDLE \

+ "{'execute': 'quit'}" \

+ 'return'

+

+wait=yes _cleanup_qemu

+

+# Check the original image

+$QEMU_IO -c 'read -P 0 0 64M' "$TEST_IMG" | _filter_qemu_io

+

+_cleanup_test_img

# success, all done

echo "*** done"

diff --git a/tests/qemu-iotests/308.out b/tests/qemu-iotests/308.out

--- a/tests/qemu-iotests/308.out

+++ b/tests/qemu-iotests/308.out

@@ -XXX,XX +XXX,XX @@ OK: Post-truncate image size is as expected

=== Compare copy with original ===

Images are identical.

+=== Writing zeroes while unmapping ===

+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

+wrote 67108864/67108864 bytes at offset 0

+64 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

+{'execute': 'qmp_capabilities'}

+{"return": {}}

+{'execute': 'blockdev-add',

+ 'arguments': {

+ 'driver': 'IMGFMT',

+ 'node-name': 'node-format',

+ 'file': {

+ 'driver': 'file',

+ 'filename': 'TEST_DIR/t.IMGFMT'

+ }

+ } }

+{"return": {}}

+{'execute': 'block-export-add',

+ 'arguments': {

+ 'type': 'fuse',

+ 'id': 'export',

+ 'node-name': 'node-format',

+ 'mountpoint': 'TEST_DIR/t.IMGFMT.fuse', 'writable': true

+ } }

+{"return": {}}

+wrote 67108864/67108864 bytes at offset 0

+64 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

+read 67108864/67108864 bytes at offset 0

+64 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

+{'execute': 'quit'}

+{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "export"}}

+read 67108864/67108864 bytes at offset 0

+64 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

*** done

2.39.2

From: Stefan Hajnoczi <stefanha@redhat.com>

block/qed.c | 1 -

1 file changed, 1 deletion(-)

diff --git a/block/qed.c b/block/qed.c

--- a/block/qed.c

+++ b/block/qed.c

@@ -XXX,XX +XXX,XX @@ static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags,

qemu_coroutine_enter(qemu_coroutine_create(bdrv_qed_open_entry, &qoc));

BDRV_POLL_WHILE(bs, qoc.ret == -EINPROGRESS);

- BDRV_POLL_WHILE(bs, qoc.ret == -EINPROGRESS);

return qoc.ret;

2.39.2