[PATCH v4 0/3] fstests: copy_file

public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH v4 0/3] fstests: copy_file_range() tests
@ 2019-07-15 12:55 Amir Goldstein
  2019-07-15 12:55 ` [PATCH v4 1/3] common/rc: check support for xfs_io copy_range -f N Amir Goldstein
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Amir Goldstein @ 2019-07-15 12:55 UTC (permalink / raw)
  To: Eryu Guan
  Cc: Darrick J . Wong, Dave Chinner, Olga Kornievskaia, fstests,
	linux-xfs

Eryu,

These are the two remaining copy_file_range() tests which
I used to verify the kernel fixes that are now in master [1].

The bounds check test depends on an xfs_io change that was merged to
xfsprogs v5.1.0-rc1 (copy_range -f).

The cross-device copy test checks a new functionality, so it does
_notrun if copy_range return EXDEV instead of failing.

Thanks,
Amir.

[1] https://lore.kernel.org/linux-fsdevel/20190709163947.GE5164@magnolia/

Changes from v3:
- swapfile and immutable file tests already merged (generic/55[34])
- Use an actual loopdev owned by this test
- Use /dev/null and /dev/zero and char devices for test
- _notrun if cross-device copy_range return EXDEV

Changes from v2:
- Change blockdev in test to loop and _require_loop (Olga)
- Implement and use _require_xfs_io_command copy_range -f

Changes from v1:
- Remove patch to test EINVAL behavior instead of short copy
- Remove 'chmod -r' permission drop test case
- Split out test for swap/immutable file copy
- Split of cross-device copy test

Amir Goldstein (3):
  common/rc: check support for xfs_io copy_range -f N
  generic: copy_file_range bounds test
  generic: cross-device copy_file_range test

 common/rc             |   9 ++-
 tests/generic/990     | 134 ++++++++++++++++++++++++++++++++++++++++++
 tests/generic/990.out |  37 ++++++++++++
 tests/generic/991     |  64 ++++++++++++++++++++
 tests/generic/991.out |   4 ++
 tests/generic/group   |   2 +
 6 files changed, 249 insertions(+), 1 deletion(-)
 create mode 100755 tests/generic/990
 create mode 100644 tests/generic/990.out
 create mode 100755 tests/generic/991
 create mode 100644 tests/generic/991.out

-- 
2.17.1

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v4 1/3] common/rc: check support for xfs_io copy_range -f N
  2019-07-15 12:55 [PATCH v4 0/3] fstests: copy_file_range() tests Amir Goldstein
@ 2019-07-15 12:55 ` Amir Goldstein
  2019-07-15 12:55 ` [PATCH v4 2/3] generic: copy_file_range bounds test Amir Goldstein
  2019-07-15 12:55 ` [PATCH v4 3/3] generic: cross-device copy_file_range test Amir Goldstein
  2 siblings, 0 replies; 5+ messages in thread
From: Amir Goldstein @ 2019-07-15 12:55 UTC (permalink / raw)
  To: Eryu Guan
  Cc: Darrick J . Wong, Dave Chinner, Olga Kornievskaia, fstests,
	linux-xfs

Implement "_require_xfs_io_command copy_range -f" to check for
the option added by following xfsprogs commit:

  xfs_io: allow passing an open file to copy_range

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
 common/rc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index 000a7cc8..f1cec5ad 100644
--- a/common/rc
+++ b/common/rc
@@ -2105,9 +2105,16 @@ _require_xfs_io_command()
 		;;
 	"copy_range")
 		local testcopy=$TEST_DIR/$$.copy.xfs_io
+		local copy_opts=$testfile
+		if [ "$param" == "-f" ]; then
+			# source file is the open destination file
+			testcopy=$testfile
+			copy_opts="0 -d 4k"
+		fi
 		$XFS_IO_PROG -F -f -c "pwrite 0 4k" $testfile > /dev/null 2>&1
-		testio=`$XFS_IO_PROG -F -f -c "copy_range $testfile" $testcopy 2>&1`
+		testio=`$XFS_IO_PROG -F -f -c "copy_range $param $copy_opts" $testcopy 2>&1`
 		rm -f $testcopy > /dev/null 2>&1
