Message ID | 20170903121451.GA18274@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Sun, Sep 03, 2017 at 02:14:51PM +0200, Christoph Hellwig wrote: > Test that we correctly report shared and unshared regions in a file. > > To do so we also update _filter_bmap to include the shared flag. > > Based on a test case from Darrick Wong. Which test case is that? Mostly I'm wondering how does this differ from xfs/280? > Signed-off-by: Christoph Hellwig <hch@lst.de> > > diff --git a/common/punch b/common/punch > index c4ed261..3c400c1 100644 > --- a/common/punch > +++ b/common/punch > @@ -263,6 +263,10 @@ _filter_bmap() > print $1, $2, $3; > next; > } > + $7 ~ /1[01][01][01][01][01]/ { > + print $1, $2, "shared"; > + next; > + } > $7 ~ /1[01][01][01][01]/ { > print $1, $2, "unwritten"; > next; > diff --git a/tests/xfs/115 b/tests/xfs/115 > new file mode 100755 > index 0000000..eb456dc > --- /dev/null > +++ b/tests/xfs/115 > @@ -0,0 +1,88 @@ > +#! /bin/bash > +# FS QA Test 115 > +# > +# Check getbmap reporting for reflinked files > +# > +#----------------------------------------------------------------------- > +# Copyright (c) 2017 Christoph Hellwig. 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 > + > +file=$TEST_DIR/${seq}.file > +clone=$TEST_DIR/${seq}.clone > + > +_cleanup() > +{ > + cd / > + rm -f $tmp.* > + rm -f ${file} ${clone} > +} > + > +# get standard environment, filters and checks > +. ./common/rc > +. ./common/filter > +. ./common/reflink > +. ./common/punch > + > +# remove previous $seqres.full before test > +rm -f $seqres.full > + > +# real QA test starts here > + > +# Modify as appropriate. > +_supported_fs xfs > +_supported_os Linux > +_require_test > +_require_test_reflink > +_require_cp_reflink > + > +# write file and check extent map > +touch ${file} > +xfs_io -c 'pwrite 0 1m' \ $XFS_IO_PROG -c ... > + -c 'fsync' ${file} >/dev/null > +echo "initial file layout:" > +xfs_io -c 'bmap -elpv' ${file} | _filter_test_dir | _filter_bmap > +echo > + > +# reflink file and check for the shared bit in the extent map > +cp --reflink=always ${file} ${clone} >/dev/null _cp_reflink > +echo "layout after reflink" > +xfs_io -c 'bmap -elpv' ${file} | _filter_test_dir | _filter_bmap > +echo > + > +# break COW and check the shared split in the extent map > +xfs_io -c 'pwrite 200k 4k' \ > + -c 'pwrite 700k 4k' \ > + -c 'fsync' ${clone} | >/dev/null > +echo "layout after partial unshare:" > +xfs_io -c 'bmap -elpv' ${file} | _filter_test_dir | _filter_bmap > + > +# optional stuff if your test has verbose output to help resolve problems > +#echo > +#echo "If failure, check $seqres.full (this) and $seqres.full.ok (reference)" Unneeded...? --D > + > +# success, all done > +status=0 > +exit > diff --git a/tests/xfs/115.out b/tests/xfs/115.out > new file mode 100644 > index 0000000..45e1d3c > --- /dev/null > +++ b/tests/xfs/115.out > @@ -0,0 +1,13 @@ > +QA output created by 115 > +initial file layout: > +0: [0..2047]: data > + > +layout after reflink > +0: [0..2047]: shared > + > +layout after partial unshare: > +0: [0..399]: shared > +1: [400..407]: data > +2: [408..1399]: shared > +3: [1400..1407]: data > +4: [1408..2047]: shared > diff --git a/tests/xfs/group b/tests/xfs/group > index 5c02498..97d6eee 100644 > --- a/tests/xfs/group > +++ b/tests/xfs/group > @@ -112,6 +112,7 @@ > 112 fuzzers > 113 fuzzers > 114 auto rw dangerous > +115 auto quick ioctl clone > 116 quota auto quick > 117 fuzzers > 118 auto quick fsr dangerous > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Sep 03, 2017 at 08:54:15AM -0700, Darrick J. Wong wrote: > On Sun, Sep 03, 2017 at 02:14:51PM +0200, Christoph Hellwig wrote: > > Test that we correctly report shared and unshared regions in a file. > > > > To do so we also update _filter_bmap to include the shared flag. > > > > Based on a test case from Darrick Wong. > > Which test case is that? > > Mostly I'm wondering how does this differ from xfs/280? The one that you posted in reply to the getbmap patch. It looks like that one is similar but doesn't look at the detail shared vs unshared layout. -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/common/punch b/common/punch index c4ed261..3c400c1 100644 --- a/common/punch +++ b/common/punch @@ -263,6 +263,10 @@ _filter_bmap() print $1, $2, $3; next; } + $7 ~ /1[01][01][01][01][01]/ { + print $1, $2, "shared"; + next; + } $7 ~ /1[01][01][01][01]/ { print $1, $2, "unwritten"; next; diff --git a/tests/xfs/115 b/tests/xfs/115 new file mode 100755 index 0000000..eb456dc --- /dev/null +++ b/tests/xfs/115 @@ -0,0 +1,88 @@ +#! /bin/bash +# FS QA Test 115 +# +# Check getbmap reporting for reflinked files +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 Christoph Hellwig. 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 + +file=$TEST_DIR/${seq}.file +clone=$TEST_DIR/${seq}.clone + +_cleanup() +{ + cd / + rm -f $tmp.* + rm -f ${file} ${clone} +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/reflink +. ./common/punch + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux +_require_test +_require_test_reflink +_require_cp_reflink + +# write file and check extent map +touch ${file} +xfs_io -c 'pwrite 0 1m' \ + -c 'fsync' ${file} >/dev/null +echo "initial file layout:" +xfs_io -c 'bmap -elpv' ${file} | _filter_test_dir | _filter_bmap +echo + +# reflink file and check for the shared bit in the extent map +cp --reflink=always ${file} ${clone} >/dev/null +echo "layout after reflink" +xfs_io -c 'bmap -elpv' ${file} | _filter_test_dir | _filter_bmap +echo + +# break COW and check the shared split in the extent map +xfs_io -c 'pwrite 200k 4k' \ + -c 'pwrite 700k 4k' \ + -c 'fsync' ${clone} | >/dev/null +echo "layout after partial unshare:" +xfs_io -c 'bmap -elpv' ${file} | _filter_test_dir | _filter_bmap + +# optional stuff if your test has verbose output to help resolve problems +#echo +#echo "If failure, check $seqres.full (this) and $seqres.full.ok (reference)" + +# success, all done +status=0 +exit diff --git a/tests/xfs/115.out b/tests/xfs/115.out new file mode 100644 index 0000000..45e1d3c --- /dev/null +++ b/tests/xfs/115.out @@ -0,0 +1,13 @@ +QA output created by 115 +initial file layout: +0: [0..2047]: data + +layout after reflink +0: [0..2047]: shared + +layout after partial unshare: +0: [0..399]: shared +1: [400..407]: data +2: [408..1399]: shared +3: [1400..1407]: data +4: [1408..2047]: shared diff --git a/tests/xfs/group b/tests/xfs/group index 5c02498..97d6eee 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -112,6 +112,7 @@ 112 fuzzers 113 fuzzers 114 auto rw dangerous +115 auto quick ioctl clone 116 quota auto quick 117 fuzzers 118 auto quick fsr dangerous
Test that we correctly report shared and unshared regions in a file. To do so we also update _filter_bmap to include the shared flag. Based on a test case from Darrick Wong. Signed-off-by: Christoph Hellwig <hch@lst.de> -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html