From patchwork Sun Mar 3 15:09:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10837061 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 D2FB61390 for ; Sun, 3 Mar 2019 15:09:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE58D2A1D9 for ; Sun, 3 Mar 2019 15:09:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF9732A1DC; Sun, 3 Mar 2019 15:09:50 +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 166282A1D9 for ; Sun, 3 Mar 2019 15:09:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726228AbfCCPJt (ORCPT ); Sun, 3 Mar 2019 10:09:49 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:32800 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726189AbfCCPJt (ORCPT ); Sun, 3 Mar 2019 10:09:49 -0500 Received: by mail-wm1-f65.google.com with SMTP id c13so2183496wmb.0; Sun, 03 Mar 2019 07:09:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=sLNwiOcQ3SEyY6Ts/ArK+3GSiIbJtfmWff1bEaOklLM=; b=HPHMPDlS0xxOo0EEsPaSw8bMHxw0SnWbYotehc161iNlTLoK8RwTydxTzBeOkyMh8i CbzK4pzj57ykQsOhIrgPojpisUm+jAqDC4UTzOGygiovvPfQIra43oSHZNlGnaNlO4LM cjqYvIURPEIZekp9xqvQmTLdjAA/4HpeqDhNnPRgIfblhWwWKye1FR6pr4OWqWS1Nbol nhJTPLG8iycMsFj+tU7QeCFc/J7pg2ml9flUnZaWlNyOIdJiUkNv1+XqvbEMF6q1m8uk GbK7sWJxd36Z2UlxmkpVjr+IhYCjqmkqYCk7Wr3AfkdMgBv7k4qha4t2CE1+bY+Popkq 2SfQ== 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=sLNwiOcQ3SEyY6Ts/ArK+3GSiIbJtfmWff1bEaOklLM=; b=NdtsnwcqlNvLl6Itmx5/I9SlfKQJxhXkjccnFVyFQMl6PQ6nIBRRewY22/ougQJaE3 pxMc/Bhum/eJcQvJBvuxW+hELTJ97UiVRiNXBTbJyjwRF4EI7UlYcbfpqit/HSynLmKk rO+/kt6NkQT7gTdqTwr1Vj62DKXhUrb8IfUmrvEtA8dZsrlJgJG1q7SFmfKWkaPWrTvh CD0Jb5AyrkDxiFePxDIZ9c1j8Y7kNyQuzIzo3BII1bQplT5hPoV5+P7hLxWcRDePH4GU A+3/NHgraUDXnyyli6LbuKdfCSWOKenOUdI2pDwTIpABowFt1YF/xLY38oPWEYxW2G8F thoA== X-Gm-Message-State: APjAAAXnzRTokTa+q/mHX07dSFL7SMT7fVhonpMqiw34nKABuvD4XPJQ oQwMR8Z351qQTbsFlrlcWnk= X-Google-Smtp-Source: APXvYqzNriNXz6tQ4aMPyt+fw9U1qmsZQttEDRiXRqTZpIoyh3vR/Ij2BhSa22GRRkdfQCAS8hg0pw== X-Received: by 2002:a1c:1a86:: with SMTP id a128mr4199317wma.67.1551625786551; Sun, 03 Mar 2019 07:09:46 -0800 (PST) Received: from amir-VirtualBox.ctera.local (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id b195sm3462111wmg.36.2019.03.03.07.09.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Mar 2019 07:09:45 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , Eddie Horng , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2 1/2] fstests: Add more sanity to seek_sanity_test Date: Sun, 3 Mar 2019 17:09:39 +0200 Message-Id: <20190303150940.12734-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 --- Eryu, After this change, the generic/seek group tests will start failing with overlayfs over base fs with true SEEK_HOLE support on upstream kernel. We had missing coverage of SEEK_HOLE, so we missed a regression in kernel v4.19 when overlayfs SEEK_HOLE stopped finding holes in sparse files. Thanks, Amir. Changes since v1: - Use whitelist of filesystems types that support true SEEK_HOLE instead of inferring SEEK_HOLE support from PUNCH_HOLE support - Split from patch of new PUNCH_HOLE+SEEK_HOLE test common/rc | 46 ++++++++++++++++++++++++++++++++++++++++++ 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, 63 insertions(+), 7 deletions(-) diff --git a/common/rc b/common/rc index c88c304c..d2482c20 100644 --- a/common/rc +++ b/common/rc @@ -2298,6 +2298,52 @@ _ext4_disable_extent_zeroout() echo 0 >/sys/fs/ext4/$sdev/extent_max_zeroout_kb } +# Is this filesystem type expected to support seeking and finding holes? +# filesystems without SEEK_HOLE support, accept the SEEK_HOLE argument, +# but always return EOF offset for SEEK_HOLE. +# We use this whitelist FSTYP, to set expectation and avoid silent +# regression of filesystem seek hole behavior. +# +# Return 0 for true +_fstyp_support_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_support_seek_data_hole $OVL_BASE_FSTYP + return $? + else + # Do not assume that base fs supports SEEK_HOLE + return 1 + fi + ;; + *) + # by default fstyp does not support SEEK_HOLE; + # if your fs does support SEEK_HOLE, 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_support_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..1eefc74d 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; @@ -1115,6 +1116,12 @@ static int test_basic_support(void) } if (pos == filsz) { + if (!allow_default_behavior) { + fprintf(stderr, "File syste does not support llseek(2) extension " + "SEEK_HOLE. Aborting.\n"); + ret = -1; + goto out; + } default_behavior = 1; fprintf(stderr, "File system supports the default behavior.\n"); } @@ -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