+		param_checked="$param"
 		;;
 	"falloc" )
 		testio=`$XFS_IO_PROG -F -f -c "falloc $param 0 1m" $testfile 2>&1`
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH v4 2/3] generic: copy_file_range bounds test
  2019-07-15 12:55 [PATCH v4 0/3] fstests: copy_file_range() tests Amir Goldstein
  2019-07-15 12:55 ` [PATCH v4 1/3] common/rc: check support for xfs_io copy_range -f N Amir Goldstein
@ 2019-07-15 12:55 ` Amir Goldstein
  2019-07-21 16:43   ` Eryu Guan
  2019-07-15 12:55 ` [PATCH v4 3/3] generic: cross-device copy_file_range test Amir Goldstein
  2 siblings, 1 reply; 5+ messages in thread
From: Amir Goldstein @ 2019-07-15 12:55 UTC (permalink / raw)
  To: Eryu Guan
  Cc: Darrick J . Wong, Dave Chinner, Olga Kornievskaia, fstests,
	linux-xfs, Dave Chinner

Test that copy_file_range will return the correct errors for various
error conditions and boundary constraints.

This is a regression test for kernel commit:

  5dae222a5ff0 vfs: allow copy_file_range to copy across devices

[Amir] Split out cross-device copy_range test and use only test dev.
Split out immutable/swapfile test cases to reduce the requirements to
run the bounds check to minimum and get coverage for more filesystems.
Remove the tests for read past EOF and write after chmod -r,
because we decided to stick with read(2)/write(2) semantics.
Add requirements needed for large size copy tests and fifo test.
Use existing char/block devices for char/block dev tests.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
 tests/generic/990     | 134 ++++++++++++++++++++++++++++++++++++++++++
 tests/generic/990.out |  37 ++++++++++++
 tests/generic/group   |   1 +
 3 files changed, 172 insertions(+)
 create mode 100755 tests/generic/990
 create mode 100644 tests/generic/990.out

