From patchwork Mon Aug 8 08:48:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 9266987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AE389607D6 for ; Mon, 8 Aug 2016 08:48:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DC7926220 for ; Mon, 8 Aug 2016 08:48:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 928972793B; Mon, 8 Aug 2016 08:48:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,LOTS_OF_MONEY, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from oss.sgi.com (oss.sgi.com [192.48.182.195]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D08CD26220 for ; Mon, 8 Aug 2016 08:48:26 +0000 (UTC) Received: from oss.sgi.com (localhost [IPv6:::1]) by oss.sgi.com (Postfix) with ESMTP id EF4967CD5; Mon, 8 Aug 2016 03:48:24 -0500 (CDT) X-Original-To: xfs@oss.sgi.com Delivered-To: xfs@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 9678C7CD1 for ; Mon, 8 Aug 2016 03:48:21 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 1DC06AC002 for ; Mon, 8 Aug 2016 01:48:17 -0700 (PDT) X-ASG-Debug-ID: 1470646096-0bf8157e6d56a130001-NocioJ Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id CwCeJ78wcMgMWwnB (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 08 Aug 2016 01:48:16 -0700 (PDT) X-Barracuda-Envelope-From: eguan@redhat.com X-Barracuda-Effective-Source-IP: mx1.redhat.com[209.132.183.28] X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-ASG-Whitelist: Client Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E6CB8C0467E6; Mon, 8 Aug 2016 08:48:15 +0000 (UTC) Received: from localhost (dhcp-13-153.nay.redhat.com [10.66.13.153]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u788mELA023366; Mon, 8 Aug 2016 04:48:15 -0400 Date: Mon, 8 Aug 2016 16:48:14 +0800 From: Eryu Guan To: "Darrick J. Wong" Subject: Re: [PATCH 14/17] xfs: more rmapbt tests Message-ID: <20160808084814.GC27776@eguan.usersys.redhat.com> X-ASG-Orig-Subj: Re: [PATCH 14/17] xfs: more rmapbt tests References: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> <146914486527.11762.1173224384905616811.stgit@birch.djwong.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <146914486527.11762.1173224384905616811.stgit@birch.djwong.org> User-Agent: Mutt/1.6.1 (2016-04-27) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 08 Aug 2016 08:48:16 +0000 (UTC) X-Barracuda-Connect: mx1.redhat.com[209.132.183.28] X-Barracuda-Start-Time: 1470646096 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://192.48.157.11:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 8723 X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 Cc: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, xfs@oss.sgi.com X-BeenThere: xfs@oss.sgi.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Jul 21, 2016 at 04:47:45PM -0700, Darrick J. Wong wrote: > More tests for the reverse mapping functionality. > > Signed-off-by: Darrick J. Wong > --- > tests/xfs/876 | 76 +++++++++++++++++++++++++++++++++++++++++++++++ > tests/xfs/876.out | 4 ++ > tests/xfs/877 | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/xfs/877.out | 10 ++++++ > tests/xfs/group | 4 ++ > 5 files changed, 178 insertions(+), 1 deletion(-) > create mode 100755 tests/xfs/876 > create mode 100644 tests/xfs/876.out > create mode 100755 tests/xfs/877 > create mode 100644 tests/xfs/877.out > > > diff --git a/tests/xfs/876 b/tests/xfs/876 > new file mode 100755 > index 0000000..cf73d40 > --- /dev/null > +++ b/tests/xfs/876 > @@ -0,0 +1,76 @@ > +#! /bin/bash > +# FS QA Test No. 876 > +# > +# Create a big enough rmapbt that we tickle a fdblocks accounting bug. This test failed post-test fs check as well "sb_fdblocks 3912360, counted 3912522" Seems like it's a known bug? > +# > +#----------------------------------------------------------------------- > +# Copyright (c) 2016, Oracle and/or its affiliates. All Rights Reserved. > +# > +# 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. > +# > +# This program is distributed in the hope that it would 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, write the Free Software Foundation, > +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > +#----------------------------------------------------------------------- > + > +seq=`basename "$0"` > +seqres="$RESULT_DIR/$seq" > +echo "QA output created by $seq" > + > +here=`pwd` > +tmp=/tmp/$$ > +status=1 # failure is the default! > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + > +_cleanup() > +{ > + cd / > + rm -rf "$tmp".* > +} > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > +. ./common/attr Seems this is not needed. > +. ./common/reflink > + > +# real QA test starts here > +_supported_os Linux > +_require_scratch > +_require_xfs_scratch_rmapbt > +_require_scratch_reflink > +_require_test_program "punch-alternating" > + > +rm -f "$seqres.full" > + > +echo "+ create scratch fs" > +_scratch_mkfs > "$seqres.full" 2>&1 > + > +echo "+ mount fs image" > +_scratch_mount > +blksz="$(stat -f $SCRATCH_MNT -c '%S')" > +isize=$(xfs_info $SCRATCH_MNT | grep isize | sed -e 's/^.*isize=\([0-9]*\).*$/\1/g') We usually get isize from the output of _filter_mkfs, e.g. _scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null . $tmp.mkfs Then all mkfs info is set accordingly, including $isize But in this test, isize is got but not used. Remove the line? > + > +bt_ptrs=$(( (blksz - 56) / 44 )) > +bt_recs=$(( (blksz - 56) / 24 )) > + > +blocks=$((bt_ptrs * bt_recs + 1)) > +_require_fs_space $SCRATCH_MNT $(( (2 * blocks * blksz) * 5 / 4096 )) > +len=$((blocks * blksz)) > + > +echo "+ make some files" > +$XFS_IO_PROG -f -c "falloc 0 $len" -c "pwrite -S 0x68 -b 1048576 0 $len" $SCRATCH_MNT/f1 >> $seqres.full > +$XFS_IO_PROG -f -c "falloc 0 $len" -c "pwrite -S 0x68 -b 1048576 0 $len" $SCRATCH_MNT/f2 >> $seqres.full > +./src/punch-alternating $SCRATCH_MNT/f1 >> "$seqres.full" > +./src/punch-alternating $SCRATCH_MNT/f2 >> "$seqres.full" > + > +# success, all done > +status=0 > +exit > diff --git a/tests/xfs/876.out b/tests/xfs/876.out > new file mode 100644 > index 0000000..96c1970 > --- /dev/null > +++ b/tests/xfs/876.out > @@ -0,0 +1,4 @@ > +QA output created by 876 > ++ create scratch fs > ++ mount fs image > ++ make some files > diff --git a/tests/xfs/877 b/tests/xfs/877 > new file mode 100755 > index 0000000..9700263 > --- /dev/null > +++ b/tests/xfs/877 > @@ -0,0 +1,85 @@ > +#! /bin/bash > +# FS QA Test No. 877 > +# > +# Make sure query_range returns -EINVAL if lowkey > highkey. This test failed too, is this expected (again, tested with your djwong-experimental branck kernel and xfsprogs)? [root@dhcp-66-86-11 xfstests]# diff -u tests/xfs/877.out /root/workspace/xfstests/results//xfs_reflink/xfs/877.out.bad > +# > +#----------------------------------------------------------------------- > +# Copyright (c) 2016, Oracle and/or its affiliates. All Rights Reserved. > +# > +# 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. > +# > +# This program is distributed in the hope that it would 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, write the Free Software Foundation, > +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > +#----------------------------------------------------------------------- > + > +seq=`basename "$0"` > +seqres="$RESULT_DIR/$seq" > +echo "QA output created by $seq" > + > +here=`pwd` > +tmp=/tmp/$$ > +status=1 # failure is the default! > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + > +_cleanup() > +{ > + cd / > + rm -rf "$tmp".* $metadump_file > +} > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > +. ./common/attr Seems this is not needed. > + > +# real QA test starts here > +_supported_os Linux _supported_fs xfs > +_require_xfs_scratch_rmapbt _require_xfs_io_command commands used in this test? e.g. falloc, fpunch, fcollapse and finsert And '_require_command "$XFS_DB_PROG" "xfs_db"' > + > +rm -f "$seqres.full" > + > +echo "Format and mount" > +_scratch_mkfs > "$seqres.full" 2>&1 > +_scratch_mount > +blksz=65536 > +blocks=16 > +len=$((blocks * blksz)) > + > +echo "Create some files" > +$XFS_IO_PROG -f -c "falloc 0 $len" -c "pwrite -S 0x68 -b 1048576 0 $len" $SCRATCH_MNT/f1 >> $seqres.full > + > +echo "Manipulate file" > +$XFS_IO_PROG -c "fpunch $blksz $blksz" \ > + -c "fzero $((3 * blksz)) $blksz" \ > + -c "pwrite -S 0x69 $((5 * blksz)) $blksz" \ > + -c "fpunch $((7 * blksz)) $blksz" \ > + -c "fsync" \ > + -c "pwrite -S 0x70 $((7 * blksz)) $blksz" \ > + -c "fcollapse $((9 * blksz)) $blksz" \ > + -c "finsert $((10 * blksz)) $blksz" $SCRATCH_MNT/f1 >> $seqres.full > + > +echo "Check file" > +md5sum $SCRATCH_MNT/f1 | _filter_scratch > +od -tx1 -Ad -c $SCRATCH_MNT/f1 >> $seqres.full > + > +echo "Unmount" > +_scratch_unmount > + > +echo "Try a regular fsmap" > +$XFS_DB_PROG -c 'fsmap' $SCRATCH_DEV >> $seqres.full > +$XFS_DB_PROG -c 'fsmap 0 5' $SCRATCH_DEV >> $seqres.full > + > +echo "Try a bad fsmap" > +$XFS_DB_PROG -c 'fsmap 5 4' $SCRATCH_DEV > + > +# success, all done > +status=0 > +exit > diff --git a/tests/xfs/877.out b/tests/xfs/877.out > new file mode 100644 > index 0000000..4a2242f > --- /dev/null > +++ b/tests/xfs/877.out > @@ -0,0 +1,10 @@ > +QA output created by 877 > +Format and mount > +Create some files > +Manipulate file > +Check file > +e45c5707fcf6817e914ffb6ce37a0ac7 SCRATCH_MNT/f1 > +Unmount > +Try a regular fsmap > +Try a bad fsmap > +Error 22 while querying fsmap btree. > diff --git a/tests/xfs/group b/tests/xfs/group > index 16f7947..f81f899 100644 > --- a/tests/xfs/group > +++ b/tests/xfs/group > @@ -3,8 +3,8 @@ > 003 db auto quick > 004 db auto quick > 005 auto quick > -007 auto quota quick > 006 auto quick mount > +007 auto quota quick This is already fixed in upstream, not needed. Thanks, Eryu > 008 rw ioctl auto quick > 009 rw ioctl auto prealloc quick > 010 auto quick repair > @@ -309,3 +309,5 @@ > 873 auto quick clone fsr > 874 auto quick clone fsr > 875 auto quick clone fsr quota > +876 auto quick rmap clone > +877 auto quick rmap clone > --- tests/xfs/877.out 2016-08-08 16:22:35.151000000 +0800 +++ /root/workspace/xfstests/results//xfs_reflink/xfs/877.out.bad 2016-08-08 16:23:12.405000000 +0800 @@ -7,4 +7,3 @@ Unmount Try a regular fsmap Try a bad fsmap -Error 22 while querying fsmap btree.