From nobody Thu Mar 28 10:20:34 2024 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=1565633592; cv=none; d=zoho.com; s=zohoarc; b=TJox/zOjG453st6IdV+pg+47FwlO4rEIFCOgVHv5idTFgFA+GzqjOg+5090bD7WmhcOjCMSTtpQWvcQ91rASJkVwdlK59C8T7BJHbB5siXeX6aMiRZPqXeIYnJ6vFBCYVI5nJ1ItvKI+aNlVqYaBOz7OHol5LyL48oQl7H+MgQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565633592; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=+ipsTgBA1+d4Fv3k+gfmCMivqEeEet4M7S87hXTYjwU=; b=WGffspIOYjwfabMgoauKLnqgVIAr5CELq/kQEf9P7VABU4rH5NrHbO2kjfJhvZJVPOgJOH6PtisLpKlPwGwMUhXjAdgjR6isdqBn44w8maPjCnxzyAiXHp7dCKh5/aBfkUYGee2xHGWw5yRblNb5bhz51SidHqBvCvaICkWQvQ0= 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 1565633592574521.6228553284873; Mon, 12 Aug 2019 11:13:12 -0700 (PDT) Received: from localhost ([::1]:47604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxEoh-00011J-Oc for importer@patchew.org; Mon, 12 Aug 2019 14:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40986) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxEnT-0007sG-6C for qemu-devel@nongnu.org; Mon, 12 Aug 2019 14:11:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxEnS-0004e7-AI for qemu-devel@nongnu.org; Mon, 12 Aug 2019 14:11:55 -0400 Received: from relay.sw.ru ([185.231.240.75]:50634) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxEnQ-0004cK-94; Mon, 12 Aug 2019 14:11:52 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hxEnM-0001oT-O7; Mon, 12 Aug 2019 21:11:48 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Mon, 12 Aug 2019 21:11:45 +0300 Message-Id: <20190812181146.26121-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190812181146.26121-1-vsementsov@virtuozzo.com> References: <20190812181146.26121-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 1/2] block/raw-format: switch to BDRV_BLOCK_DATA with BDRV_BLOCK_RECURSE 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, den@openvz.org, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BDRV_BLOCK_RAW makes generic bdrv_co_block_status to fallthrough to returned file. But is it correct behavior at all? If returned file itself has a backing file, we may report as totally unallocated and area which actually has data in bottom backing file. So, mirroring of qcow2 under raw-format is broken. Which is illustrated by following commit with a test. Let's make raw-format behave more correctly returning BDRV_BLOCK_DATA. Suggested-by: Max Reitz Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/raw-format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/raw-format.c b/block/raw-format.c index bffd424dd0..a273ee2387 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -275,7 +275,7 @@ static int coroutine_fn raw_co_block_status(BlockDriver= State *bs, *pnum =3D bytes; *file =3D bs->file->bs; *map =3D offset + s->offset; - return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID; + return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | BDRV_BLOCK_RECURSE; } =20 static int coroutine_fn raw_co_pwrite_zeroes(BlockDriverState *bs, --=20 2.18.0 From nobody Thu Mar 28 10:20:34 2024 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=1565633628; cv=none; d=zoho.com; s=zohoarc; b=kSvRAkCFIM+W1hwXoBb2hbLex2+Z1DPpd6cYE578mXvNcAd/uK1f68PN5EluGRyo53f7EpPrsqwGwRTXnF2fq4RtVx0xOYrrawkhnI9QSqAhZN46qdoZQpHYzvTZqtMfLl+zoYWSqCRrrnpjUIbEpgR2/mh0CiWIHpUv06PmeQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565633628; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ER4hHi309lkny0OUY0pOinTVjEgxnGgeTpfPTylFo0o=; b=ZQ8zRsjunGNdoO1ZOjf41pPxifxrcn+O5c2nm/456+BCLwlFUkzXu8Fmn93hshYPak31DX3zN1s4YSgEqxCHPUto3JQIX0kE08sFOsxcfWTC138+ByUyqD68IEXKdm+KZmouUa6lpCBR/Tvwc8/jRltpTVmRKqd3s/KobBnYJIU= 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565633628594426.52161574582976; Mon, 12 Aug 2019 11:13:48 -0700 (PDT) Received: from localhost ([::1]:47610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxEpC-0001sm-Ip for importer@patchew.org; Mon, 12 Aug 2019 14:13:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41003) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hxEnU-0007vX-Hf for qemu-devel@nongnu.org; Mon, 12 Aug 2019 14:11:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxEnT-0004eW-6n for qemu-devel@nongnu.org; Mon, 12 Aug 2019 14:11:56 -0400 Received: from relay.sw.ru ([185.231.240.75]:50628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxEnQ-0004cJ-B2; Mon, 12 Aug 2019 14:11:52 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hxEnM-0001oT-UB; Mon, 12 Aug 2019 21:11:49 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Date: Mon, 12 Aug 2019 21:11:46 +0300 Message-Id: <20190812181146.26121-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190812181146.26121-1-vsementsov@virtuozzo.com> References: <20190812181146.26121-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 2/2] iotests: test mirroring qcow2 under raw format 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, den@openvz.org, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Check that it is fixed by previous commit Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/263 | 46 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/263.out | 12 ++++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 59 insertions(+) create mode 100755 tests/qemu-iotests/263 create mode 100644 tests/qemu-iotests/263.out diff --git a/tests/qemu-iotests/263 b/tests/qemu-iotests/263 new file mode 100755 index 0000000000..dbe38e6c6c --- /dev/null +++ b/tests/qemu-iotests/263 @@ -0,0 +1,46 @@ +#!/usr/bin/env python +# +# Test mirroring qcow2 under raw-format +# +# Copyright (c) 2019 Virtuozzo International GmbH. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +import iotests +from iotests import qemu_img_create, qemu_io, filter_qemu_io, file_path, l= og + +iotests.verify_image_format(supported_fmts=3D['qcow2']) + +base, top, target =3D file_path('base', 'top', 'target') +size =3D 1024 * 1024 + +qemu_img_create('-f', iotests.imgfmt, base, str(size)) +log(filter_qemu_io(qemu_io('-f', iotests.imgfmt, + '-c', 'write -P 1 0 1M', base))) +qemu_img_create('-f', iotests.imgfmt, '-b', base, top, str(size)) + +vm =3D iotests.VM().add_drive(None, opts=3D'driver=3Draw,size=3D' + str(si= ze) + + ',file.driver=3Dqcow2,file.file.filename=3D' += top) +vm.launch() + +vm.qmp_log('drive-mirror', device=3D'drive0', target=3Dtarget, sync=3D'ful= l', + filters=3D[iotests.filter_qmp_testfiles]) +log(vm.event_wait('BLOCK_JOB_READY'), filters=3D[iotests.filter_qmp_event]) +vm.qmp_log('block-job-complete', device=3D'drive0') +vm.shutdown() + +log(filter_qemu_io(qemu_io('-f', 'raw', '-c', 'read -P 1 0 1M', target))) + +log('-- finish --') # avoid extra new-line at the end of .out file diff --git a/tests/qemu-iotests/263.out b/tests/qemu-iotests/263.out new file mode 100644 index 0000000000..65e5c812c6 --- /dev/null +++ b/tests/qemu-iotests/263.out @@ -0,0 +1,12 @@ +wrote 1048576/1048576 bytes at offset 0 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +{"execute": "drive-mirror", "arguments": {"device": "drive0", "sync": "ful= l", "target": "TEST_DIR/PID-target"}} +{"return": {}} +{"data": {"device": "drive0", "len": 1048576, "offset": 1048576, "speed": = 0, "type": "mirror"}, "event": "BLOCK_JOB_READY", "timestamp": {"microsecon= ds": "USECS", "seconds": "SECS"}} +{"execute": "block-job-complete", "arguments": {"device": "drive0"}} +{"return": {}} +read 1048576/1048576 bytes at offset 0 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +-- finish -- diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index f13e5f2e23..186a0220e5 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -271,3 +271,4 @@ 254 rw backing quick 255 rw quick 256 rw quick +263 rw quick --=20 2.18.0