From nobody Mon Feb 9 14:40:07 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 ARC-Seal: i=1; a=rsa-sha256; t=1596722861; cv=none; d=zohomail.com; s=zohoarc; b=MZ4zKVNa24Om3u+9Xh4ebocWi6FPg3PiA9hwgMDrniKfSZS+FkD4lSNxpC0LKDuP704m4My2Bn8k2EHnCmpwQsYyl952RxByhKYlvNlO/3K/xIb38GhxL/0fNRsRSCoKtdxvIxyd2d2rsTJXLeRDShqNUiknFKok7Qm0Re1aZaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596722861; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=bW3+Gc8C1mGTzqaVro83HaOh/GehA0Cro9WEuR0CP4o=; b=JW9AxzbYdJgVFoBoxqhXsS05+zd3hkgz8KC3prnO9e2YWxMMM3lFI99DoMeBgkLigsZa+Qefs8hXYli5C6JoKQA+oQE1yJ0i4SpYkEkYEvVE9YHbEU0/V5re47XeSSP4bSX/1uKAk2U1tdmfGimYvHDRTIX7BmrP7oicNzvqeTQ= ARC-Authentication-Results: i=1; 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 1596722861649903.7198596071662; Thu, 6 Aug 2020 07:07:41 -0700 (PDT) Received: from localhost ([::1]:52004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3gYW-0000dV-27 for importer@patchew.org; Thu, 06 Aug 2020 10:07:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3gXp-0008Lu-KJ; Thu, 06 Aug 2020 10:06:57 -0400 Received: from proxmox-new.maurer-it.com ([212.186.127.180]:34966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3gXn-0006WA-1F; Thu, 06 Aug 2020 10:06:57 -0400 Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5B82543766; Thu, 6 Aug 2020 15:58:06 +0200 (CEST) From: Stefan Reiter To: qemu-block@nongnu.org Subject: [PATCH] block/block-copy: always align copied region to cluster size Date: Thu, 6 Aug 2020 15:57:40 +0200 Message-Id: <20200806135740.24420-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=212.186.127.180; envelope-from=s.reiter@proxmox.com; helo=proxmox-new.maurer-it.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 09:58:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Since commit 42ac214406e0 (block/block-copy: refactor task creation) block_copy_task_create calculates the area to be copied via bdrv_dirty_bitmap_next_dirty_area, but that can return an unaligned byte count if the backing image's last cluster end is not aligned to the bitmap's granularity. Always ALIGN_UP the resulting bytes value to satisfy block_copy_do_copy, which requires the 'bytes' parameter to be aligned to cluster size. Signed-off-by: Stefan Reiter Reviewed-by: Vladimir Sementsov-Ogievskiy --- This causes backups with unaligned image sizes to fail on the last block in= my testing (e.g. a backup job with 4k cluster size fails on a drive with 4097 bytes). Alternatively one could remove the assert(QEMU_IS_ALIGNED(bytes, s->cluster_size)); from block_copy_do_copy, but I'd wager that's there for a reason? block/block-copy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/block-copy.c b/block/block-copy.c index f7428a7c08..023cb03200 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -142,6 +142,8 @@ static BlockCopyTask *block_copy_task_create(BlockCopyS= tate *s, return NULL; } =20 + bytes =3D QEMU_ALIGN_UP(bytes, s->cluster_size); + /* region is dirty, so no existent tasks possible in it */ assert(!find_conflicting_task(s, offset, bytes)); =20 --=20 2.20.1