62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
|
From 9daf2b936101d612a295217822791d323e908fc9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
Date: Thu, 8 Aug 2024 10:05:45 +0200
|
||
|
|
Subject: [PATCH] block/blkio: use FUA flag on write zeroes only if supported
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
libblkio supports BLKIO_REQ_FUA with write zeros requests only since
|
||
|
|
version 1.4.0, so let's inform the block layer that the blkio driver
|
||
|
|
supports it only in this case. Otherwise we can have runtime errors
|
||
|
|
as reported in https://issues.redhat.com/browse/RHEL-32878
|
||
|
|
|
||
|
|
Fixes: fd66dbd424 ("blkio: add libblkio block driver")
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Buglink: https://issues.redhat.com/browse/RHEL-32878
|
||
|
|
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Message-id: 20240808080545.40744-1-sgarzare@redhat.com
|
||
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
(cherry picked from commit 547c4e50929ec6c091d9c16a7b280e829b12b463)
|
||
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
block/blkio.c | 6 ++++--
|
||
|
|
meson.build | 2 ++
|
||
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/block/blkio.c b/block/blkio.c
|
||
|
|
index b989617608..027c16ceb6 100644
|
||
|
|
--- a/block/blkio.c
|
||
|
|
+++ b/block/blkio.c
|
||
|
|
@@ -899,8 +899,10 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
|
||
|
|
}
|
||
|
|
|
||
|
|
bs->supported_write_flags = BDRV_REQ_FUA | BDRV_REQ_REGISTERED_BUF;
|
||
|
|
- bs->supported_zero_flags = BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP |
|
||
|
|
- BDRV_REQ_NO_FALLBACK;
|
||
|
|
+ bs->supported_zero_flags = BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK;
|
||
|
|
+#ifdef CONFIG_BLKIO_WRITE_ZEROS_FUA
|
||
|
|
+ bs->supported_zero_flags |= BDRV_REQ_FUA;
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
qemu_mutex_init(&s->blkio_lock);
|
||
|
|
qemu_co_mutex_init(&s->bounce_lock);
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 4024f9a4bb..ce2fd07963 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -2181,6 +2181,8 @@ config_host_data.set('CONFIG_BLKIO', blkio.found())
|
||
|
|
if blkio.found()
|
||
|
|
config_host_data.set('CONFIG_BLKIO_VHOST_VDPA_FD',
|
||
|
|
blkio.version().version_compare('>=1.3.0'))
|
||
|
|
+ config_host_data.set('CONFIG_BLKIO_WRITE_ZEROS_FUA',
|
||
|
|
+ blkio.version().version_compare('>=1.4.0'))
|
||
|
|
endif
|
||
|
|
config_host_data.set('CONFIG_CURL', curl.found())
|
||
|
|
config_host_data.set('CONFIG_CURSES', curses.found())
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|