From: Eryu Guan <guaneryu@gmail.com>
To: Amir Goldstein <amir73il@gmail.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>,
Eddie Horng <eddiehorng.tw@gmail.com>,
linux-unionfs@vger.kernel.org, fstests@vger.kernel.org
Subject: Re: [PATCH v2 2/2] generic: Test that SEEK_HOLE can find a punched hole
Date: Wed, 6 Mar 2019 20:30:31 +0800 [thread overview]
Message-ID: <20190306123031.GI2824@desktop> (raw)
In-Reply-To: <20190303150940.12734-2-amir73il@gmail.com>
On Sun, Mar 03, 2019 at 05:09:40PM +0200, Amir Goldstein wrote:
> Added a test case to seek_sanity_test and a test to run it.
>
> Signed-off-by: Amir Goldstein <amir73il@gmail.com>
> ---
>
> Changes since v1:
> - Punch hole requirement independent of SEEK_HOLE behavior.
>
> src/seek_sanity_test.c | 58 +++++++++++++++++++++++++++++++++++++++---
> tests/generic/999 | 44 ++++++++++++++++++++++++++++++++
> tests/generic/999.out | 1 +
> tests/generic/group | 1 +
> 4 files changed, 100 insertions(+), 4 deletions(-)
> create mode 100755 tests/generic/999
> create mode 100644 tests/generic/999.out
>
> diff --git a/src/seek_sanity_test.c b/src/seek_sanity_test.c
> index 1eefc74d..7da4448f 100644
> --- a/src/seek_sanity_test.c
> +++ b/src/seek_sanity_test.c
> @@ -16,6 +16,7 @@
> #include <unistd.h>
> #include <stdlib.h>
> #include <assert.h>
> +#include "global.h"
>
> #ifndef SEEK_DATA
> #define SEEK_DATA 3
> @@ -26,6 +27,7 @@ static blksize_t alloc_size;
> int allow_default_behavior = 1;
> int default_behavior = 0;
> int unwritten_extents = 0;
> +int punch_hole = 0;
> char *base_file_path;
>
> static void get_file_system(int fd)
> @@ -118,8 +120,9 @@ static int do_fallocate(int fd, off_t offset, off_t length, int mode)
>
> ret = fallocate(fd, mode, offset, length);
> if (ret)
> - fprintf(stderr, " ERROR %d: Failed to preallocate "
> - "space to %ld bytes\n", errno, (long) length);
> + fprintf(stderr, " ERROR %d: Failed to %s of %ld bytes\n",
> + errno, (mode & FALLOC_FL_PUNCH_HOLE) ? "punch hole" :
> + "preallocate space", (long) length);
>
> return ret;
> }
> @@ -262,6 +265,47 @@ out:
> return ret;
> }
>
> +/*
> + * Make sure hole size is properly reported when punched in the middle of a file
> + */
> +static int test21(int fd, int testnum)
> +{
> + char *buf = NULL;
> + int bufsz, filsz;
> + int ret = 0;
> +
> + if (!punch_hole) {
> + fprintf(stdout, "Test skipped as fs doesn't support punch hole.\n");
> + goto out;
> + }
Skip test if default_behavior is true? It's not necessary, but I think
it makes the test more clear about testing non-default behavior.
Thanks,
Eryu
> +
> + bufsz = alloc_size * 3;
> + buf = do_malloc(bufsz);
> + if (!buf) {
> + ret = -1;
> + goto out;
> + }
> + memset(buf, 'a', bufsz);
> +
> + ret = do_pwrite(fd, buf, bufsz, 0);
> + if (ret)
> + goto out;
> +
> + filsz = bufsz;
> + ret = do_fallocate(fd, alloc_size, alloc_size,
> + FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE);
> + if (ret < 0)
> + goto out;
> +
> + ret += do_lseek(testnum, 1, fd, filsz, SEEK_DATA, 0, 0);
> + ret += do_lseek(testnum, 2, fd, filsz, SEEK_HOLE, 0, alloc_size);
> + ret += do_lseek(testnum, 3, fd, filsz, SEEK_DATA, alloc_size, alloc_size * 2);
> +out:
> + if (buf)
> + free(buf);
> + return ret;
> +}
> +
> /*
> * Make sure hole size is properly reported when starting in the middle of a
> * hole in ext? doubly indirect tree
> @@ -1050,6 +1094,7 @@ struct testrec seek_tests[] = {
> { 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" },
> + { 21, test21, "Test file SEEK_HOLE that was created by PUNCH_HOLE" },
> };
>
> static int run_test(struct testrec *tr)
> @@ -1127,15 +1172,20 @@ static int test_basic_support(void)
> }
>
> ftruncate(fd, 0);
> - if (fallocate(fd, 0, 0, alloc_size) == -1) {
> + if (fallocate(fd, 0, 0, alloc_size * 2) == -1) {
> if (errno == EOPNOTSUPP)
> - fprintf(stderr, "File system does not support fallocate.");
> + fprintf(stderr, "File system does not support fallocate.\n");
> else {
> fprintf(stderr, "ERROR %d: Failed to preallocate "
> "space to %ld bytes. Aborting.\n", errno, (long) alloc_size);
> ret = -1;
> }
> goto out;
> + } else if (fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
> + 0, alloc_size) == -1) {
> + fprintf(stderr, "File system does not support punch hole.\n");
> + } else {
> + punch_hole = 1;
> }
>
> pos = lseek(fd, 0, SEEK_DATA);
> diff --git a/tests/generic/999 b/tests/generic/999
> new file mode 100755
> index 00000000..d8565041
> --- /dev/null
> +++ b/tests/generic/999
> @@ -0,0 +1,44 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (C) 2019, CTERA Networks. All Rights Reserved.
> +#
> +# FS QA Test No. 999
> +#
> +# Check that SEEK_HOLE can find a punched hole.
> +#
> +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
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +
> +_supported_fs generic
> +_supported_os Linux
> +
> +_require_test
> +_require_seek_data_hole
> +_require_xfs_io_command "fpunch"
> +
> +base_test_file=$TEST_DIR/seek_sanity_testfile.$seq
> +
> +_require_test_program "seek_sanity_test"
> +
> +_cleanup()
> +{
> + cd /
> + rm -f $tmp.*
> + rm -f $base_test_file*
> +}
> +
> +_run_seek_sanity_test -s 21 -e 21 $base_test_file > $seqres.full 2>&1 ||
> + _fail "seek sanity check failed!"
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/generic/999.out b/tests/generic/999.out
> new file mode 100644
> index 00000000..7fbc6768
> --- /dev/null
> +++ b/tests/generic/999.out
> @@ -0,0 +1 @@
> +QA output created by 999
> diff --git a/tests/generic/group b/tests/generic/group
> index 15227b67..14ac9b2c 100644
> --- a/tests/generic/group
> +++ b/tests/generic/group
> @@ -534,3 +534,4 @@
> 529 auto quick attr
> 530 auto quick unlink
> 531 auto quick unlink
> +999 auto quick punch seek
> --
> 2.17.1
>
next prev parent reply other threads:[~2019-03-06 12:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-03 15:09 [PATCH v2 1/2] fstests: Add more sanity to seek_sanity_test Amir Goldstein
2019-03-03 15:09 ` [PATCH v2 2/2] generic: Test that SEEK_HOLE can find a punched hole Amir Goldstein
2019-03-06 12:30 ` Eryu Guan [this message]
2019-03-06 12:28 ` [PATCH v2 1/2] fstests: Add more sanity to seek_sanity_test Eryu Guan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190306123031.GI2824@desktop \
--to=guaneryu@gmail.com \
--cc=amir73il@gmail.com \
--cc=eddiehorng.tw@gmail.com \
--cc=fstests@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.