From nobody Wed Nov 12 05:29:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1568736964; cv=none; d=zoho.com; s=zohoarc; b=HZuPRY/z0+YGYzymCtTgoPEaffcCGswFx/BcIdoxu/egC/fJyGG5ENiY2UkrmDdSmIXRat6dERGIiKZ8QTDuAepT90ET1gRek6NCcOEdY1t2QnDk7rOlXRsY19NqQfXsrhlfdx1FcHke/oxOpz4vJf2J/+qWI+qLcM2r50Q+/4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568736964; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Liv7A0L/pBMEJXwiogzX0ZvJ4d08TQ7VpawlvF3jcOY=; b=Hxcy4rGm9mmjKuCxE0am2N6XlCODW19r2+ZNoO/NKFmaMZbSotEFNWwkibo7bX6rgTVxM8cC49g64RLIX7h+sKF3dnk09mwxpS2WIEPeG/vCyr0VCwjkNKsV0NkhikbGtDjZSIrgrc2omN481IiNcplfbQt0rnbNTCQ79e5yGJU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568736964815106.14487777331613; Tue, 17 Sep 2019 09:16:04 -0700 (PDT) Received: from localhost ([::1]:48094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAG93-0003Vp-MF for importer@patchew.org; Tue, 17 Sep 2019 12:16:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41125) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAG0z-0004YE-BQ for qemu-devel@nongnu.org; Tue, 17 Sep 2019 12:07:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAG0y-000756-9M for qemu-devel@nongnu.org; Tue, 17 Sep 2019 12:07:41 -0400 Received: from relay.sw.ru ([185.231.240.75]:53062) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAG0t-00072R-7G; Tue, 17 Sep 2019 12:07:35 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iAG0q-0003UJ-B3; Tue, 17 Sep 2019 19:07:32 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Tue, 17 Sep 2019 19:07:30 +0300 Message-Id: <20190917160731.10895-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190917160731.10895-1-vsementsov@virtuozzo.com> References: <20190917160731.10895-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v12 1/2] block/backup: fix max_transfer handling for copy_range 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, qemu-stable@nongnu.org, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Of course, QEMU_ALIGN_UP is a typo, it should be QEMU_ALIGN_DOWN, as we are trying to find aligned size which satisfy both source and target. Also, don't ignore too small max_transfer. In this case seems safer to disable copy_range. Fixes: 9ded4a0114968e Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: John Snow --- block/backup.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/block/backup.c b/block/backup.c index 763f0d7ff6..d8fdbfadfe 100644 --- a/block/backup.c +++ b/block/backup.c @@ -741,12 +741,16 @@ BlockJob *backup_job_create(const char *job_id, Block= DriverState *bs, job->cluster_size =3D cluster_size; job->copy_bitmap =3D copy_bitmap; copy_bitmap =3D NULL; - job->use_copy_range =3D !compress; /* compression isn't supported for = it */ job->copy_range_size =3D MIN_NON_ZERO(blk_get_max_transfer(job->common= .blk), blk_get_max_transfer(job->target)); - job->copy_range_size =3D MAX(job->cluster_size, - QEMU_ALIGN_UP(job->copy_range_size, - job->cluster_size)); + job->copy_range_size =3D QEMU_ALIGN_DOWN(job->copy_range_size, + job->cluster_size); + /* + * Compression is not supported for copy_range. Also, we don't want to + * handle small max_transfer for copy_range (which currently don't + * handle max_transfer at all). + */ + job->use_copy_range =3D !compress && job->copy_range_size > 0; =20 /* Required permissions are already taken with target's blk_new() */ block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL, --=20 2.21.0 From nobody Wed Nov 12 05:29:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1568736715; cv=none; d=zoho.com; s=zohoarc; b=Lt41zRZ7RTOMH2k7Ph4ihSqWtabAw5wCqq19DERTsf5hgr3QQiU0W5Jl8Lngheu/c5HX8c7v2eXmruxSAyhEZ1S7jzGQgkzg1zSdhIJU92hZSOSD866HXLLGBbzo08zChek2MpzQ5NJs+oBl5h6owXQOFns8jspaHUXVSPCw67w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568736715; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gthHp+6ZQp1rTpdpAWfTet0LGo3GGLxwaaBX7jKFoEQ=; b=JwH/xPzzH0vtQ6TLQ8pYy18F8ECsWzOZallNElns3DdKe8HKG7eqCxF9T61/JI3i2nE/OrVHwqn3asF+zhR+EykuXaGTdsBlmhdkLZ3IGGQoZxDC0x2FLLO5zgfWUcrdg4s75vrc2NRzhgZk5LKSp5EBWHN3ifgWNGSwk+kte10= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568736715868416.31644481677836; Tue, 17 Sep 2019 09:11:55 -0700 (PDT) Received: from localhost ([::1]:47994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAG53-0007m4-A4 for importer@patchew.org; Tue, 17 Sep 2019 12:11:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41123) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAG0z-0004Y9-Cc for qemu-devel@nongnu.org; Tue, 17 Sep 2019 12:07:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAG0y-000750-7U for qemu-devel@nongnu.org; Tue, 17 Sep 2019 12:07:41 -0400 Received: from relay.sw.ru ([185.231.240.75]:53070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAG0t-00072T-7L; Tue, 17 Sep 2019 12:07:35 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iAG0q-0003UJ-HO; Tue, 17 Sep 2019 19:07:32 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Tue, 17 Sep 2019 19:07:31 +0300 Message-Id: <20190917160731.10895-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190917160731.10895-1-vsementsov@virtuozzo.com> References: <20190917160731.10895-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v12 2/2] block/backup: fix backup_cow_with_offload for last cluster 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, qemu-stable@nongnu.org, mreitz@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We shouldn't try to copy bytes beyond EOF. Fix it. Fixes: 9ded4a0114968e Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz Reviewed-by: John Snow --- block/backup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/backup.c b/block/backup.c index d8fdbfadfe..89f7f89200 100644 --- a/block/backup.c +++ b/block/backup.c @@ -161,7 +161,7 @@ static int coroutine_fn backup_cow_with_offload(BackupB= lockJob *job, =20 assert(QEMU_IS_ALIGNED(job->copy_range_size, job->cluster_size)); assert(QEMU_IS_ALIGNED(start, job->cluster_size)); - nbytes =3D MIN(job->copy_range_size, end - start); + nbytes =3D MIN(job->copy_range_size, MIN(end, job->len) - start); nr_clusters =3D DIV_ROUND_UP(nbytes, job->cluster_size); bdrv_reset_dirty_bitmap(job->copy_bitmap, start, job->cluster_size * nr_clusters); --=20 2.21.0