From nobody Tue Feb 10 01:00:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176796061778672.25369012849308; Fri, 9 Jan 2026 04:10:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1veBJQ-0005qW-KY; Fri, 09 Jan 2026 07:09:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1veBIY-0005al-12; Fri, 09 Jan 2026 07:09:00 -0500 Received: from proxmox-new.maurer-it.com ([94.136.29.106]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1veBIW-00018H-Fz; Fri, 09 Jan 2026 07:08:57 -0500 Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6201D48FBA; Fri, 09 Jan 2026 13:08:43 +0100 (CET) From: Fiona Ebner To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, fam@euphon.net, stefanha@redhat.com Subject: [PATCH 5/6] block/io: handle image length not aligned to write zeroes alignment in bdrv_co_do_zero_pwritev() Date: Fri, 9 Jan 2026 13:08:32 +0100 Message-ID: <20260109120837.2772961-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260109120837.2772961-1-f.ebner@proxmox.com> References: <20260109120837.2772961-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1767960482537 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=94.136.29.106; envelope-from=f.ebner@proxmox.com; helo=proxmox-new.maurer-it.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1767960620999158500 Content-Type: text/plain; charset="utf-8" When making the request shorter, use bl.request_alignment as the alignment. This partially fixes iotests 154 and 271 with qcow2. Signed-off-by: Fiona Ebner --- block/io.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/block/io.c b/block/io.c index 233b2617ea..d92b30bce5 100644 --- a/block/io.c +++ b/block/io.c @@ -2162,6 +2162,7 @@ bdrv_co_do_zero_pwritev(BdrvChild *child, int64_t off= set, int64_t bytes, int ret =3D 0; bool padding; BdrvRequestPadding pad; + uint64_t total_length =3D bs->total_sectors * BDRV_SECTOR_SIZE; =20 /* This flag doesn't make sense for padding or zero writes */ flags &=3D ~BDRV_REQ_REGISTERED_BUF; @@ -2177,10 +2178,21 @@ bdrv_co_do_zero_pwritev(BdrvChild *child, int64_t o= ffset, int64_t bytes, int64_t aligned_offset =3D offset & ~(align - 1); int64_t write_bytes =3D pad.merge_reads ? pad.buf_len : align; =20 - qemu_iovec_init_buf(&local_qiov, pad.buf, write_bytes); - ret =3D bdrv_aligned_pwritev(child, req, aligned_offset, write= _bytes, - align, &local_qiov, 0, - flags & ~BDRV_REQ_ZERO_WRITE); + if (total_length >=3D aligned_offset + write_bytes) { + qemu_iovec_init_buf(&local_qiov, pad.buf, write_bytes); + ret =3D bdrv_aligned_pwritev(child, req, aligned_offset, + write_bytes, align, &local_qiov= , 0, + flags & ~BDRV_REQ_ZERO_WRITE); + } else { + write_bytes =3D total_length - aligned_offset; + qemu_iovec_init_buf(&local_qiov, pad.buf, write_bytes); + ret =3D bdrv_aligned_pwritev(child, req, aligned_offset, + write_bytes, + bs->bl.request_alignment, + &local_qiov, 0, + flags & ~BDRV_REQ_ZERO_WRITE); + } + if (ret < 0 || pad.merge_reads) { /* Error or all work is done */ goto out; @@ -2205,12 +2217,20 @@ bdrv_co_do_zero_pwritev(BdrvChild *child, int64_t o= ffset, int64_t bytes, =20 assert(!bytes || (offset & (align - 1)) =3D=3D 0); if (bytes) { - assert(align =3D=3D pad.tail + bytes); + if (total_length >=3D offset + align) { + assert(align =3D=3D pad.tail + bytes); =20 - qemu_iovec_init_buf(&local_qiov, pad.tail_buf, align); - ret =3D bdrv_aligned_pwritev(child, req, offset, align, align, - &local_qiov, 0, - flags & ~BDRV_REQ_ZERO_WRITE); + qemu_iovec_init_buf(&local_qiov, pad.tail_buf, align); + ret =3D bdrv_aligned_pwritev(child, req, offset, align, align, + &local_qiov, 0, + flags & ~BDRV_REQ_ZERO_WRITE); + } else { + int64_t write_bytes =3D total_length - offset; + qemu_iovec_init_buf(&local_qiov, pad.tail_buf, write_bytes); + ret =3D bdrv_aligned_pwritev(child, req, offset, write_bytes, + bs->bl.request_alignment, &local_qi= ov, 0, + flags & ~BDRV_REQ_ZERO_WRITE); + } } =20 out: --=20 2.47.3