From 94d99b13b48e922861570f043490efc966b3b445 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 25 Jun 2021 17:41:04 -0400 Subject: [PATCH 4/4] file-posix: Handle `EINVAL` fallocate return value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Kevin Wolf Message-id: <20210625174104.44313-3-kwolf@redhat.com> Patchwork-id: 101778 O-Subject: [RHEL-8.5.0 qemu-kvm PATCH 2/2] file-posix: Handle `EINVAL` fallocate return value Bugzilla: 1970912 RH-Acked-by: Philippe Mathieu-Daudé RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Thomas Huth From: Antoine Damhet The `detect-zeroes=unmap` option may issue unaligned `FALLOC_FL_PUNCH_HOLE` requests, raw block devices can (and will) return `EINVAL`, qemu should then write the zeroes to the blockdev instead of issuing an `IO_ERROR`. The problem can be reprodced like this: $ qemu-io -c 'write -P 0 42 1234' --image-opts driver=host_device,filename=/dev/loop0,detect-zeroes=unmap write failed: Invalid argument Signed-off-by: Antoine Damhet Message-Id: <20200717135603.51180-1-antoine.damhet@blade-group.com> Signed-off-by: Kevin Wolf (cherry picked from commit bae127d4dcf6158c5042e2eee9582430839a9967) Signed-off-by: Kevin Wolf Signed-off-by: Danilo C. L. de Paula --- block/file-posix.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/file-posix.c b/block/file-posix.c index 837edcf027..6cd19e6c9a 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1632,7 +1632,11 @@ static int handle_aiocb_write_zeroes_unmap(void *opaque) #ifdef CONFIG_FALLOCATE_PUNCH_HOLE int ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, aiocb->aio_offset, aiocb->aio_nbytes); - if (ret != -ENOTSUP) { + switch (ret) { + case -ENOTSUP: + case -EINVAL: + break; + default: return ret; } #endif -- 2.27.0