From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alIay-00018F-2H for qemu-devel@nongnu.org; Wed, 30 Mar 2016 12:03:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alIas-0001Qu-4E for qemu-devel@nongnu.org; Wed, 30 Mar 2016 12:03:47 -0400 References: <1459345997-1610-1-git-send-email-berrange@redhat.com> <1459345997-1610-4-git-send-email-berrange@redhat.com> From: Max Reitz Message-ID: <56FBF8D1.40500@redhat.com> Date: Wed, 30 Mar 2016 18:03:29 +0200 MIME-Version: 1.0 In-Reply-To: <1459345997-1610-4-git-send-email-berrange@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="W1LoPNADN1cnFrIEIsUjXQFuVhcRCUBRk" Subject: Re: [Qemu-devel] [PATCH v7 3/3] block: enable testing of LUKS driver with block I/O tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --W1LoPNADN1cnFrIEIsUjXQFuVhcRCUBRk Content-Type: multipart/mixed; boundary="H1W0EqxkGbMqdUFC9VvtXoiB4q1wAqAHi" From: Max Reitz To: "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Kevin Wolf Message-ID: <56FBF8D1.40500@redhat.com> Subject: Re: [PATCH v7 3/3] block: enable testing of LUKS driver with block I/O tests References: <1459345997-1610-1-git-send-email-berrange@redhat.com> <1459345997-1610-4-git-send-email-berrange@redhat.com> In-Reply-To: <1459345997-1610-4-git-send-email-berrange@redhat.com> --H1W0EqxkGbMqdUFC9VvtXoiB4q1wAqAHi Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable On 30.03.2016 15:53, Daniel P. Berrange wrote: > This adds support for testing the LUKS driver with the block > I/O test framework. >=20 > cd tests/qemu-io-tests > ./check -luks >=20 > A handful of test cases are modified to work with luks >=20 > - 004 - whitelist luks format > - 012 - use TEST_IMG_FILE instead of TEST_IMG for file ops > - 048 - use TEST_IMG_FILE instead of TEST_IMG for file ops. Well, that doesn't always work now that you kept TEST_IMG_FILE unset for file-protocol tests. (Both fail because some command in them cannot find the file ''.) > don't assume extended image contents is all zeros, > explicitly initialize with zeros > Make file size smaller to avoid having to decrypt > 1 GB of data. > - 052 - don't assume initial image contents is all zeros, > explicitly initialize with zeros > - 100 - don't assume initial image contents is all zeros, > explicitly initialize with zeros >=20 > With this patch applied, the results are as follows: >=20 > Passed: 001 002 003 004 005 008 009 010 011 012 021 032 043 > 047 048 049 052 087 100 134 143 > Failed: 033 120 140 145 > Skipped: 007 013 014 015 017 018 019 020 022 023 024 025 026 > 027 028 029 030 031 034 035 036 037 038 039 040 041 > 042 043 044 045 046 047 049 050 051 053 054 055 056 > 057 058 059 060 061 062 063 064 065 066 067 068 069 > 070 071 072 073 074 075 076 077 078 079 080 081 082 > 083 084 085 086 087 088 089 090 091 092 093 094 095 > 096 097 098 099 101 102 103 104 105 107 108 109 110 > 111 112 113 114 115 116 117 118 119 121 122 123 124 > 128 129 130 131 132 133 134 135 136 137 138 139 141 > 142 144 146 148 >=20 > The reasons for the failed tests are: >=20 > - 033 - needs adapting to use image opts syntax with blkdebug > and test image in order to correctly set align property > - 120 - needs adapting to use correct -drive syntax for luks > - 140 - needs adapting to use correct -drive syntax for luks > - 145 - needs adapting to use correct -drive syntax for luks >=20 > The vast majority of skipped tests are exercising code that is > qcow2 specific, though a couple could probably be usefully > enabled for luks too. >=20 > Signed-off-by: Daniel P. Berrange > --- > tests/qemu-iotests/004 | 2 +- > tests/qemu-iotests/012 | 2 +- > tests/qemu-iotests/048 | 22 +++++++++++++++------- > tests/qemu-iotests/048.out | 6 ++++-- > tests/qemu-iotests/052 | 4 ++++ > tests/qemu-iotests/052.out | 4 ++++ > tests/qemu-iotests/100 | 7 +++++++ > tests/qemu-iotests/100.out | 14 ++++++++++++++ > tests/qemu-iotests/common | 7 +++++++ > tests/qemu-iotests/common.rc | 3 +++ > 10 files changed, 60 insertions(+), 11 deletions(-) >=20 [...] > diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 > index e1eeac2..0e58364 100755 > --- a/tests/qemu-iotests/048 > +++ b/tests/qemu-iotests/048 [...] > @@ -46,25 +46,33 @@ _compare() > . ./common.filter > . ./common.pattern > =20 > -_supported_fmt raw qcow qcow2 qed > +_supported_fmt raw qcow qcow2 qed luks > _supported_proto file > _supported_os Linux > =20 > # Setup test basic parameters > TEST_IMG2=3D$TEST_IMG.2 > +TEST_IMG_FILE2=3D$TEST_IMG_FILE.2 > CLUSTER_SIZE=3D4096 > -size=3D1024M > +size=3D128M > =20 > _make_test_img $size > io_pattern write 524288 $CLUSTER_SIZE $CLUSTER_SIZE 4 45 > =20 > # Compare identical images > -cp "$TEST_IMG" "${TEST_IMG2}" > +cp "$TEST_IMG_FILE" "${TEST_IMG_FILE2}" > _compare > _compare -q > =20 > # Compare images with different size > -$QEMU_IMG resize -f $IMGFMT "$TEST_IMG" +512M > +if [ "$IMGOPTSSYNTAX" =3D "true" ]; then > + $QEMU_IMG resize $QEMU_IMG_EXTRA_ARGS "$TEST_IMG" +32M > +else > + $QEMU_IMG resize -f $IMGFMT "$TEST_IMG" +32M If you don't decide to pass QEMU_IMG_EXTRA_ARGS in the _qemu_img_wrapper, maybe you could set it to "-f $IMGFMT" if $IMGOPTSSYNTAX is false. (Keeping this as it is won't stop me from giving an R-b, though.) Max > +fi > +# Ensure extended space is zero-initialized > +$QEMU_IO "$TEST_IMG" -c "write -P 0 $size 32M" | _filter_qemu_io > + > _compare > _compare -s > =20 --H1W0EqxkGbMqdUFC9VvtXoiB4q1wAqAHi-- --W1LoPNADN1cnFrIEIsUjXQFuVhcRCUBRk Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJW+/jRAAoJEDuxQgLoOKyt6ywH/0/nfEPieOCn2hh8/NwyL0Wf xoOP8OIOqMlnuxMFg2SxoRPx7kqP35MVdAULYncX94kUE1qNsgN/1vVqo9rIAqvi HgBB5ZmMn9+KRY9kHXGG3cdMc9z3iYe72GkY2kXbHvB1AXFo9OeOn5KJ8MOboO4V rGsSIhVWCvojm8lA1jZozYxU/f60qTF9S7IdvBADrFkFMNXarhvtmzKnvq4pfBBq Fn7TOSN1sNcM0s8rvBOI52SxS58FlNXLJK8ySDvZuhBkdGmIwKKQF7fwUgzHRlBy m4LrhJrt2b3+r/Ej0nKmuMaZf9WM/rNUGz7KjCp65BXefMTh1HM1nbgog07s3XQ= =nCc1 -----END PGP SIGNATURE----- --W1LoPNADN1cnFrIEIsUjXQFuVhcRCUBRk--