From patchwork Wed May 17 12:04:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 9730969 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 E04F860363 for ; Wed, 17 May 2017 12:04:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7F3E201BD for ; Wed, 17 May 2017 12:04:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAB07205A4; Wed, 17 May 2017 12:04:14 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D88CA201BD for ; Wed, 17 May 2017 12:04:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751445AbdEQMEN (ORCPT ); Wed, 17 May 2017 08:04:13 -0400 Received: from mx2.suse.de ([195.135.220.15]:33396 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751300AbdEQMEM (ORCPT ); Wed, 17 May 2017 08:04:12 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 7570CAAF2; Wed, 17 May 2017 12:04:11 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id B14F61E34E2; Wed, 17 May 2017 14:04:08 +0200 (CEST) From: Jan Kara To: fstests@vger.kernel.org Cc: Eryu Guan , Jan Kara Subject: [PATCH v4] generic/435: Add more SEEK_HOLE tests Date: Wed, 17 May 2017 14:04:05 +0200 Message-Id: <20170517120405.2424-1-jack@suse.cz> X-Mailer: git-send-email 2.12.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add tests for bugs found in ext4 & xfs SEEK_HOLE implementations fixed by following patches: xfs: Fix missed holes in SEEK_HOLE implementation ext4: Fix SEEK_HOLE We add tests to seek_sanity_test as it is easiest to reuse its infrastructure for seek tests, however not to regress generic/285 which uses seek_sanity_test we don't run new tests by default. Instead we add options to select a range of tests to run and run new tests from new generic/435 test. Signed-off-by: Jan Kara --- src/seek_sanity_test.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++++- tests/generic/435 | 63 +++++++++++++ tests/generic/435.out | 2 + tests/generic/group | 1 + 4 files changed, 303 insertions(+), 5 deletions(-) create mode 100755 tests/generic/435 create mode 100644 tests/generic/435.out Changes since v3: * Add one more testcase * Address comments from Eryu Changes since v2: * Add buggy testcase found by Brian diff --git a/src/seek_sanity_test.c b/src/seek_sanity_test.c index a6dd48cc257b..1685354fc0d2 100644 --- a/src/seek_sanity_test.c +++ b/src/seek_sanity_test.c @@ -246,6 +246,201 @@ out: } /* + * test file with unwritten extents, having non-contiguous dirty pages in + * the unwritten extent. + */ +static int test16(int fd, int testnum) +{ + int ret = 0; + char *buf = NULL; + int bufsz = sysconf(_SC_PAGE_SIZE); + int filsz = 4 << 20; + + /* HOLE - unwritten DATA in dirty page */ + /* Each unit is bufsz */ + buf = do_malloc(bufsz); + if (!buf) + goto out; + memset(buf, 'a', bufsz); + + /* preallocate 4M space to file */ + ret = do_fallocate(fd, 0, filsz, 0); + if (ret < 0) { + /* Report success if fs doesn't support fallocate */ + if (errno == EOPNOTSUPP) { + fprintf(stdout, "Test skipped as fs doesn't support fallocate.\n"); + ret = 0; + } + goto out; + } + + ret = do_pwrite(fd, buf, bufsz, 0); + if (ret) + goto out; + + ret = do_pwrite(fd, buf, bufsz, filsz/2); + if (ret) + goto out; + + /* offset at the beginning */ + ret += do_lseek(testnum, 1, fd, filsz, SEEK_HOLE, 0, bufsz); + ret += do_lseek(testnum, 2, fd, filsz, SEEK_HOLE, 1, bufsz); + ret += do_lseek(testnum, 3, fd, filsz, SEEK_DATA, 0, 0); + ret += do_lseek(testnum, 4, fd, filsz, SEEK_DATA, 1, 1); + ret += do_lseek(testnum, 5, fd, filsz, SEEK_DATA, bufsz, filsz/2); + ret += do_lseek(testnum, 6, fd, filsz, SEEK_HOLE, filsz/2, + filsz/2 + bufsz); + +out: + do_free(buf); + return ret; +} + +/* + * test file with unwritten extents, having page just after end of unwritten + * extent. + */ +static int test15(int fd, int testnum) +{ + int ret = 0; + char *buf = NULL; + int bufsz = sysconf(_SC_PAGE_SIZE); + int filsz = 4 << 20; + + /* HOLE - unwritten DATA in dirty page */ + /* Each unit is bufsz */ + buf = do_malloc(bufsz); + if (!buf) + goto out; + memset(buf, 'a', bufsz); + + /* preallocate 4M space to file */ + ret = do_fallocate(fd, 0, filsz, 0); + if (ret < 0) { + /* Report success if fs doesn't support fallocate */ + if (errno == EOPNOTSUPP) { + fprintf(stdout, "Test skipped as fs doesn't support fallocate.\n"); + ret = 0; + } + goto out; + } + + ret = do_pwrite(fd, buf, bufsz, 0); + if (ret) + goto out; + + /* One page written just after end of unwritten extent... */ + ret = do_pwrite(fd, buf, bufsz, filsz); + if (ret) + goto out; + + /* offset at the beginning */ + ret += do_lseek(testnum, 1, fd, filsz, SEEK_HOLE, 0, bufsz); + ret += do_lseek(testnum, 2, fd, filsz, SEEK_HOLE, 1, bufsz); + ret += do_lseek(testnum, 3, fd, filsz, SEEK_DATA, 0, 0); + ret += do_lseek(testnum, 4, fd, filsz, SEEK_DATA, 1, 1); + ret += do_lseek(testnum, 5, fd, filsz, SEEK_DATA, bufsz, filsz); + +out: + do_free(buf); + return ret; +} + +/* + * test file with unwritten extents, only have pagevec worth of dirty pages + * in page cache, a hole and then another page. + */ +static int test14(int fd, int testnum) +{ + int ret = 0; + char *buf = NULL; + int bufsz = sysconf(_SC_PAGE_SIZE) * 14; + int filsz = 4 << 20; + + /* HOLE - unwritten DATA in dirty page */ + /* Each unit is bufsz */ + buf = do_malloc(bufsz); + if (!buf) + goto out; + memset(buf, 'a', bufsz); + + /* preallocate 4M space to file */ + ret = do_fallocate(fd, 0, filsz, 0); + if (ret < 0) { + /* Report success if fs doesn't support fallocate */ + if (errno == EOPNOTSUPP) { + fprintf(stdout, "Test skipped as fs doesn't support fallocate.\n"); + ret = 0; + } + goto out; + } + + ret = do_pwrite(fd, buf, bufsz, 0); + if (ret) + goto out; + + ret = do_pwrite(fd, buf, bufsz, 3 * bufsz); + if (ret) + goto out; + + /* offset at the beginning */ + ret += do_lseek(testnum, 1, fd, filsz, SEEK_HOLE, 0, bufsz); + ret += do_lseek(testnum, 2, fd, filsz, SEEK_HOLE, 1, bufsz); + ret += do_lseek(testnum, 3, fd, filsz, SEEK_HOLE, 3 * bufsz, 4 * bufsz); + ret += do_lseek(testnum, 4, fd, filsz, SEEK_DATA, 0, 0); + ret += do_lseek(testnum, 5, fd, filsz, SEEK_DATA, 1, 1); + ret += do_lseek(testnum, 6, fd, filsz, SEEK_DATA, bufsz, 3 * bufsz); + +out: + do_free(buf); + return ret; +} + +/* + * test file with unwritten extents, only have pagevec worth of dirty pages + * in page cache. + */ +static int test13(int fd, int testnum) +{ + int ret = 0; + char *buf = NULL; + int bufsz = sysconf(_SC_PAGE_SIZE) * 14; + int filsz = 4 << 20; + + /* HOLE - unwritten DATA in dirty page */ + /* Each unit is bufsz */ + buf = do_malloc(bufsz); + if (!buf) + goto out; + memset(buf, 'a', bufsz); + + /* preallocate 4M space to file */ + ret = do_fallocate(fd, 0, filsz, 0); + if (ret < 0) { + /* Report success if fs doesn't support fallocate */ + if (errno == EOPNOTSUPP) { + fprintf(stdout, "Test skipped as fs doesn't support fallocate.\n"); + ret = 0; + } + goto out; + } + + ret = do_pwrite(fd, buf, bufsz, 0); + if (ret) + goto out; + + /* offset at the beginning */ + ret += do_lseek(testnum, 1, fd, filsz, SEEK_HOLE, 0, bufsz); + ret += do_lseek(testnum, 2, fd, filsz, SEEK_HOLE, 1, bufsz); + ret += do_lseek(testnum, 3, fd, filsz, SEEK_DATA, 0, 0); + ret += do_lseek(testnum, 4, fd, filsz, SEEK_DATA, 1, 1); + +out: + do_free(buf); + return ret; +} + +/* * Test huge file to check for overflows of block counts due to usage of * 32-bit types. */ @@ -678,6 +873,10 @@ struct testrec seek_tests[] = { { 10, test10, "Test a huge file for offset overflow" }, { 11, test11, "Test a huge file for block number signed" }, { 12, test12, "Test a huge file for block number overflow" }, + { 13, test13, "Test file with unwritten extents, only have pagevec dirty pages" }, + { 14, test14, "Test file with unwritten extents, small hole after pagevec dirty pages" }, + { 15, test15, "Test file with unwritten extents, page after unwritten extent" }, + { 16, test16, "Test file with unwritten extents, non-contiguous dirty pages" }, }; static int run_test(struct testrec *tr) @@ -786,7 +985,7 @@ out: void usage(char *cmd) { - fprintf(stdout, "Usage: %s [-t] base_file_path\n", cmd); + fprintf(stdout, "Usage: %s [-t] [-s ] [-e ] base_file_path\n", cmd); exit(1); } @@ -797,12 +996,37 @@ int main(int argc, char **argv) int opt; int check_support = 0; int numtests = sizeof(seek_tests) / sizeof(struct testrec); + int teststart, testend; - while ((opt = getopt(argc, argv, "t")) != -1) { + /* + * First twelve tests are used by generic/285. To run these is the + * default. Further tests are run e.g. by generic/435. They are not + * run by default in order to not regress older kernels. + */ + teststart = 1; + testend = 12; + + while ((opt = getopt(argc, argv, "ts:e:")) != -1) { switch (opt) { case 't': check_support++; break; + case 's': + teststart = strtol(optarg, NULL, 10); + if (teststart <= 0 || teststart > numtests) { + fprintf(stdout, "Invalid starting test: %s\n", + optarg); + usage(argv[0]); + } + break; + case 'e': + testend = strtol(optarg, NULL, 10); + if (testend <= 0 || testend > numtests) { + fprintf(stdout, "Invalid final test: %s\n", + optarg); + usage(argv[0]); + } + break; default: usage(argv[0]); } @@ -812,6 +1036,11 @@ int main(int argc, char **argv) if (optind != argc - 1) usage(argv[0]); + if (teststart > testend) { + fprintf(stdout, "Starting test is larger than final test!\n"); + usage(argv[0]); + } + base_file_path = (char *)strdup(argv[optind]); ret = test_basic_support(); @@ -819,9 +1048,12 @@ int main(int argc, char **argv) goto out; for (i = 0; i < numtests; ++i) { - ret = run_test(&seek_tests[i]); - if (ret) - break; + if (seek_tests[i].test_num >= teststart && + seek_tests[i].test_num <= testend) { + ret = run_test(&seek_tests[i]); + if (ret) + break; + } } out: diff --git a/tests/generic/435 b/tests/generic/435 new file mode 100755 index 000000000000..73b8f1c7ffbe --- /dev/null +++ b/tests/generic/435 @@ -0,0 +1,63 @@ +#! /bin/bash +# FS QA Test No. 435 +# +# More SEEK_DATA/SEEK_HOLE sanity tests. +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 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 + +_require_test_program "seek_sanity_test" + +# Disable extent zeroing for ext4 as that change where holes are created +if [ "$FSTYP" = "ext4" ]; then + DEV=`_short_dev $TEST_DEV` + echo 0 >/sys/fs/ext4/$DEV/extent_max_zeroout_kb +fi + +_cleanup() +{ + rm -f $BASE_TEST_FILE.* +} + +$here/src/seek_sanity_test -s 13 -e 16 $BASE_TEST_FILE > $seqres.full 2>&1 || + _fail "seek sanity check failed!" + +# success, all done +echo "Silence is golden" +status=0 +exit diff --git a/tests/generic/435.out b/tests/generic/435.out new file mode 100644 index 000000000000..6a175d314246 --- /dev/null +++ b/tests/generic/435.out @@ -0,0 +1,2 @@ +QA output created by 435 +Silence is golden diff --git a/tests/generic/group b/tests/generic/group index 9fc7f9d419a8..c6628d97af76 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -432,3 +432,4 @@ 427 auto quick aio rw 428 auto quick 429 auto encrypt +435 auto quick rw