diff --git a/tests/generic/990 b/tests/generic/990
new file mode 100755
index 00000000..cdb8302b
--- /dev/null
+++ b/tests/generic/990
@@ -0,0 +1,134 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Red Hat, Inc.  All Rights Reserved.
+#
+# FS QA Test No. 990
+#
+# Exercise copy_file_range() syscall error conditions.
+#
+# This is a regression test for kernel commit:
+#   96e6e8f4a68d ("vfs: add missing checks to copy_file_range")
+#
+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 7 15
+
+_cleanup()
+{
+	cd /
+	rm -rf $tmp.*
+	[ -z "$loopdev" ] || _destroy_loop_device $loopdev
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# real QA test starts here
+_supported_os Linux
+_supported_fs generic
+
+rm -f $seqres.full
+
+_require_test
+_require_loop
+#
+# This test effectively requires xfs_io with these commits
+#  2a42470b xfs_io: copy_file_range length is a size_t
+#  1a05efba io: open pipes in non-blocking mode
+#
+# Without those commits test will hang on old kernel when copying
+# very large size and when copying from a pipe.
+#
+# We require a new xfs_io feature of passing an open file as the
+# copy source, as an indication that the test can run without hanging
+# with large size argument and to avoid opening pipe in blocking mode.
+#
+_require_xfs_io_command "copy_range" "-f"
+
+testdir="$TEST_DIR/test-$seq"
+rm -rf $testdir
+mkdir $testdir
+
+rm -f $seqres.full
+
+$XFS_IO_PROG -f -c "pwrite -S 0x61 0 128k" $testdir/file >> $seqres.full 2>&1
+
+echo source range overlaps destination range in same file returns EINVAL
+$XFS_IO_PROG -f -c "copy_range -s 32k -d 48k -l 32k $testdir/file" $testdir/file
+
+echo
+echo destination file O_RDONLY returns EBADF
+$XFS_IO_PROG -f -r -c "copy_range -l 32k $testdir/file" $testdir/copy
+
+echo
+echo destination file O_APPEND returns EBADF
+$XFS_IO_PROG -f -a -c "copy_range -l 32k $testdir/file" $testdir/copy
+
+echo
+echo source/destination as directory returns EISDIR
+$XFS_IO_PROG -c "copy_range -l 32k $testdir/file" $testdir
+$XFS_IO_PROG -f -c "copy_range -l 32k $testdir" $testdir/copy
+
+echo
+echo source/destination as blkdev returns EINVAL
+$XFS_IO_PROG -f -c "truncate 128k" $testdir/img >> $seqres.full 2>&1
+loopdev=`_create_loop_device $testdir/img`
+$XFS_IO_PROG -c "copy_range -l 32k $testdir/file" $loopdev
+$XFS_IO_PROG -f -c "copy_range -l 32k $loopdev" $testdir/copy
+_destroy_loop_device $loopdev
+loopdev=
+
+echo
+echo source/destination as chardev returns EINVAL
+$XFS_IO_PROG -c "copy_range -l 32k $testdir/file" /dev/null
+$XFS_IO_PROG -f -c "copy_range -l 32k /dev/zero" $testdir/copy
+
+echo
+echo source/destination as FIFO returns EINVAL
+mkfifo $testdir/fifo
+$XFS_IO_PROG -c "copy_range -l 32k $testdir/file" $testdir/fifo
+# Pass input pipe as non-blocking open file to avoid old xfs_io (<4.20)
+# opening the pipe in blocking mode and causing the test to hang
+$XFS_IO_PROG -r -n -f -c "open $testdir/copy" -C "copy_range -l 32k -f 0" $testdir/fifo
+
+max_off=$((8 * 2**60 - 65536 - 1))
+min_off=65537
+
+echo
+echo length beyond 8EiB wraps around 0 returns EOVERFLOW
+$XFS_IO_PROG -f -c "copy_range -l 10e -s $max_off $testdir/file" $testdir/copy
+$XFS_IO_PROG -f -c "copy_range -l 10e -d $max_off $testdir/file" $testdir/copy
+
+echo
+echo source range beyond 8TiB returns 0
+$XFS_IO_PROG -c "copy_range -s $max_off -l $min_off -d 0 $testdir/file" $testdir/copy
+
+echo
+echo destination range beyond 8TiB returns EFBIG
+$XFS_IO_PROG -c "copy_range -l $min_off -s 0 -d $max_off $testdir/file" $testdir/copy
+
+echo
+echo destination larger than rlimit returns EFBIG
+rm -f $testdir/copy
+$XFS_IO_PROG -c "truncate 128k" $testdir/file
+
+# need a wrapper so the "File size limit exceeded" error can be filtered
+do_rlimit_copy()
+{
+	$XFS_IO_PROG -f -c "copy_range -l 32k -s 0 -d 16m $testdir/file" $testdir/copy
+}
+
+ulimit -f $((8 * 1024))
+ulimit -c 0
+do_rlimit_copy 2>&1 | grep -o "File size limit exceeded"
+ulimit -f unlimited
+
+# success, all done
+status=0
+exit
diff --git a/tests/generic/990.out b/tests/generic/990.out
new file mode 100644
index 00000000..05d137de
--- /dev/null
+++ b/tests/generic/990.out
@@ -0,0 +1,37 @@
+QA output created by 990
+source range overlaps destination range in same file returns EINVAL
+copy_range: Invalid argument
+
+destination file O_RDONLY returns EBADF
+copy_range: Bad file descriptor
+
+destination file O_APPEND returns EBADF
+copy_range: Bad file descriptor
+
+source/destination as directory returns EISDIR
+copy_range: Is a directory
+copy_range: Is a directory
+
+source/destination as blkdev returns EINVAL
+copy_range: Invalid argument
+copy_range: Invalid argument
+
+source/destination as chardev returns EINVAL
+copy_range: Invalid argument
+copy_range: Invalid argument
+
+source/destination as FIFO returns EINVAL
+copy_range: Invalid argument
+copy_range: Invalid argument
+
+length beyond 8EiB wraps around 0 returns EOVERFLOW
+copy_range: Value too large for defined data type
+copy_range: Value too large for defined data type
+
+source range beyond 8TiB returns 0
+
+destination range beyond 8TiB returns EFBIG
+copy_range: File too large
+
+destination larger than rlimit returns EFBIG
+File size limit exceeded
diff --git a/tests/generic/group b/tests/generic/group
index 9ceaf317..8e764597 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -565,3 +565,4 @@
 560 auto stress dedupe
 561 auto stress dedupe
 562 auto clone
+990 auto quick copy_range
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH v4 2/3] generic: copy_file_range bounds test
  2019-07-15 12:55 ` [PATCH v4 2/3] generic: copy_file_range bounds test Amir Goldstein
@ 2019-07-21 16:43   ` Eryu Guan
  0 siblings, 0 replies; 5+ messages in thread
From: Eryu Guan @ 2019-07-21 16:43 UTC (permalink / raw)
  To: Amir Goldstein
  Cc: Darrick J . Wong, Dave Chinner, Olga Kornievskaia, fstests,
	linux-xfs, Dave Chinner

On Mon, Jul 15, 2019 at 03:55:15PM +0300, Amir Goldstein wrote:
> Test that copy_file_range will return the correct errors for various
> error conditions and boundary constraints.
> 
> This is a regression test for kernel commit:
> 
>   5dae222a5ff0 vfs: allow copy_file_range to copy across devices

This seems like refering to the wrong commit, I've changed it to

