Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B369C432C1 for ; Tue, 24 Sep 2019 15:45:40 +0000 (UTC) Received: from lists.gnu.org (unknown [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0C59E2146E for ; Tue, 24 Sep 2019 15:45:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C59E2146E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCn0U-000669-BR for qemu-devel@archiver.kernel.org; Tue, 24 Sep 2019 11:45:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41155) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iClul-0004gY-Jf for qemu-devel@nongnu.org; Tue, 24 Sep 2019 10:35:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCluj-0004dF-D9 for qemu-devel@nongnu.org; Tue, 24 Sep 2019 10:35:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iClua-0004ZK-W4; Tue, 24 Sep 2019 10:35:30 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E7F8A800DF2; Tue, 24 Sep 2019 14:35:26 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-249.phx2.redhat.com [10.3.116.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 785F060852; Tue, 24 Sep 2019 14:35:26 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH 2/2] tests: More iotest 223 improvements Date: Tue, 24 Sep 2019 09:35:22 -0500 Message-Id: <20190924143522.22902-3-eblake@redhat.com> In-Reply-To: <20190924143522.22902-1-eblake@redhat.com> References: <20190924143522.22902-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Tue, 24 Sep 2019 14:35:26 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 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: nsoffer@redhat.com, Kevin Wolf , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Run the test twice, once without iothreads, and again with, for more coverage of both setups. Suggested-by: Nir Soffer Signed-off-by: Eric Blake --- tests/qemu-iotests/223 | 66 +++++++++++++++++++++++++ tests/qemu-iotests/223.out | 98 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223 index 2bcf922df8c4..2aa428d406f5 100755 --- a/tests/qemu-iotests/223 +++ b/tests/qemu-iotests/223 @@ -123,6 +123,72 @@ qemu_cmd '{"execute":"qmp_capabilities"}' "return" qemu_cmd '{"execute":"blockdev-add", "arguments":{"driver":"qcow2", "node-name":"n", "file":{"driver":"file", "filename":"'"$TEST_IMG"'"}}}' "return" +qemu_cmd '{"execute":"block-dirty-bitmap-disable", + "arguments":{"node":"n", "name":"b"}}' "return" +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n"}}' "error" # Attempt add without server +qemu_cmd '{"execute":"nbd-server-start", + "arguments":{"addr":{"type":"unix", + "data":{"path":"'"$TEST_DIR/nbd"'"}}}}' "return" +qemu_cmd '{"execute":"nbd-server-start", + "arguments":{"addr":{"type":"unix", + "data":{"path":"'"$TEST_DIR/nbd"1'"}}}}' "error" # Attempt second se= rver +$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd" +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n", "bitmap":"b"}}' "return" +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"nosuch"}}' "error" # Attempt to export missing = node +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n"}}' "error" # Attempt to export same name twi= ce +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", + "bitmap":"b2"}}' "error" # enabled vs. read-only +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", + "bitmap":"b3"}}' "error" # Missing bitmap +qemu_cmd '{"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", "writable":true, + "bitmap":"b2"}}' "return" +$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd" + +echo +echo "=3D=3D=3D Contrast normal status to large granularity dirty-bitmap= =3D=3D=3D" +echo + +QEMU_IO_OPTIONS=3D$QEMU_IO_OPTIONS_NO_FMT +IMG=3D"driver=3Dnbd,export=3Dn,server.type=3Dunix,server.path=3D$TEST_DI= R/nbd" +$QEMU_IO -r -c 'r -P 0x22 512 512' -c 'r -P 0 512k 512k' -c 'r -P 0x11 1= m 1m' \ + -c 'r -P 0x33 2m 2m' --image-opts "$IMG" | _filter_qemu_io +$QEMU_IMG map --output=3Djson --image-opts \ + "$IMG" | _filter_qemu_img_map +$QEMU_IMG map --output=3Djson --image-opts \ + "$IMG,x-dirty-bitmap=3Dqemu:dirty-bitmap:b" | _filter_qemu_img_map + +echo +echo "=3D=3D=3D Contrast to small granularity dirty-bitmap =3D=3D=3D" +echo + +IMG=3D"driver=3Dnbd,export=3Dn2,server.type=3Dunix,server.path=3D$TEST_D= IR/nbd" +$QEMU_IMG map --output=3Djson --image-opts \ + "$IMG,x-dirty-bitmap=3Dqemu:dirty-bitmap:b2" | _filter_qemu_img_map + +echo +echo "=3D=3D=3D End qemu NBD server =3D=3D=3D" +echo + +qemu_cmd '{"execute":"nbd-server-remove", + "arguments":{"name":"n"}}' "return" +qemu_cmd '{"execute":"nbd-server-remove", + "arguments":{"name":"n2"}}' "return" +qemu_cmd '{"execute":"nbd-server-remove", + "arguments":{"name":"n2"}}' "error" # Attempt duplicate clean +qemu_cmd '{"execute":"nbd-server-stop"}' "return" +qemu_cmd '{"execute":"nbd-server-stop"}' "error" # Again + +echo +echo "=3D=3D=3D Repeat, but using iothreads =3D=3D=3D" +echo + qemu_cmd '{"execute":"x-blockdev-set-iothread", "arguments":{"node-name":"n", "iothread":"io0"}}' "return" qemu_cmd '{"execute":"block-dirty-bitmap-disable", diff --git a/tests/qemu-iotests/223.out b/tests/qemu-iotests/223.out index 8895ea838cbb..9dcab03ef9c8 100644 --- a/tests/qemu-iotests/223.out +++ b/tests/qemu-iotests/223.out @@ -30,6 +30,104 @@ wrote 2097152/2097152 bytes at offset 2097152 "arguments":{"driver":"qcow2", "node-name":"n", "file":{"driver":"file", "filename":"TEST_DIR/t.qcow2"}}} {"return": {}} + {"execute":"block-dirty-bitmap-disable", + "arguments":{"node":"n", "name":"b"}} +{"return": {}} + {"execute":"nbd-server-add", + "arguments":{"device":"n"}} +{"error": {"class": "GenericError", "desc": "NBD server not running"}} + {"execute":"nbd-server-start", + "arguments":{"addr":{"type":"unix", + "data":{"path":"TEST_DIR/nbd"}}}} +{"return": {}} + {"execute":"nbd-server-start", + "arguments":{"addr":{"type":"unix", + "data":{"path":"TEST_DIR/nbd1"}}}} +{"error": {"class": "GenericError", "desc": "NBD server already running"= }} +exports available: 0 + {"execute":"nbd-server-add", + "arguments":{"device":"n", "bitmap":"b"}} +{"return": {}} + {"execute":"nbd-server-add", + "arguments":{"device":"nosuch"}} +{"error": {"class": "GenericError", "desc": "Cannot find device=3Dnosuch= nor node_name=3Dnosuch"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n"}} +{"error": {"class": "GenericError", "desc": "NBD server already has expo= rt named 'n'"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", + "bitmap":"b2"}} +{"error": {"class": "GenericError", "desc": "Enabled bitmap 'b2' incompa= tible with readonly export"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", + "bitmap":"b3"}} +{"error": {"class": "GenericError", "desc": "Bitmap 'b3' is not found"}} + {"execute":"nbd-server-add", + "arguments":{"device":"n", "name":"n2", "writable":true, + "bitmap":"b2"}} +{"return": {}} +exports available: 2 + export: 'n' + size: 4194304 + flags: 0x58f ( readonly flush fua df multi cache ) + min block: 1 + opt block: 4096 + max block: 33554432 + available meta contexts: 2 + base:allocation + qemu:dirty-bitmap:b + export: 'n2' + size: 4194304 + flags: 0xced ( flush fua trim zeroes df cache fast-zero ) + min block: 1 + opt block: 4096 + max block: 33554432 + available meta contexts: 2 + base:allocation + qemu:dirty-bitmap:b2 + +=3D=3D=3D Contrast normal status to large granularity dirty-bitmap =3D=3D= =3D + +read 512/512 bytes at offset 512 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 524288/524288 bytes at offset 524288 +512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 1048576/1048576 bytes at offset 1048576 +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +read 2097152/2097152 bytes at offset 2097152 +2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, = "offset": OFFSET}, +{ "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": fa= lse, "offset": OFFSET}, +{ "start": 1048576, "length": 3145728, "depth": 0, "zero": false, "data"= : true, "offset": OFFSET}] +[{ "start": 0, "length": 65536, "depth": 0, "zero": false, "data": false= }, +{ "start": 65536, "length": 2031616, "depth": 0, "zero": false, "data": = true, "offset": OFFSET}, +{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data"= : false}] + +=3D=3D=3D Contrast to small granularity dirty-bitmap =3D=3D=3D + +[{ "start": 0, "length": 512, "depth": 0, "zero": false, "data": true, "= offset": OFFSET}, +{ "start": 512, "length": 512, "depth": 0, "zero": false, "data": false}= , +{ "start": 1024, "length": 2096128, "depth": 0, "zero": false, "data": t= rue, "offset": OFFSET}, +{ "start": 2097152, "length": 2097152, "depth": 0, "zero": false, "data"= : false}] + +=3D=3D=3D End qemu NBD server =3D=3D=3D + + {"execute":"nbd-server-remove", + "arguments":{"name":"n"}} +{"return": {}} + {"execute":"nbd-server-remove", + "arguments":{"name":"n2"}} +{"return": {}} + {"execute":"nbd-server-remove", + "arguments":{"name":"n2"}} +{"error": {"class": "GenericError", "desc": "Export 'n2' is not found"}} + {"execute":"nbd-server-stop"} +{"return": {}} + {"execute":"nbd-server-stop"} +{"error": {"class": "GenericError", "desc": "NBD server not running"}} + +=3D=3D=3D Repeat, but using iothreads =3D=3D=3D + {"execute":"x-blockdev-set-iothread", "arguments":{"node-name":"n", "iothread":"io0"}} {"return": {}} --=20 2.21.0