104 lines
4.0 KiB
Diff
104 lines
4.0 KiB
Diff
From c92790705ea64e29191ad00bd61e1ad13011c6b4 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Tue, 7 Oct 2025 10:16:59 -0400
|
|
Subject: [PATCH 2/3] block: use pwrite_zeroes_alignment when writing first
|
|
sector
|
|
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
RH-MergeRequest: 565: block: Fix image creation on storage with 4k sector size
|
|
RH-Jira: RHEL-207389
|
|
RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
|
|
RH-Acked-by: German Maglione <None>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Commit: [2/3] 1854afab367accbe5a4ffdcbb7cea180595b6bdc (kmwolf/rhel-qemu-kvm)
|
|
|
|
Since commit 5634622bcb33 ("file-posix: allow BLKZEROOUT with -t
|
|
writeback"), qemu-img create errors out on a Linux loop block device
|
|
with a 4 KB sector size:
|
|
|
|
# dd if=/dev/zero of=blockfile bs=1M count=1024
|
|
# losetup --sector-size 4096 /dev/loop0 blockfile
|
|
# qemu-img create -f raw /dev/loop0 1G
|
|
Formatting '/dev/loop0', fmt=raw size=1073741824
|
|
qemu-img: /dev/loop0: Failed to clear the new image's first sector: Invalid argument
|
|
|
|
Use the pwrite_zeroes_alignment block limit to avoid misaligned
|
|
fallocate(2) or ioctl(BLKZEROOUT) in the block/file-posix.c block
|
|
driver.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Fixes: 5634622bcb33 ("file-posix: allow BLKZEROOUT with -t writeback")
|
|
Reported-by: Jean-Louis Dupond <jean-louis@dupond.be>
|
|
Buglink: https://gitlab.com/qemu-project/qemu/-/issues/3127
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Message-ID: <20251007141700.71891-3-stefanha@redhat.com>
|
|
Tested-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry picked from commit d704a13d2c025779bc91d04e127427347ddcf3b3)
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
block.c | 3 ++-
|
|
block/block-backend.c | 11 +++++++++++
|
|
include/system/block-backend-io.h | 1 +
|
|
3 files changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/block.c b/block.c
|
|
index 8848e9a7ed..be77e03904 100644
|
|
--- a/block.c
|
|
+++ b/block.c
|
|
@@ -606,12 +606,13 @@ create_file_fallback_zero_first_sector(BlockBackend *blk,
|
|
int64_t current_size,
|
|
Error **errp)
|
|
{
|
|
+ uint32_t alignment = blk_get_pwrite_zeroes_alignment(blk);
|
|
int64_t bytes_to_clear;
|
|
int ret;
|
|
|
|
GLOBAL_STATE_CODE();
|
|
|
|
- bytes_to_clear = MIN(current_size, BDRV_SECTOR_SIZE);
|
|
+ bytes_to_clear = MIN(current_size, MAX(BDRV_SECTOR_SIZE, alignment));
|
|
if (bytes_to_clear) {
|
|
ret = blk_co_pwrite_zeroes(blk, 0, bytes_to_clear, BDRV_REQ_MAY_UNMAP);
|
|
if (ret < 0) {
|
|
diff --git a/block/block-backend.c b/block/block-backend.c
|
|
index d97b26b743..850f2ecec2 100644
|
|
--- a/block/block-backend.c
|
|
+++ b/block/block-backend.c
|
|
@@ -2326,6 +2326,17 @@ uint32_t blk_get_request_alignment(BlockBackend *blk)
|
|
return bs ? bs->bl.request_alignment : BDRV_SECTOR_SIZE;
|
|
}
|
|
|
|
+/* Returns the optimal write zeroes alignment, in bytes; guaranteed nonzero */
|
|
+uint32_t blk_get_pwrite_zeroes_alignment(BlockBackend *blk)
|
|
+{
|
|
+ BlockDriverState *bs = blk_bs(blk);
|
|
+ IO_CODE();
|
|
+ if (!bs) {
|
|
+ return BDRV_SECTOR_SIZE;
|
|
+ }
|
|
+ return bs->bl.pwrite_zeroes_alignment ?: bs->bl.request_alignment;
|
|
+}
|
|
+
|
|
/* Returns the maximum hardware transfer length, in bytes; guaranteed nonzero */
|
|
uint64_t blk_get_max_hw_transfer(BlockBackend *blk)
|
|
{
|
|
diff --git a/include/system/block-backend-io.h b/include/system/block-backend-io.h
|
|
index 91c48299b7..fd84723d9d 100644
|
|
--- a/include/system/block-backend-io.h
|
|
+++ b/include/system/block-backend-io.h
|
|
@@ -118,6 +118,7 @@ BlockAIOCB *blk_abort_aio_request(BlockBackend *blk,
|
|
void *opaque, int ret);
|
|
|
|
uint32_t blk_get_request_alignment(BlockBackend *blk);
|
|
+uint32_t blk_get_pwrite_zeroes_alignment(BlockBackend *blk);
|
|
uint32_t blk_get_max_transfer(BlockBackend *blk);
|
|
uint64_t blk_get_max_hw_transfer(BlockBackend *blk);
|
|
|
|
--
|
|
2.52.0
|
|
|