96e6e8f4a68d ("vfs: add missing checks to copy_file_range")

Thanks,
Eryu

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v4 3/3] generic: cross-device copy_file_range test
  2019-07-15 12:55 [PATCH v4 0/3] fstests: copy_file_range() tests Amir Goldstein
  2019-07-15 12:55 ` [PATCH v4 1/3] common/rc: check support for xfs_io copy_range -f N Amir Goldstein
  2019-07-15 12:55 ` [PATCH v4 2/3] generic: copy_file_range bounds test Amir Goldstein
@ 2019-07-15 12:55 ` Amir Goldstein
  2 siblings, 0 replies; 5+ messages in thread
From: Amir Goldstein @ 2019-07-15 12:55 UTC (permalink / raw)
  To: Eryu Guan
  Cc: Darrick J . Wong, Dave Chinner, Olga Kornievskaia, fstests,
	linux-xfs, Dave Chinner

Old kernels do not support cross-device copy_file_range.

This is a regression test for kernel commit:

  5dae222a5ff0 vfs: allow copy_file_range to copy across devices

[Amir] Split out cross-device copy_range test to a new test and
_notrun if kernel/filesystem do not support cross-device copy_range.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
 tests/generic/991     | 64 +++++++++++++++++++++++++++++++++++++++++++
 tests/generic/991.out |  4 +++
 tests/generic/group   |  1 +
 3 files changed, 69 insertions(+)
 create mode 100755 tests/generic/991
 create mode 100644 tests/generic/991.out

diff --git a/tests/generic/991 b/tests/generic/991
new file mode 100755
index 00000000..69b8d3d5
--- /dev/null
+++ b/tests/generic/991
@@ -0,0 +1,64 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Red Hat, Inc.  All Rights Reserved.
+#
+# FS QA Test No. 991
+#
+# Exercise copy_file_range() across devices supported by some
+# filesystems since kernel commit:
+#
+# 5dae222a5ff0 vfs: allow copy_file_range to copy across devices
+#
+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 7 15
+
+_cleanup()
+{
+	cd /
+	rm -rf $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# real QA test starts here
+_supported_os Linux
+_supported_fs generic
+
+rm -f $seqres.full
+
+_require_test
+_require_scratch
+_require_xfs_io_command "copy_range"
+
+_scratch_mkfs 2>&1 >> $seqres.full
+_scratch_mount
+
+
+testdir=$TEST_DIR/test-$seq
+rm -rf $testdir
+mkdir $testdir
+rm -f $seqres.full
+
+$XFS_IO_PROG -f -c "pwrite -S 0x61 0 128k" $testdir/file >> $seqres.full 2>&1
+
+# expect success or EXDEV on filesystem/kernel that do not support
+# cross-device copy_range
+testio=`$XFS_IO_PROG -f -c "copy_range -l 128k $testdir/file" $SCRATCH_MNT/copy 2>&1`
+echo $testio | grep -q "cross-device" && \
+	_notrun "$FSTYP does not support cross-device copy_file_range"
+echo -n $testio
+cmp $testdir/file $SCRATCH_MNT/copy
+echo "md5sums after xdev copy:"
+md5sum $testdir/file $SCRATCH_MNT/copy | _filter_test_dir | _filter_scratch
+
+# success, all done
+status=0
+exit
diff --git a/tests/generic/991.out b/tests/generic/991.out
new file mode 100644
index 00000000..19c22dfe
--- /dev/null
+++ b/tests/generic/991.out
@@ -0,0 +1,4 @@
+QA output created by 991
+md5sums after xdev copy:
+81615449a98aaaad8dc179b3bec87f38  TEST_DIR/test-991/file
+81615449a98aaaad8dc179b3bec87f38  SCRATCH_MNT/copy
diff --git a/tests/generic/group b/tests/generic/group
index 8e764597..b1a7c594 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -566,3 +566,4 @@
 561 auto stress dedupe
 562 auto clone
 990 auto quick copy_range
+991 auto quick copy_range
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-07-21 16:43 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-15 12:55 [PATCH v4 0/3] fstests: copy_file_range() tests Amir Goldstein
2019-07-15 12:55 ` [PATCH v4 1/3] common/rc: check support for xfs_io copy_range -f N Amir Goldstein
2019-07-15 12:55 ` [PATCH v4 2/3] generic: copy_file_range bounds test Amir Goldstein
2019-07-21 16:43   ` Eryu Guan
2019-07-15 12:55 ` [PATCH v4 3/3] generic: cross-device copy_file_range test Amir Goldstein

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox