diff options
author | Jan Kara <jack@suse.cz> | 2018-05-14 11:47:07 +0200 |
---|---|---|
committer | Eryu Guan <guaneryu@gmail.com> | 2018-05-16 10:48:57 +0800 |
commit | 5761a6eaade207e05f06ba1cad90bdf087cbb4d3 (patch) | |
tree | b6f6d6487db75c5e6d87343246fe6587bfd7fcfb | |
parent | fd0607faf23412cdca43a7325a56e0c92af577d4 (diff) | |
download | xfstests-dev-5761a6eaade207e05f06ba1cad90bdf087cbb4d3.tar.gz |
generic: Add SEEK_DATA tests for offsets in the middle of holes
ext4 had a bug for files with indirect extents where it wrongly
reported a size of a hole in some cases and thus SEEK_DATA
implementation could skip some data in a file. Test for that. The
problem is fixed by patch "ext4: Fix hole length detection in
ext4_ind_map_blocks()".
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
-rw-r--r-- | src/seek_sanity_test.c | 71 | ||||
-rwxr-xr-x | tests/generic/490 | 60 | ||||
-rw-r--r-- | tests/generic/490.out | 1 | ||||
-rw-r--r-- | tests/generic/group | 1 |
4 files changed, 133 insertions, 0 deletions
diff --git a/src/seek_sanity_test.c b/src/seek_sanity_test.c index e82cb1f786..9245464400 100644 --- a/src/seek_sanity_test.c +++ b/src/seek_sanity_test.c @@ -274,6 +274,75 @@ out: return ret; } +/* + * Make sure hole size is properly reported when starting in the middle of a + * hole in ext? doubly indirect tree + */ +static int test20(int fd, int testnum) +{ + int ret = -1; + char *buf = NULL; + loff_t bufsz, filsz; + + bufsz = alloc_size; + buf = do_malloc(bufsz); + if (!buf) + goto out; + memset(buf, 'a', bufsz); + + /* Magic size in the middle of ext[23] triple indirect tree */ + filsz = (12 + bufsz / 4 + 8 * bufsz / 4 * bufsz / 4 + 2 * bufsz / 4 + 5) * bufsz; + ret = do_pwrite(fd, buf, bufsz, filsz - bufsz); + if (ret) + goto out; + + /* Offset inside ext[23] indirect block */ + ret += do_lseek(testnum, 1, fd, filsz, SEEK_DATA, 14 * bufsz, filsz - bufsz); + /* Offset inside ext[23] doubly indirect block */ + ret += do_lseek(testnum, 2, fd, filsz, SEEK_DATA, (12 + 2 * bufsz / 4) * bufsz, filsz - bufsz); + /* Offsets inside ext[23] triply indirect block */ + ret += do_lseek(testnum, 3, fd, filsz, SEEK_DATA, + (12 + bufsz / 4 + bufsz / 4 * bufsz / 4 + 3 * bufsz / 4 + 5) * bufsz, filsz - bufsz); + ret += do_lseek(testnum, 3, fd, filsz, SEEK_DATA, + (12 + bufsz / 4 + 7 * bufsz / 4 * bufsz / 4 + 5 * bufsz / 4) * bufsz, filsz - bufsz); + ret += do_lseek(testnum, 3, fd, filsz, SEEK_DATA, + (12 + bufsz / 4 + 8 * bufsz / 4 * bufsz / 4 + bufsz / 4 + 11) * bufsz, filsz - bufsz); +out: + if (buf) + free(buf); + return ret; +} +/* + * Make sure hole size is properly reported when starting in the middle of a + * hole in ext? indirect tree + */ +static int test19(int fd, int testnum) +{ + int ret = -1; + char *buf = NULL; + int bufsz, filsz; + + bufsz = alloc_size; + buf = do_malloc(bufsz); + if (!buf) + goto out; + memset(buf, 'a', bufsz); + + /* Magic size just beyond ext[23] indirect tree size */ + filsz = (12 + bufsz / 4 + 1) * bufsz; + ret = do_pwrite(fd, buf, bufsz, filsz - bufsz); + if (ret) + goto out; + + ret += do_lseek(testnum, 1, fd, filsz, SEEK_DATA, bufsz, filsz - bufsz); + ret += do_lseek(testnum, 2, fd, filsz, SEEK_DATA, 12*bufsz, filsz - bufsz); + ret += do_lseek(testnum, 3, fd, filsz, SEEK_DATA, (12 + bufsz / 4 - 8)*bufsz, filsz - bufsz); +out: + if (buf) + free(buf); + return ret; +} + /* Make sure we get ENXIO if we pass in a negative offset. */ static int test18(int fd, int testnum) { @@ -982,6 +1051,8 @@ struct testrec seek_tests[] = { { 16, test16, "Test file with unwritten extents, non-contiguous dirty pages" }, { 17, test17, "Test file with unwritten extents, data-hole-data inside page" }, { 18, test18, "Test file with negative SEEK_{HOLE,DATA} offsets" }, + { 19, test19, "Test file SEEK_DATA from middle of a large hole" }, + { 20, test20, "Test file SEEK_DATA from middle of a huge hole" }, }; static int run_test(struct testrec *tr) diff --git a/tests/generic/490 b/tests/generic/490 new file mode 100755 index 0000000000..b5042c2ebc --- /dev/null +++ b/tests/generic/490 @@ -0,0 +1,60 @@ +#! /bin/bash +# FS QA Test No. 490 +# +# Check that SEEK_DATA works properly for offsets in the middle of large holes. +# This was broken for ext4 with indirect-block based files and this test checks +# for that. The problem has been fixed by commit 2ee3ee06a8fd79 "ext4: fix hole +# length detection in ext4_ind_map_blocks()" +# +#----------------------------------------------------------------------- +# Copyright (c) 2018 SUSE. 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` +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +_supported_fs generic +_supported_os Linux + +_require_test +_require_seek_data_hole + +base_test_file=$TEST_DIR/seek_sanity_testfile.$seq + +_require_test_program "seek_sanity_test" + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +$here/src/seek_sanity_test -s 19 -e 20 $base_test_file > $seqres.full 2>&1 || + _fail "seek sanity check failed!" + +# success, all done +status=0 +exit diff --git a/tests/generic/490.out b/tests/generic/490.out new file mode 100644 index 0000000000..2118d4db47 --- /dev/null +++ b/tests/generic/490.out @@ -0,0 +1 @@ +QA output created by 490 diff --git a/tests/generic/group b/tests/generic/group index f00b423014..864491796b 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -492,3 +492,4 @@ 487 auto quick 488 auto quick 489 auto quick attr +490 auto quick rw |