From patchwork Wed Apr 3 05:59:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10882863 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 886AD17E9 for ; Wed, 3 Apr 2019 05:59:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5534C28641 for ; Wed, 3 Apr 2019 05:59:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43578286A1; Wed, 3 Apr 2019 05:59:40 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,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 A1DD628641 for ; Wed, 3 Apr 2019 05:59:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728774AbfDCF7j (ORCPT ); Wed, 3 Apr 2019 01:59:39 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38917 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726330AbfDCF7i (ORCPT ); Wed, 3 Apr 2019 01:59:38 -0400 Received: by mail-wm1-f65.google.com with SMTP id n25so6524031wmk.4; Tue, 02 Apr 2019 22:59:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=h9iIhmeoRhAlpGT2LFzqybn5aDwcyACSdQsChANgadQ=; b=tbiO0VQnq6sIiWS2JFejuM9Zv69lANMIIOGxWtDOq7MOD3e/CinJepYpcWlbbUcERk tAoW6PD2Rd0VTHQU71LQhrshID8UZW/ltOnmRVjsMYaqYGkiTMPbsDOWkB9ty2N17/6G cA84gE5mCru2JXkczkszOsO+cdWGFap4KW4xr+eooLcsPr9rPpiq11so2cHl5KDNE1Yk XZyI7LpCjWlJ81gv+RaD7TLFkLwKqUCNaR5CY7KJzD8dIBG1BTXnY8PRq0uok1MhEfQk 4UO7wZan41AM1QbBoeD330y0e3TmCLSWcdLnLRsIMGLW2/7SRn2a8z/39hKO2dLkEcbr kIaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=h9iIhmeoRhAlpGT2LFzqybn5aDwcyACSdQsChANgadQ=; b=si86k969BAjtipc51Dmk+AB2PakQFktusXbkGsKOdH4LQ3vFb/ggxg6poI2RaOqapB IK5zU0F3EoabmnUvYIs5hFmsVBB/gqIvb5b6kJ5Dgdf3l8Vp4m8MoK9RSyFx55MQOxSG vyGT5noe1rvH4lEt3y3GFprtUWJyNJEXxflOp5x2RWeDTHQpgnpDPwzYdwsBpOZzi1fb c5JV5QNKFg4sZNnfK1yZcKAcgalLrcrAXQxTsQFTr17l7dB7r6eXqG7xGHGLeknJRrlP 5v6+CiJt8qSuddUAZ4+6nEVI7e5wPgRV90EI8Qx1MyjjNdgY4ME/e8IzuYU5EdZeX0wk mftw== X-Gm-Message-State: APjAAAU9rPT03c/T3LsOtwEbDUK3Hy5oVTxlmIERgqykvkCk1kyhskz0 khSc9h41sEuqvrxIaEo7erw= X-Google-Smtp-Source: APXvYqxQOmzrk3pF+Xq9UqbOOgOC4NeTNAtkpHzkIIuZZ3e4/o9Dg6DvCForr0Bj5Q1kNXA5K68uKA== X-Received: by 2002:a1c:d7:: with SMTP id 206mr586167wma.69.1554271176054; Tue, 02 Apr 2019 22:59:36 -0700 (PDT) Received: from amir-VirtualBox.ctera.local ([5.102.238.208]) by smtp.gmail.com with ESMTPSA id c18sm11757554wmk.47.2019.04.02.22.59.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 22:59:35 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , Eddie Horng , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v3 1/2] fstests: Add more sanity to seek_sanity_test Date: Wed, 3 Apr 2019 08:59:25 +0300 Message-Id: <20190403055926.23253-1-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP seek_sanity_test checks for one of several SEEK_DATA/HOLE behaviors and allows for the default behavior of filesystems, where SEEK_HOLE always returns EOF. This means that if filesystem has a regression in finding holes, the sanity test won't catch it. And indeed this regression happened in overlayfs on kernel v4.19 and went unnoticed. To improve test coverage, add a flag -f to seek_sanity_test to indicate that the default behavior is not acceptable. Whitelist all filesystem types that are expected to detect holes and use wrapper when invoking seek_sanity_test to add the -f flag to those filesystems. Overlayfs inherits expected behavior from base fs type. Signed-off-by: Amir Goldstein Acked-by: Darrick J. Wong --- Eryu, Sorry for the delay. Changes per your v2 review. Amir. Changes from v2: - Rename helper to _fstyp_has_non_default_seek_data_hole - Clarify documentation and error message - Skip new test (seek to punched hole) on default_behavior common/rc | 47 ++++++++++++++++++++++++++++++++++++++++++ src/seek_sanity_test.c | 14 +++++++++++-- tests/generic/285 | 2 +- tests/generic/436 | 2 +- tests/generic/445 | 2 +- tests/generic/448 | 2 +- tests/generic/490 | 2 +- 7 files changed, 64 insertions(+), 7 deletions(-) diff --git a/common/rc b/common/rc index 1c42515f..7b292321 100644 --- a/common/rc +++ b/common/rc @@ -2298,6 +2298,53 @@ _ext4_disable_extent_zeroout() echo 0 >/sys/fs/ext4/$sdev/extent_max_zeroout_kb } +# The default behavior of SEEK_HOLE is to always return EOF. +# Filesystems that implement non-default behavior return the offset +# of holes with SEEK_HOLE. There is no way to query the filesystem +# of which behavior it is implementing. +# We use this whitelist FSTYP, to set expectation and avoid silent +# regression of filesystem seek hole behavior. +# +# Return 0 for true +_fstyp_has_non_default_seek_data_hole() +{ + if [ -z $1 ]; then + local fstyp=$FSTYP + else + local fstyp=$1 + fi + + case "$fstyp" in + btrfs|ext4|xfs|ceph|cifs|f2fs|gfs2|nfs*|ocfs2|tmpfs) + return 0 + ;; + overlay) + if [ ! -z $OVL_BASE_FSTYP -a $OVL_BASE_FSTYP != "overlay" ]; then + _fstyp_has_non_default_seek_data_hole $OVL_BASE_FSTYP + return $? + else + # Assume that base fs has default behavior + return 1 + fi + ;; + *) + # by default fstyp has default SEEK_HOLE behavior; + # if your fs has non-default behavior, add it to whitelist above! + return 1 + ;; + esac +} + +# Run seek sanity test with predefined expectation for SEEK_DATA/HOLE behavior +_run_seek_sanity_test() +{ + local testseekargs + if _fstyp_has_non_default_seek_data_hole; then + testseekargs+="-f" + fi + $here/src/seek_sanity_test $testseekargs $* +} + # Check if the file system supports seek_data/hole _require_seek_data_hole() { diff --git a/src/seek_sanity_test.c b/src/seek_sanity_test.c index e9938d1b..a6bda0b1 100644 --- a/src/seek_sanity_test.c +++ b/src/seek_sanity_test.c @@ -23,6 +23,7 @@ #endif static blksize_t alloc_size; +int allow_default_behavior = 1; int default_behavior = 0; int unwritten_extents = 0; char *base_file_path; @@ -1119,6 +1120,12 @@ static int test_basic_support(void) fprintf(stderr, "File system supports the default behavior.\n"); } + if (default_behavior && !allow_default_behavior) { + fprintf(stderr, "Default behavior is not allowed. Aborting.\n"); + ret = -1; + goto out; + } + ftruncate(fd, 0); if (fallocate(fd, 0, 0, alloc_size) == -1) { if (errno == EOPNOTSUPP) @@ -1148,7 +1155,7 @@ out: void usage(char *cmd) { - fprintf(stdout, "Usage: %s [-t] [-s ] [-e ] base_file_path\n", cmd); + fprintf(stdout, "Usage: %s [-tf] [-s ] [-e ] base_file_path\n", cmd); exit(1); } @@ -1169,11 +1176,14 @@ int main(int argc, char **argv) teststart = 1; testend = 12; - while ((opt = getopt(argc, argv, "ts:e:")) != -1) { + while ((opt = getopt(argc, argv, "tfs:e:")) != -1) { switch (opt) { case 't': check_support++; break; + case 'f': + allow_default_behavior = 0; + break; case 's': teststart = strtol(optarg, NULL, 10); if (teststart <= 0 || teststart > numtests) { diff --git a/tests/generic/285 b/tests/generic/285 index b53b3acc..20e89e5b 100755 --- a/tests/generic/285 +++ b/tests/generic/285 @@ -37,7 +37,7 @@ _cleanup() eval "rm -f $BASE_TEST_FILE.*" } -$here/src/seek_sanity_test $BASE_TEST_FILE > $seqres.full 2>&1 || +_run_seek_sanity_test $BASE_TEST_FILE > $seqres.full 2>&1 || _fail "seek sanity check failed!" # success, all done diff --git a/tests/generic/436 b/tests/generic/436 index a3ef70e5..ada60b2e 100755 --- a/tests/generic/436 +++ b/tests/generic/436 @@ -36,7 +36,7 @@ _cleanup() rm -f $tmp.* $BASE_TEST_FILE.* } -$here/src/seek_sanity_test -s 13 -e 16 $BASE_TEST_FILE > $seqres.full 2>&1 || +_run_seek_sanity_test -s 13 -e 16 $BASE_TEST_FILE > $seqres.full 2>&1 || _fail "seek sanity check failed!" # success, all done diff --git a/tests/generic/445 b/tests/generic/445 index 694913ae..248f321b 100755 --- a/tests/generic/445 +++ b/tests/generic/445 @@ -36,7 +36,7 @@ _cleanup() rm -f $tmp.* $BASE_TEST_FILE.* } -$here/src/seek_sanity_test -s 17 -e 17 $BASE_TEST_FILE > $seqres.full 2>&1 || +_run_seek_sanity_test -s 17 -e 17 $BASE_TEST_FILE > $seqres.full 2>&1 || _fail "seek sanity check failed!" # success, all done diff --git a/tests/generic/448 b/tests/generic/448 index d3ec5528..dada499b 100755 --- a/tests/generic/448 +++ b/tests/generic/448 @@ -34,7 +34,7 @@ BASE_TEST_FILE=$TEST_DIR/seek_sanity_testfile_$seq _require_test_program "seek_sanity_test" -$here/src/seek_sanity_test -s 18 -e 18 $BASE_TEST_FILE > $seqres.full 2>&1 || +_run_seek_sanity_test -s 18 -e 18 $BASE_TEST_FILE > $seqres.full 2>&1 || _fail "seek sanity check failed!" _check_dmesg diff --git a/tests/generic/490 b/tests/generic/490 index 330c2b60..07b08939 100755 --- a/tests/generic/490 +++ b/tests/generic/490 @@ -39,7 +39,7 @@ _cleanup() rm -f $base_test_file* } -$here/src/seek_sanity_test -s 19 -e 20 $base_test_file > $seqres.full 2>&1 || +_run_seek_sanity_test -s 19 -e 20 $base_test_file > $seqres.full 2>&1 || _fail "seek sanity check failed!" # success, all done