linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/6] fstests: fixes and new tests
@ 2018-10-05  0:19 Darrick J. Wong
  2018-10-05  0:19 ` [PATCH 1/6] generic: add bfoster's alternate reproducer Darrick J. Wong
                   ` (5 more replies)
  0 siblings, 6 replies; 10+ messages in thread
From: Darrick J. Wong @ 2018-10-05  0:19 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, linux-fsdevel, fstests

Hi all,

The first patch provides a second regression test for a condition where
mmap read of a file's EOF page shows nonzero bytes after EOF if the
previous operation was a zero_range all the way to EOF.  This bug only
seems to manifest on XFS, but it uses generic APIs and so is a generic
test.  The patch concerned here is "xfs: ensure post-EOF zeroing happens
after zeroing part of a file".

The second patch adds tests to see if XFS can detect and correct
incorrect filesystem summary counters at mount time.

Patch 3-5 fix some minor problems that cropped up with the upcoming
xfsprogs 4.19 release due to stricter metadata verification.

Patch 6 adds some regression tests for incorrect behavior on the part of
the clonerange and deduperange ioctls.  Specifically, we check for a
lack of file range verification w.r.t. resource limits; lack of security
privilege clearing when a file is reflinked; exposure of stale disk
contents when a file is reflinked into well above EOF; and problems
deduping when a single byte in the middle of the range doesn't match.

--D

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

* [PATCH 1/6] generic: add bfoster's alternate reproducer
  2018-10-05  0:19 [PATCH 0/6] fstests: fixes and new tests Darrick J. Wong
@ 2018-10-05  0:19 ` Darrick J. Wong
  2018-10-05  0:19 ` [PATCH 2/6] xfs: test mount time summary counter check and fix Darrick J. Wong
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 10+ messages in thread
From: Darrick J. Wong @ 2018-10-05  0:19 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, linux-fsdevel, fstests

From: Darrick J. Wong <darrick.wong@oracle.com>

Add Brian Foster's alternate reproducer code for the mread-after-eof
problem so that we increase the chances that either this or generic/499
will catch the problem.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/generic/707     |   55 +++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/707.out |    2 ++
 tests/generic/group   |    1 +
 3 files changed, 58 insertions(+)
 create mode 100755 tests/generic/707
 create mode 100644 tests/generic/707.out


diff --git a/tests/generic/707 b/tests/generic/707
new file mode 100755
index 00000000..74193c55
--- /dev/null
+++ b/tests/generic/707
@@ -0,0 +1,55 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle, Inc.  All Rights Reserved.
+#
+# FS QA Test No. 707
+#
+# Test a specific sequence of fsx operations that causes an mmap read past
+# eof to return nonzero contents.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/punch
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_scratch
+_require_xfs_io_command "fcollapse"
+_require_xfs_io_command "fzero"
+
+rm -f $seqres.full
+
+_scratch_mkfs_sized $((1024 * 1024 * 100)) >>$seqres.full 2>&1
+_scratch_mount
+
+$XFS_IO_PROG -fc "pwrite 0 100m" -c fsync $SCRATCH_MNT/file >>$seqres.full 2>&1
+rm -f $SCRATCH_MNT/file
+
+cat >> $tmp.fsxops << ENDL
+truncate 0x0 0x1f0d6 0x380e1
+write 0x1ad87 0x6c99 0x180d6
+zero_range 0x14426 0xd3aa 0x21a20 keep_size
+mapread 0x1f69a 0x2386 0x21a20
+ENDL
+
+victim=$SCRATCH_MNT/a
+touch $victim
+$here/ltp/fsx --replay-ops $tmp.fsxops $victim > $tmp.output 2>&1 || cat $tmp.output
+
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/generic/707.out b/tests/generic/707.out
new file mode 100644
index 00000000..8e57a1d8
--- /dev/null
+++ b/tests/generic/707.out
@@ -0,0 +1,2 @@
+QA output created by 707
+Silence is golden
diff --git a/tests/generic/group b/tests/generic/group
index 4da0e188..06b062e1 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -508,3 +508,4 @@
 503 auto quick dax punch collapse zero
 504 auto quick locks
 505 shutdown auto quick metadata
+707 auto quick rw collapse zero

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

* [PATCH 2/6] xfs: test mount time summary counter check and fix
  2018-10-05  0:19 [PATCH 0/6] fstests: fixes and new tests Darrick J. Wong
  2018-10-05  0:19 ` [PATCH 1/6] generic: add bfoster's alternate reproducer Darrick J. Wong
@ 2018-10-05  0:19 ` Darrick J. Wong
  2018-10-05  0:19 ` [PATCH 3/6] xfs/189: skip 'barrier' mount option test on newer kernels Darrick J. Wong
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 10+ messages in thread
From: Darrick J. Wong @ 2018-10-05  0:19 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, linux-fsdevel, fstests

From: Darrick J. Wong <darrick.wong@oracle.com>

Tests to ensure that the xfs mount code can detect obviously bad fs
summary counters at mount time and fix them.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/722     |   58 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/722.out |    4 +++
 tests/xfs/723     |   58 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/723.out |    4 +++
 tests/xfs/724     |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/724.out |    4 +++
 tests/xfs/group   |    3 ++
 7 files changed, 197 insertions(+)
 create mode 100755 tests/xfs/722
 create mode 100644 tests/xfs/722.out
 create mode 100755 tests/xfs/723
 create mode 100644 tests/xfs/723.out
 create mode 100755 tests/xfs/724
 create mode 100644 tests/xfs/724.out


diff --git a/tests/xfs/722 b/tests/xfs/722
new file mode 100755
index 00000000..1012bd58
--- /dev/null
+++ b/tests/xfs/722
@@ -0,0 +1,58 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle.  All Rights Reserved.
+#
+# FS QA Test 722
+#
+# Test detection & fixing of bad summary block counts at mount time.
+#
+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
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs xfs
+_supported_os Linux
+_require_scratch
+
+echo "Format and mount"
+_scratch_mkfs > $seqres.full 2>&1
+_scratch_mount >> $seqres.full 2>&1
+echo "test file" > $SCRATCH_MNT/testfile
+
+echo "Fuzz fdblocks"
+_scratch_unmount
+dblocks=$(_scratch_xfs_get_metadata_field dblocks 'sb 0')
+_scratch_xfs_set_metadata_field fdblocks $((dblocks * 2)) 'sb 0' > $seqres.full 2>&1
+
+echo "Detection and Correction"
+_scratch_mount >> $seqres.full 2>&1
+avail=$(stat -c '%a' -f $SCRATCH_MNT)
+total=$(stat -c '%b' -f $SCRATCH_MNT)
+echo "avail: $avail" >> $seqres.full
+echo "total: $total" >> $seqres.full
+test "$avail" -gt "$total" && echo "free space bad: $avail > $total"
+
+# success, all done
+status=0
+exit
diff --git a/tests/xfs/722.out b/tests/xfs/722.out
new file mode 100644
index 00000000..8d1327b7
--- /dev/null
+++ b/tests/xfs/722.out
@@ -0,0 +1,4 @@
+QA output created by 722
+Format and mount
+Fuzz fdblocks
+Detection and Correction
diff --git a/tests/xfs/723 b/tests/xfs/723
new file mode 100755
index 00000000..c068e496
--- /dev/null
+++ b/tests/xfs/723
@@ -0,0 +1,58 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle.  All Rights Reserved.
+#
+# FS QA Test 723
+#
+# Test detection & fixing of bad summary inode counts at mount time.
+#
+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
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs xfs
+_supported_os Linux
+_require_scratch
+
+echo "Format and mount"
+_scratch_mkfs > $seqres.full 2>&1
+_scratch_mount >> $seqres.full 2>&1
+echo "test file" > $SCRATCH_MNT/testfile
+
+echo "Fuzz ifree"
+_scratch_unmount
+icount=$(_scratch_xfs_get_metadata_field icount 'sb 0')
+_scratch_xfs_set_metadata_field ifree $((icount * 2)) 'sb 0' > $seqres.full 2>&1
+
+echo "Detection and Correction"
+_scratch_mount >> $seqres.full 2>&1
+avail=$(stat -c '%d' -f $SCRATCH_MNT)
+total=$(stat -c '%c' -f $SCRATCH_MNT)
+echo "avail: $avail" >> $seqres.full
+echo "total: $total" >> $seqres.full
+test "$avail" -gt "$total" && echo "free inodes bad: $avail > $total"
+
+# success, all done
+status=0
+exit
diff --git a/tests/xfs/723.out b/tests/xfs/723.out
new file mode 100644
index 00000000..e825855a
--- /dev/null
+++ b/tests/xfs/723.out
@@ -0,0 +1,4 @@
+QA output created by 723
+Format and mount
+Fuzz ifree
+Detection and Correction
diff --git a/tests/xfs/724 b/tests/xfs/724
new file mode 100755
index 00000000..f5e44fb6
--- /dev/null
+++ b/tests/xfs/724
@@ -0,0 +1,66 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle.  All Rights Reserved.
+#
+# FS QA Test 724
+#
+# Test detection & fixing of bad summary block counts at mount time.
+# Corrupt the AGFs to test mount failure when mount-fixing fails.
+#
+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
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# remove previous $seqres.full before test
+rm -f $seqres.full
+
+# real QA test starts here
+
+# Modify as appropriate.
+_supported_fs xfs
+_supported_os Linux
+_require_scratch_nocheck
+
+echo "Format and mount"
+_scratch_mkfs > $seqres.full 2>&1
+_scratch_mount >> $seqres.full 2>&1
+echo "test file" > $SCRATCH_MNT/testfile
+
+echo "Fuzz fdblocks and btreeblks"
+_scratch_unmount
+dblocks=$(_scratch_xfs_get_metadata_field dblocks 'sb 0')
+_scratch_xfs_set_metadata_field fdblocks $((dblocks * 2)) 'sb 0' > $seqres.full 2>&1
+
+aglen=$(_scratch_xfs_get_metadata_field length 'agf 0')
+_scratch_xfs_set_metadata_field btreeblks $aglen 'agf 0' > $seqres.full 2>&1
+
+echo "Detection and Correction"
+if _try_scratch_mount >> $seqres.full 2>&1; then
+	echo "mount should have failed"
+	avail=$(stat -c '%a' -f $SCRATCH_MNT)
+	total=$(stat -c '%b' -f $SCRATCH_MNT)
+	echo "avail: $avail" >> $seqres.full
+	echo "total: $total" >> $seqres.full
+	test "$avail" -gt "$total" && echo "free space bad: $avail > $total"
+	_scratch_unmount
+fi
+_scratch_xfs_repair -n >> $seqres.full 2>&1 && echo "repair didn't find fuzz?"
+
+# success, all done
+status=0
+exit
diff --git a/tests/xfs/724.out b/tests/xfs/724.out
new file mode 100644
index 00000000..6571f9ed
--- /dev/null
+++ b/tests/xfs/724.out
@@ -0,0 +1,4 @@
+QA output created by 724
+Format and mount
+Fuzz fdblocks and btreeblks
+Detection and Correction
diff --git a/tests/xfs/group b/tests/xfs/group
index 821bf2ac..28074f07 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -488,3 +488,6 @@
 488 dangerous_fuzzers dangerous_norepair
 489 dangerous_fuzzers dangerous_norepair
 490 auto quick
+722 auto quick fuzz
+723 auto quick fuzz
+724 auto quick fuzz

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

* [PATCH 3/6] xfs/189: skip 'barrier' mount option test on newer kernels
  2018-10-05  0:19 [PATCH 0/6] fstests: fixes and new tests Darrick J. Wong
  2018-10-05  0:19 ` [PATCH 1/6] generic: add bfoster's alternate reproducer Darrick J. Wong
  2018-10-05  0:19 ` [PATCH 2/6] xfs: test mount time summary counter check and fix Darrick J. Wong
@ 2018-10-05  0:19 ` Darrick J. Wong
  2018-10-05  0:19 ` [PATCH 4/6] xfs/270: use _scratch_xfs_set_metadata_field to fuzz rocompat bits Darrick J. Wong
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 10+ messages in thread
From: Darrick J. Wong @ 2018-10-05  0:19 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, linux-fsdevel, fstests

From: Darrick J. Wong <darrick.wong@oracle.com>

Starting in Linux 4.19 the 'barrier' and 'nobarrier' mount options were
removed.  If mount complains about a bad option when we remount with
'barrier', just skip the test.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/189 |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)


diff --git a/tests/xfs/189 b/tests/xfs/189
index c1c52a22..2a2682ef 100755
--- a/tests/xfs/189
+++ b/tests/xfs/189
@@ -165,7 +165,19 @@ _test_remount_barrier()
 	echo
 
 	# mention barrier explicitly even if it's currently the default just to be sure
-	_try_scratch_mount -o barrier
+	_try_scratch_mount -o barrier > $tmp.barriermount 2>&1
+
+	# If the kernel doesn't recognize 'barrier' as a mount option then
+	# just fake the output.  The barrier option was removed in 4.19.
+	if grep -q "bad option" $tmp.barriermount; then
+		cat << ENDL
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw)
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,nobarrier)
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw)
+ENDL
+		return
+	fi
+
 	[ $? -eq 0 ] || echo "mount failed unexpectedly!"
 	_check_mount rw
 

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

* [PATCH 4/6] xfs/270: use _scratch_xfs_set_metadata_field to fuzz rocompat bits
  2018-10-05  0:19 [PATCH 0/6] fstests: fixes and new tests Darrick J. Wong
                   ` (2 preceding siblings ...)
  2018-10-05  0:19 ` [PATCH 3/6] xfs/189: skip 'barrier' mount option test on newer kernels Darrick J. Wong
@ 2018-10-05  0:19 ` Darrick J. Wong
  2018-10-05  6:54   ` Xiao Yang
  2018-10-05  0:19 ` [PATCH 5/6] xfs/288: shut up verifier error Darrick J. Wong
  2018-10-05  0:19 ` [PATCH 6/6] generic: test reflink side effects Darrick J. Wong
  5 siblings, 1 reply; 10+ messages in thread
From: Darrick J. Wong @ 2018-10-05  0:19 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, linux-fsdevel, fstests

From: Darrick J. Wong <darrick.wong@oracle.com>

Use the helper to set the metadata field so that we can bypass write
verifier checks.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/270 |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


diff --git a/tests/xfs/270 b/tests/xfs/270
index da66bc33..fb72ba7c 100755
--- a/tests/xfs/270
+++ b/tests/xfs/270
@@ -44,8 +44,8 @@ _scratch_mkfs_xfs >>$seqres.full 2>&1
 # set the highest bit of features_ro_compat, use it as an unknown
 # feature bit. If one day this bit become known feature, please
 # change this case.
-$XFS_DB_PROG -x -c "sb 0" -c "write -d features_ro_compat $((2**31))" \
-	$SCRATCH_DEV | grep -v "Allowing write of corrupted data"
+_scratch_xfs_set_metadata_field "features_ro_compat" "$((2**31))" "sb 0" | \
+	grep 'features_ro_compat'
 
 # rw mount with unknown ro-compat feature should fail
 echo "rw mount test"

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

* [PATCH 5/6] xfs/288: shut up verifier error
  2018-10-05  0:19 [PATCH 0/6] fstests: fixes and new tests Darrick J. Wong
                   ` (3 preceding siblings ...)
  2018-10-05  0:19 ` [PATCH 4/6] xfs/270: use _scratch_xfs_set_metadata_field to fuzz rocompat bits Darrick J. Wong
@ 2018-10-05  0:19 ` Darrick J. Wong
  2018-10-05  0:19 ` [PATCH 6/6] generic: test reflink side effects Darrick J. Wong
  5 siblings, 0 replies; 10+ messages in thread
From: Darrick J. Wong @ 2018-10-05  0:19 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, linux-fsdevel, fstests

From: Darrick J. Wong <darrick.wong@oracle.com>

Ignore the verifier errors when we fuzz hdr.count to zero.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/288 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


diff --git a/tests/xfs/288 b/tests/xfs/288
index c6821909..13ba3057 100755
--- a/tests/xfs/288
+++ b/tests/xfs/288
@@ -62,7 +62,7 @@ _scratch_xfs_set_metadata_field "hdr.count" "0" \
 # verify current xfs_db write command can set hdr.count to 0. Old xfsprogs
 # can't do that on v5 filesystems.
 count=$(_scratch_xfs_get_metadata_field "hdr.count" \
-					"inode $inum" "ablock 0")
+					"inode $inum" "ablock 0" 2> /dev/null)
 if [ "$count" != "0" ]; then
 	_notrun "xfs_db can't set attr hdr.count to 0"
 fi

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

* [PATCH 6/6] generic: test reflink side effects
  2018-10-05  0:19 [PATCH 0/6] fstests: fixes and new tests Darrick J. Wong
                   ` (4 preceding siblings ...)
  2018-10-05  0:19 ` [PATCH 5/6] xfs/288: shut up verifier error Darrick J. Wong
@ 2018-10-05  0:19 ` Darrick J. Wong
  2018-10-14 15:40   ` Eryu Guan
  5 siblings, 1 reply; 10+ messages in thread
From: Darrick J. Wong @ 2018-10-05  0:19 UTC (permalink / raw)
  To: guaneryu, darrick.wong; +Cc: linux-xfs, linux-fsdevel, fstests

From: Darrick J. Wong <darrick.wong@oracle.com>

Test that ctime gets updated and suid is cleared when we reflink.
Ensure we can't reflink about RLIMIT_FSIZE.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/generic/934     |   63 ++++++++++++++++++++++++++++++++++++++
 tests/generic/934.out |    2 +
 tests/generic/935     |   48 +++++++++++++++++++++++++++++
 tests/generic/935.out |    2 +
 tests/generic/936     |   70 ++++++++++++++++++++++++++++++++++++++++++
 tests/generic/936.out |    5 +++
 tests/generic/937     |   81 +++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/937.out |   12 +++++++
 tests/generic/group   |    4 ++
 9 files changed, 287 insertions(+)
 create mode 100755 tests/generic/934
 create mode 100644 tests/generic/934.out
 create mode 100755 tests/generic/935
 create mode 100644 tests/generic/935.out
 create mode 100755 tests/generic/936
 create mode 100644 tests/generic/936.out
 create mode 100755 tests/generic/937
 create mode 100644 tests/generic/937.out


diff --git a/tests/generic/934 b/tests/generic/934
new file mode 100755
index 00000000..ec7ad092
--- /dev/null
+++ b/tests/generic/934
@@ -0,0 +1,63 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle, Inc.  All Rights Reserved.
+#
+# FS QA Test No. 934
+#
+# Ensure that ctime is updated and capabilities are cleared when reflinking.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/reflink
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_scratch_reflink
+_require_command "$GETCAP_PROG" getcap
+_require_command "$SETCAP_PROG" setcap
+
+rm -f $seqres.full
+
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+$XFS_IO_PROG -f -c "pwrite -S 0x18 0 1m" $SCRATCH_MNT/foo >>$seqres.full
+$XFS_IO_PROG -f -c "pwrite -S 0x20 0 1m" $SCRATCH_MNT/bar >>$seqres.full
+
+$SETCAP_PROG cap_setgid,cap_setuid+ep $SCRATCH_MNT/bar
+
+before_cap="$($GETCAP_PROG -v $SCRATCH_MNT/bar)"
+before_ctime="$(stat -c '%z' $SCRATCH_MNT/bar)"
+
+sleep 1
+
+$XFS_IO_PROG -c "reflink $SCRATCH_MNT/foo" $SCRATCH_MNT/bar >> $seqres.full 2>&1
+#trace-cmd record -p function_graph -l 'file_remove_privs' -g 'file_remove_privs' $XFS_IO_PROG -c "reflink $SCRATCH_MNT/foo" $SCRATCH_MNT/bar >> $seqres.full 2>&1
+
+after_cap="$($GETCAP_PROG -v $SCRATCH_MNT/bar)"
+after_ctime="$(stat -c '%z' $SCRATCH_MNT/bar)"
+
+echo "$before_cap $before_ctime" >> $seqres.full
+echo "$after_cap $after_ctime" >> $seqres.full
+
+test "$before_cap" != "$after_cap" || echo "Expected capabilities to drop."
+test "$before_ctime" != "$after_ctime" || echo "Expected ctime to change."
+
+echo Silence is golden.
+status=0
+exit
diff --git a/tests/generic/934.out b/tests/generic/934.out
new file mode 100644
index 00000000..98f0bb3f
--- /dev/null
+++ b/tests/generic/934.out
@@ -0,0 +1,2 @@
+QA output created by 934
+Silence is golden.
diff --git a/tests/generic/935 b/tests/generic/935
new file mode 100755
index 00000000..3b0eaa95
--- /dev/null
+++ b/tests/generic/935
@@ -0,0 +1,48 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle, Inc.  All Rights Reserved.
+#
+# FS QA Test No. 935
+#
+# Ensure that file size resource limits are respected when reflinking.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/reflink
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_scratch_reflink
+
+rm -f $seqres.full
+
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+chmod a+rwx $SCRATCH_MNT
+$XFS_IO_PROG -f -c "pwrite -S 0x18 0 1m" $SCRATCH_MNT/foo >>$seqres.full
+su -s/bin/bash - $qa_user -c "ulimit -f 64 ; $XFS_IO_PROG -f -c \"reflink $SCRATCH_MNT/foo\" $SCRATCH_MNT/bar" >> $seqres.full 2>&1
+
+sz="$(stat -c '%s' $SCRATCH_MNT/bar)"
+if [ "$sz" -ne 0 ] && [ "$sz" -ne 65536 ]; then
+	echo "Oddball file size $sz??"
+fi
+
+echo Silence is golden.
+status=0
+exit
diff --git a/tests/generic/935.out b/tests/generic/935.out
new file mode 100644
index 00000000..adb5e92a
--- /dev/null
+++ b/tests/generic/935.out
@@ -0,0 +1,2 @@
+QA output created by 935
+Silence is golden.
diff --git a/tests/generic/936 b/tests/generic/936
new file mode 100755
index 00000000..eacf9b5e
--- /dev/null
+++ b/tests/generic/936
@@ -0,0 +1,70 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle, Inc.  All Rights Reserved.
+#
+# FS QA Test No. 936
+#
+# Ensure that reflinking into a file well beyond EOF zeroes everything between
+# the old EOF and the start of the newly linked chunk.  This is an adaptation
+# of a reproducer script that Eric Sandeen formulated from a stale data
+# exposure bug uncovered by shared/010.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/reflink
+
+# real QA test starts here
+_supported_fs generic
+_supported_os Linux
+_require_scratch_reflink
+
+rm -f $seqres.full
+
+# Fill disk with a well known pattern so that stale data exposure becomes much
+# more obvious.
+$XFS_IO_PROG -c "pwrite -S 0x58 -b 1m 0 300m" $SCRATCH_DEV >> $seqres.full
+_scratch_mkfs_sized $((300 * 1048576)) >>$seqres.full 2>&1
+_scratch_mount
+
+DONOR1=$SCRATCH_MNT/a
+TARGET=$SCRATCH_MNT/b
+blksz=65536
+
+$XFS_IO_PROG -f -c "pwrite -S 0x72 0 $blksz" $DONOR1 >> $seqres.full
+
+$XFS_IO_PROG -f \
+	-c "falloc -k $((blksz*2)) $blksz"        \
+	-c "pwrite -S 0x57 $((blksz*16)) 8192" \
+        -c "fdatasync" \
+	-c 'stat' \
+	-c "reflink $DONOR1 0 $((blksz*17)) $blksz" \
+                $TARGET >> $seqres.full
+
+od -tx1 -Ad -c $TARGET >> $seqres.full
+${FILEFRAG_PROG} -v $TARGET >> $seqres.full
+md5sum $DONOR1 | _filter_scratch
+md5sum $TARGET | _filter_scratch
+
+_scratch_cycle_mount
+
+od -tx1 -Ad -c $TARGET >> $seqres.full
+${FILEFRAG_PROG} -v $TARGET >> $seqres.full
+md5sum $DONOR1 | _filter_scratch
+md5sum $TARGET | _filter_scratch
+
+status=0
+exit
diff --git a/tests/generic/936.out b/tests/generic/936.out
new file mode 100644
index 00000000..73685490
--- /dev/null
+++ b/tests/generic/936.out
@@ -0,0 +1,5 @@
+QA output created by 936
+34a4daf52c562253a2f6108c5123605a  SCRATCH_MNT/a
+4fe4dfe3d2244bd380adcefdc5006e37  SCRATCH_MNT/b
+34a4daf52c562253a2f6108c5123605a  SCRATCH_MNT/a
+4fe4dfe3d2244bd380adcefdc5006e37  SCRATCH_MNT/b
diff --git a/tests/generic/937 b/tests/generic/937
new file mode 100755
index 00000000..e3a94dbb
--- /dev/null
+++ b/tests/generic/937
@@ -0,0 +1,81 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018, Oracle and/or its affiliates.  All Rights Reserved.
+#
+# FS QA Test No. 937
+#
+# Ensuring that we cannot dedupe non-matching parts of files:
+#   - Fail to dedupe non-identical parts of two different files
+#   - Check that nothing changes in either file
+#
+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
+
+_cleanup()
+{
+    cd /
+    rm -rf $tmp.* $testdir
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/reflink
+
+# real QA test starts here
+_supported_os Linux
+_require_test_dedupe
+
+rm -f $seqres.full
+
+testdir=$TEST_DIR/test-$seq
+rm -rf $testdir
+mkdir $testdir
+
+echo "Create the original files"
+blksz=65536
+_pwrite_byte 0x61 $((blksz * 2)) $((blksz * 6)) $testdir/file1 >> $seqres.full
+_pwrite_byte 0x61 $((blksz * 2)) $((blksz * 6)) $testdir/file2 >> $seqres.full
+_pwrite_byte 0x62 $(((blksz * 6) - 33)) 1 $testdir/file2 >> $seqres.full
+_test_cycle_mount
+
+md5sum $testdir/file1 | _filter_test_dir
+md5sum $testdir/file2 | _filter_test_dir
+
+_compare_range $testdir/file1 0 $testdir/file2 0 "$((blksz * 8))" \
+       || echo "Files 1-2 do not match (intentional)"
+
+echo "(partial) dedupe the middle blocks together"
+free_before=$(stat -f -c '%a' $testdir)
+_dedupe_range $testdir/file1 $((blksz * 4)) $testdir/file2 \
+		$((blksz * 4)) $((blksz * 2)) 2>&1 | _filter_xfs_io_numbers | _filter_dedupe_error
+_test_cycle_mount
+${FILEFRAG_PROG} -v $testdir/file1 >> $seqres.full
+${FILEFRAG_PROG} -v $testdir/file2 >> $seqres.full
+free_after=$(stat -f -c '%a' $testdir)
+echo "freesp changed by $free_before -> $free_after" >> $seqres.full
+
+echo "Compare sections"
+md5sum $testdir/file1 | _filter_test_dir
+md5sum $testdir/file2 | _filter_test_dir
+
+_compare_range $testdir/file1 0 $testdir/file2 0 $((blksz * 4)) \
+       || echo "Start sections do not match (error)"
+
+_compare_range $testdir/file1 $((blksz * 4)) $testdir/file2 \
+		$((blksz * 4)) $((blksz * 2)) \
+       || echo "Middle sections do not match (intentional)"
+
+_compare_range $testdir/file1 $((blksz * 6)) $testdir/file2 \
+		$((blksz * 6)) $((blksz * 2)) \
+       || echo "End sections do not match (error)"
+
+# success, all done
+status=0
+exit
diff --git a/tests/generic/937.out b/tests/generic/937.out
new file mode 100644
index 00000000..496975d6
--- /dev/null
+++ b/tests/generic/937.out
@@ -0,0 +1,12 @@
+QA output created by 937
+Create the original files
+35ac8d7917305c385c30f3d82c30a8f6  TEST_DIR/test-937/file1
+39578c21e2cb9f6049b1cf7fc7be12a6  TEST_DIR/test-937/file2
+Files 1-2 do not match (intentional)
+(partial) dedupe the middle blocks together
+deduped XXXX/XXXX bytes at offset XXXX
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+Compare sections
+35ac8d7917305c385c30f3d82c30a8f6  TEST_DIR/test-937/file1
+39578c21e2cb9f6049b1cf7fc7be12a6  TEST_DIR/test-937/file2
+Middle sections do not match (intentional)
diff --git a/tests/generic/group b/tests/generic/group
index 06b062e1..ef08c0de 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -509,3 +509,7 @@
 504 auto quick locks
 505 shutdown auto quick metadata
 707 auto quick rw collapse zero
+934 auto quick clone
+935 auto quick clone
+936 auto quick clone
+937 auto quick dedupe clone

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

* Re: [PATCH 4/6] xfs/270: use _scratch_xfs_set_metadata_field to fuzz rocompat bits
  2018-10-05  0:19 ` [PATCH 4/6] xfs/270: use _scratch_xfs_set_metadata_field to fuzz rocompat bits Darrick J. Wong
@ 2018-10-05  6:54   ` Xiao Yang
  0 siblings, 0 replies; 10+ messages in thread
From: Xiao Yang @ 2018-10-05  6:54 UTC (permalink / raw)
  To: Darrick J. Wong; +Cc: guaneryu, linux-xfs, linux-fsdevel, fstests

On 2018/10/05 8:19, Darrick J. Wong wrote:
> From: Darrick J. Wong<darrick.wong@oracle.com>
>
> Use the helper to set the metadata field so that we can bypass write
> verifier checks.
Hi Darrick,

When write command doesn't support -d option, xfs/270 with the patch 
works well.
Reviewed-by: Xiao Yang <yangx.jy@cn.fujitsu.com>

Thanks,
Xiao Yang
> Signed-off-by: Darrick J. Wong<darrick.wong@oracle.com>
> ---
>   tests/xfs/270 |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>
> diff --git a/tests/xfs/270 b/tests/xfs/270
> index da66bc33..fb72ba7c 100755
> --- a/tests/xfs/270
> +++ b/tests/xfs/270
> @@ -44,8 +44,8 @@ _scratch_mkfs_xfs>>$seqres.full 2>&1
>   # set the highest bit of features_ro_compat, use it as an unknown
>   # feature bit. If one day this bit become known feature, please
>   # change this case.
> -$XFS_DB_PROG -x -c "sb 0" -c "write -d features_ro_compat $((2**31))" \
> -	$SCRATCH_DEV | grep -v "Allowing write of corrupted data"
> +_scratch_xfs_set_metadata_field "features_ro_compat" "$((2**31))" "sb 0" | \
> +	grep 'features_ro_compat'
>
>   # rw mount with unknown ro-compat feature should fail
>   echo "rw mount test"
>
>
>
>

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

* Re: [PATCH 6/6] generic: test reflink side effects
  2018-10-05  0:19 ` [PATCH 6/6] generic: test reflink side effects Darrick J. Wong
@ 2018-10-14 15:40   ` Eryu Guan
  2018-10-15 18:57     ` Darrick J. Wong
  0 siblings, 1 reply; 10+ messages in thread
From: Eryu Guan @ 2018-10-14 15:40 UTC (permalink / raw)
  To: Darrick J. Wong; +Cc: linux-xfs, linux-fsdevel, fstests

On Thu, Oct 04, 2018 at 05:19:45PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Test that ctime gets updated and suid is cleared when we reflink.
> Ensure we can't reflink about RLIMIT_FSIZE.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  tests/generic/934     |   63 ++++++++++++++++++++++++++++++++++++++
>  tests/generic/934.out |    2 +
>  tests/generic/935     |   48 +++++++++++++++++++++++++++++
>  tests/generic/935.out |    2 +
>  tests/generic/936     |   70 ++++++++++++++++++++++++++++++++++++++++++
>  tests/generic/936.out |    5 +++
>  tests/generic/937     |   81 +++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/generic/937.out |   12 +++++++
>  tests/generic/group   |    4 ++
>  9 files changed, 287 insertions(+)
>  create mode 100755 tests/generic/934
>  create mode 100644 tests/generic/934.out
>  create mode 100755 tests/generic/935
>  create mode 100644 tests/generic/935.out
>  create mode 100755 tests/generic/936
>  create mode 100644 tests/generic/936.out
>  create mode 100755 tests/generic/937
>  create mode 100644 tests/generic/937.out
> 
> 
> diff --git a/tests/generic/934 b/tests/generic/934
> new file mode 100755
> index 00000000..ec7ad092
> --- /dev/null
> +++ b/tests/generic/934
> @@ -0,0 +1,63 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2018 Oracle, Inc.  All Rights Reserved.
> +#
> +# FS QA Test No. 934
> +#
> +# Ensure that ctime is updated and capabilities are cleared when reflinking.
> +#
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +tmp=/tmp/$$
> +status=1	# failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> +	cd /
> +	rm -f $tmp.*
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +. ./common/reflink
> +
> +# real QA test starts here
> +_supported_fs generic
> +_supported_os Linux
> +_require_scratch_reflink
> +_require_command "$GETCAP_PROG" getcap
> +_require_command "$SETCAP_PROG" setcap
> +
> +rm -f $seqres.full
> +
> +_scratch_mkfs >>$seqres.full 2>&1
> +_scratch_mount
> +
> +$XFS_IO_PROG -f -c "pwrite -S 0x18 0 1m" $SCRATCH_MNT/foo >>$seqres.full
> +$XFS_IO_PROG -f -c "pwrite -S 0x20 0 1m" $SCRATCH_MNT/bar >>$seqres.full
> +
> +$SETCAP_PROG cap_setgid,cap_setuid+ep $SCRATCH_MNT/bar
> +
> +before_cap="$($GETCAP_PROG -v $SCRATCH_MNT/bar)"
> +before_ctime="$(stat -c '%z' $SCRATCH_MNT/bar)"
> +
> +sleep 1
> +
> +$XFS_IO_PROG -c "reflink $SCRATCH_MNT/foo" $SCRATCH_MNT/bar >> $seqres.full 2>&1
> +#trace-cmd record -p function_graph -l 'file_remove_privs' -g 'file_remove_privs' $XFS_IO_PROG -c "reflink $SCRATCH_MNT/foo" $SCRATCH_MNT/bar >> $seqres.full 2>&1

Debug trace-cmd command?

> +
> +after_cap="$($GETCAP_PROG -v $SCRATCH_MNT/bar)"
> +after_ctime="$(stat -c '%z' $SCRATCH_MNT/bar)"
> +
> +echo "$before_cap $before_ctime" >> $seqres.full
> +echo "$after_cap $after_ctime" >> $seqres.full
> +
> +test "$before_cap" != "$after_cap" || echo "Expected capabilities to drop."
> +test "$before_ctime" != "$after_ctime" || echo "Expected ctime to change."
> +
> +echo Silence is golden.
> +status=0
> +exit
> diff --git a/tests/generic/934.out b/tests/generic/934.out
> new file mode 100644
> index 00000000..98f0bb3f
> --- /dev/null
> +++ b/tests/generic/934.out
> @@ -0,0 +1,2 @@
> +QA output created by 934
> +Silence is golden.
> diff --git a/tests/generic/935 b/tests/generic/935
> new file mode 100755
> index 00000000..3b0eaa95
> --- /dev/null
> +++ b/tests/generic/935
> @@ -0,0 +1,48 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2018 Oracle, Inc.  All Rights Reserved.
> +#
> +# FS QA Test No. 935
> +#
> +# Ensure that file size resource limits are respected when reflinking.
> +#
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +tmp=/tmp/$$
> +status=1	# failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> +	cd /
> +	rm -f $tmp.*
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +. ./common/reflink
> +
> +# real QA test starts here
> +_supported_fs generic
> +_supported_os Linux
> +_require_scratch_reflink

_require_user

> +
> +rm -f $seqres.full
> +
> +_scratch_mkfs >>$seqres.full 2>&1
> +_scratch_mount
> +
> +chmod a+rwx $SCRATCH_MNT
> +$XFS_IO_PROG -f -c "pwrite -S 0x18 0 1m" $SCRATCH_MNT/foo >>$seqres.full
> +su -s/bin/bash - $qa_user -c "ulimit -f 64 ; $XFS_IO_PROG -f -c \"reflink $SCRATCH_MNT/foo\" $SCRATCH_MNT/bar" >> $seqres.full 2>&1
> +
> +sz="$(stat -c '%s' $SCRATCH_MNT/bar)"
> +if [ "$sz" -ne 0 ] && [ "$sz" -ne 65536 ]; then
> +	echo "Oddball file size $sz??"
> +fi
> +
> +echo Silence is golden.
> +status=0
> +exit
> diff --git a/tests/generic/935.out b/tests/generic/935.out
> new file mode 100644
> index 00000000..adb5e92a
> --- /dev/null
> +++ b/tests/generic/935.out
> @@ -0,0 +1,2 @@
> +QA output created by 935
> +Silence is golden.
> diff --git a/tests/generic/936 b/tests/generic/936
> new file mode 100755
> index 00000000..eacf9b5e
> --- /dev/null
> +++ b/tests/generic/936
> @@ -0,0 +1,70 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2018 Oracle, Inc.  All Rights Reserved.
> +#
> +# FS QA Test No. 936
> +#
> +# Ensure that reflinking into a file well beyond EOF zeroes everything between
> +# the old EOF and the start of the newly linked chunk.  This is an adaptation
> +# of a reproducer script that Eric Sandeen formulated from a stale data
> +# exposure bug uncovered by shared/010.
> +#
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +tmp=/tmp/$$
> +status=1	# failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> +	cd /
> +	rm -f $tmp.*
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +. ./common/reflink
> +
> +# real QA test starts here
> +_supported_fs generic
> +_supported_os Linux
> +_require_scratch_reflink
> +
> +rm -f $seqres.full
> +
> +# Fill disk with a well known pattern so that stale data exposure becomes much
> +# more obvious.
> +$XFS_IO_PROG -c "pwrite -S 0x58 -b 1m 0 300m" $SCRATCH_DEV >> $seqres.full
> +_scratch_mkfs_sized $((300 * 1048576)) >>$seqres.full 2>&1
> +_scratch_mount
> +
> +DONOR1=$SCRATCH_MNT/a
> +TARGET=$SCRATCH_MNT/b
> +blksz=65536
> +
> +$XFS_IO_PROG -f -c "pwrite -S 0x72 0 $blksz" $DONOR1 >> $seqres.full
> +
> +$XFS_IO_PROG -f \
> +	-c "falloc -k $((blksz*2)) $blksz"        \
> +	-c "pwrite -S 0x57 $((blksz*16)) 8192" \
> +        -c "fdatasync" \

Looks like an indention issue here.

> +	-c 'stat' \
> +	-c "reflink $DONOR1 0 $((blksz*17)) $blksz" \
> +                $TARGET >> $seqres.full
> +
> +od -tx1 -Ad -c $TARGET >> $seqres.full
> +${FILEFRAG_PROG} -v $TARGET >> $seqres.full

Seems like this filefrag is only here for debug purpose, and we could
through away the stderr output if filefrag is not installed, so we don't
have to _require_command for filefrag.

> +md5sum $DONOR1 | _filter_scratch
> +md5sum $TARGET | _filter_scratch
> +
> +_scratch_cycle_mount
> +
> +od -tx1 -Ad -c $TARGET >> $seqres.full
> +${FILEFRAG_PROG} -v $TARGET >> $seqres.full
> +md5sum $DONOR1 | _filter_scratch
> +md5sum $TARGET | _filter_scratch
> +
> +status=0
> +exit
> diff --git a/tests/generic/936.out b/tests/generic/936.out
> new file mode 100644
> index 00000000..73685490
> --- /dev/null
> +++ b/tests/generic/936.out
> @@ -0,0 +1,5 @@
> +QA output created by 936
> +34a4daf52c562253a2f6108c5123605a  SCRATCH_MNT/a
> +4fe4dfe3d2244bd380adcefdc5006e37  SCRATCH_MNT/b
> +34a4daf52c562253a2f6108c5123605a  SCRATCH_MNT/a
> +4fe4dfe3d2244bd380adcefdc5006e37  SCRATCH_MNT/b
> diff --git a/tests/generic/937 b/tests/generic/937
> new file mode 100755
> index 00000000..e3a94dbb
> --- /dev/null
> +++ b/tests/generic/937
> @@ -0,0 +1,81 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2018, Oracle and/or its affiliates.  All Rights Reserved.
> +#
> +# FS QA Test No. 937
> +#
> +# Ensuring that we cannot dedupe non-matching parts of files:
> +#   - Fail to dedupe non-identical parts of two different files
> +#   - Check that nothing changes in either file
> +#
> +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
> +
> +_cleanup()
> +{
> +    cd /
> +    rm -rf $tmp.* $testdir
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +. ./common/reflink
> +
> +# real QA test starts here
> +_supported_os Linux
> +_require_test_dedupe
> +
> +rm -f $seqres.full
> +
> +testdir=$TEST_DIR/test-$seq
> +rm -rf $testdir
> +mkdir $testdir
> +
> +echo "Create the original files"
> +blksz=65536
> +_pwrite_byte 0x61 $((blksz * 2)) $((blksz * 6)) $testdir/file1 >> $seqres.full
> +_pwrite_byte 0x61 $((blksz * 2)) $((blksz * 6)) $testdir/file2 >> $seqres.full
> +_pwrite_byte 0x62 $(((blksz * 6) - 33)) 1 $testdir/file2 >> $seqres.full
> +_test_cycle_mount
> +
> +md5sum $testdir/file1 | _filter_test_dir
> +md5sum $testdir/file2 | _filter_test_dir
> +
> +_compare_range $testdir/file1 0 $testdir/file2 0 "$((blksz * 8))" \
> +       || echo "Files 1-2 do not match (intentional)"
> +
> +echo "(partial) dedupe the middle blocks together"
> +free_before=$(stat -f -c '%a' $testdir)
> +_dedupe_range $testdir/file1 $((blksz * 4)) $testdir/file2 \
> +		$((blksz * 4)) $((blksz * 2)) 2>&1 | _filter_xfs_io_numbers | _filter_dedupe_error
> +_test_cycle_mount
> +${FILEFRAG_PROG} -v $testdir/file1 >> $seqres.full
> +${FILEFRAG_PROG} -v $testdir/file2 >> $seqres.full
> +free_after=$(stat -f -c '%a' $testdir)
> +echo "freesp changed by $free_before -> $free_after" >> $seqres.full
> +
> +echo "Compare sections"
> +md5sum $testdir/file1 | _filter_test_dir
> +md5sum $testdir/file2 | _filter_test_dir
> +
> +_compare_range $testdir/file1 0 $testdir/file2 0 $((blksz * 4)) \
> +       || echo "Start sections do not match (error)"
> +
> +_compare_range $testdir/file1 $((blksz * 4)) $testdir/file2 \
> +		$((blksz * 4)) $((blksz * 2)) \
> +       || echo "Middle sections do not match (intentional)"
> +
> +_compare_range $testdir/file1 $((blksz * 6)) $testdir/file2 \
> +		$((blksz * 6)) $((blksz * 2)) \
> +       || echo "End sections do not match (error)"
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/generic/937.out b/tests/generic/937.out
> new file mode 100644
> index 00000000..496975d6
> --- /dev/null
> +++ b/tests/generic/937.out
> @@ -0,0 +1,12 @@
> +QA output created by 937
> +Create the original files
> +35ac8d7917305c385c30f3d82c30a8f6  TEST_DIR/test-937/file1
> +39578c21e2cb9f6049b1cf7fc7be12a6  TEST_DIR/test-937/file2
> +Files 1-2 do not match (intentional)
> +(partial) dedupe the middle blocks together
> +deduped XXXX/XXXX bytes at offset XXXX
> +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

I hit failure like:

-deduped XXXX/XXXX bytes at offset XXXX
-XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+XFS_IOC_FILE_EXTENT_SAME: Extents did not match.

I suspected "Extents did not match." is what we actually expected?

Thanks,
Eryu

P.S.
Patch 1-5 look fine to me, but drop this patch for now.

> +Compare sections
> +35ac8d7917305c385c30f3d82c30a8f6  TEST_DIR/test-937/file1
> +39578c21e2cb9f6049b1cf7fc7be12a6  TEST_DIR/test-937/file2
> +Middle sections do not match (intentional)
> diff --git a/tests/generic/group b/tests/generic/group
> index 06b062e1..ef08c0de 100644
> --- a/tests/generic/group
> +++ b/tests/generic/group
> @@ -509,3 +509,7 @@
>  504 auto quick locks
>  505 shutdown auto quick metadata
>  707 auto quick rw collapse zero
> +934 auto quick clone
> +935 auto quick clone
> +936 auto quick clone
> +937 auto quick dedupe clone
> 

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

* Re: [PATCH 6/6] generic: test reflink side effects
  2018-10-14 15:40   ` Eryu Guan
@ 2018-10-15 18:57     ` Darrick J. Wong
  0 siblings, 0 replies; 10+ messages in thread
From: Darrick J. Wong @ 2018-10-15 18:57 UTC (permalink / raw)
  To: Eryu Guan; +Cc: linux-xfs, linux-fsdevel, fstests

On Sun, Oct 14, 2018 at 11:40:39PM +0800, Eryu Guan wrote:
> On Thu, Oct 04, 2018 at 05:19:45PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > Test that ctime gets updated and suid is cleared when we reflink.
> > Ensure we can't reflink about RLIMIT_FSIZE.
> > 
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  tests/generic/934     |   63 ++++++++++++++++++++++++++++++++++++++
> >  tests/generic/934.out |    2 +
> >  tests/generic/935     |   48 +++++++++++++++++++++++++++++
> >  tests/generic/935.out |    2 +
> >  tests/generic/936     |   70 ++++++++++++++++++++++++++++++++++++++++++
> >  tests/generic/936.out |    5 +++
> >  tests/generic/937     |   81 +++++++++++++++++++++++++++++++++++++++++++++++++
> >  tests/generic/937.out |   12 +++++++
> >  tests/generic/group   |    4 ++
> >  9 files changed, 287 insertions(+)
> >  create mode 100755 tests/generic/934
> >  create mode 100644 tests/generic/934.out
> >  create mode 100755 tests/generic/935
> >  create mode 100644 tests/generic/935.out
> >  create mode 100755 tests/generic/936
> >  create mode 100644 tests/generic/936.out
> >  create mode 100755 tests/generic/937
> >  create mode 100644 tests/generic/937.out
> > 
> > 
> > diff --git a/tests/generic/934 b/tests/generic/934
> > new file mode 100755
> > index 00000000..ec7ad092
> > --- /dev/null
> > +++ b/tests/generic/934
> > @@ -0,0 +1,63 @@
> > +#! /bin/bash
> > +# SPDX-License-Identifier: GPL-2.0
> > +# Copyright (c) 2018 Oracle, Inc.  All Rights Reserved.
> > +#
> > +# FS QA Test No. 934
> > +#
> > +# Ensure that ctime is updated and capabilities are cleared when reflinking.
> > +#
> > +seq=`basename $0`
> > +seqres=$RESULT_DIR/$seq
> > +echo "QA output created by $seq"
> > +tmp=/tmp/$$
> > +status=1	# failure is the default!
> > +trap "_cleanup; exit \$status" 0 1 2 3 15
> > +
> > +_cleanup()
> > +{
> > +	cd /
> > +	rm -f $tmp.*
> > +}
> > +
> > +# get standard environment, filters and checks
> > +. ./common/rc
> > +. ./common/filter
> > +. ./common/reflink
> > +
> > +# real QA test starts here
> > +_supported_fs generic
> > +_supported_os Linux
> > +_require_scratch_reflink
> > +_require_command "$GETCAP_PROG" getcap
> > +_require_command "$SETCAP_PROG" setcap
> > +
> > +rm -f $seqres.full
> > +
> > +_scratch_mkfs >>$seqres.full 2>&1
> > +_scratch_mount
> > +
> > +$XFS_IO_PROG -f -c "pwrite -S 0x18 0 1m" $SCRATCH_MNT/foo >>$seqres.full
> > +$XFS_IO_PROG -f -c "pwrite -S 0x20 0 1m" $SCRATCH_MNT/bar >>$seqres.full
> > +
> > +$SETCAP_PROG cap_setgid,cap_setuid+ep $SCRATCH_MNT/bar
> > +
> > +before_cap="$($GETCAP_PROG -v $SCRATCH_MNT/bar)"
> > +before_ctime="$(stat -c '%z' $SCRATCH_MNT/bar)"
> > +
> > +sleep 1
> > +
> > +$XFS_IO_PROG -c "reflink $SCRATCH_MNT/foo" $SCRATCH_MNT/bar >> $seqres.full 2>&1
> > +#trace-cmd record -p function_graph -l 'file_remove_privs' -g 'file_remove_privs' $XFS_IO_PROG -c "reflink $SCRATCH_MNT/foo" $SCRATCH_MNT/bar >> $seqres.full 2>&1
> 
> Debug trace-cmd command?

Oops, I'll remove that.

> > +
> > +after_cap="$($GETCAP_PROG -v $SCRATCH_MNT/bar)"
> > +after_ctime="$(stat -c '%z' $SCRATCH_MNT/bar)"
> > +
> > +echo "$before_cap $before_ctime" >> $seqres.full
> > +echo "$after_cap $after_ctime" >> $seqres.full
> > +
> > +test "$before_cap" != "$after_cap" || echo "Expected capabilities to drop."
> > +test "$before_ctime" != "$after_ctime" || echo "Expected ctime to change."
> > +
> > +echo Silence is golden.
> > +status=0
> > +exit
> > diff --git a/tests/generic/934.out b/tests/generic/934.out
> > new file mode 100644
> > index 00000000..98f0bb3f
> > --- /dev/null
> > +++ b/tests/generic/934.out
> > @@ -0,0 +1,2 @@
> > +QA output created by 934
> > +Silence is golden.
> > diff --git a/tests/generic/935 b/tests/generic/935
> > new file mode 100755
> > index 00000000..3b0eaa95
> > --- /dev/null
> > +++ b/tests/generic/935
> > @@ -0,0 +1,48 @@
> > +#! /bin/bash
> > +# SPDX-License-Identifier: GPL-2.0
> > +# Copyright (c) 2018 Oracle, Inc.  All Rights Reserved.
> > +#
> > +# FS QA Test No. 935
> > +#
> > +# Ensure that file size resource limits are respected when reflinking.
> > +#
> > +seq=`basename $0`
> > +seqres=$RESULT_DIR/$seq
> > +echo "QA output created by $seq"
> > +tmp=/tmp/$$
> > +status=1	# failure is the default!
> > +trap "_cleanup; exit \$status" 0 1 2 3 15
> > +
> > +_cleanup()
> > +{
> > +	cd /
> > +	rm -f $tmp.*
> > +}
> > +
> > +# get standard environment, filters and checks
> > +. ./common/rc
> > +. ./common/filter
> > +. ./common/reflink
> > +
> > +# real QA test starts here
> > +_supported_fs generic
> > +_supported_os Linux
> > +_require_scratch_reflink
> 
> _require_user
> 
> > +
> > +rm -f $seqres.full
> > +
> > +_scratch_mkfs >>$seqres.full 2>&1
> > +_scratch_mount
> > +
> > +chmod a+rwx $SCRATCH_MNT
> > +$XFS_IO_PROG -f -c "pwrite -S 0x18 0 1m" $SCRATCH_MNT/foo >>$seqres.full
> > +su -s/bin/bash - $qa_user -c "ulimit -f 64 ; $XFS_IO_PROG -f -c \"reflink $SCRATCH_MNT/foo\" $SCRATCH_MNT/bar" >> $seqres.full 2>&1
> > +
> > +sz="$(stat -c '%s' $SCRATCH_MNT/bar)"
> > +if [ "$sz" -ne 0 ] && [ "$sz" -ne 65536 ]; then
> > +	echo "Oddball file size $sz??"
> > +fi
> > +
> > +echo Silence is golden.
> > +status=0
> > +exit
> > diff --git a/tests/generic/935.out b/tests/generic/935.out
> > new file mode 100644
> > index 00000000..adb5e92a
> > --- /dev/null
> > +++ b/tests/generic/935.out
> > @@ -0,0 +1,2 @@
> > +QA output created by 935
> > +Silence is golden.
> > diff --git a/tests/generic/936 b/tests/generic/936
> > new file mode 100755
> > index 00000000..eacf9b5e
> > --- /dev/null
> > +++ b/tests/generic/936
> > @@ -0,0 +1,70 @@
> > +#! /bin/bash
> > +# SPDX-License-Identifier: GPL-2.0
> > +# Copyright (c) 2018 Oracle, Inc.  All Rights Reserved.
> > +#
> > +# FS QA Test No. 936
> > +#
> > +# Ensure that reflinking into a file well beyond EOF zeroes everything between
> > +# the old EOF and the start of the newly linked chunk.  This is an adaptation
> > +# of a reproducer script that Eric Sandeen formulated from a stale data
> > +# exposure bug uncovered by shared/010.
> > +#
> > +seq=`basename $0`
> > +seqres=$RESULT_DIR/$seq
> > +echo "QA output created by $seq"
> > +tmp=/tmp/$$
> > +status=1	# failure is the default!
> > +trap "_cleanup; exit \$status" 0 1 2 3 15
> > +
> > +_cleanup()
> > +{
> > +	cd /
> > +	rm -f $tmp.*
> > +}
> > +
> > +# get standard environment, filters and checks
> > +. ./common/rc
> > +. ./common/filter
> > +. ./common/reflink
> > +
> > +# real QA test starts here
> > +_supported_fs generic
> > +_supported_os Linux
> > +_require_scratch_reflink
> > +
> > +rm -f $seqres.full
> > +
> > +# Fill disk with a well known pattern so that stale data exposure becomes much
> > +# more obvious.
> > +$XFS_IO_PROG -c "pwrite -S 0x58 -b 1m 0 300m" $SCRATCH_DEV >> $seqres.full
> > +_scratch_mkfs_sized $((300 * 1048576)) >>$seqres.full 2>&1
> > +_scratch_mount
> > +
> > +DONOR1=$SCRATCH_MNT/a
> > +TARGET=$SCRATCH_MNT/b
> > +blksz=65536
> > +
> > +$XFS_IO_PROG -f -c "pwrite -S 0x72 0 $blksz" $DONOR1 >> $seqres.full
> > +
> > +$XFS_IO_PROG -f \
> > +	-c "falloc -k $((blksz*2)) $blksz"        \
> > +	-c "pwrite -S 0x57 $((blksz*16)) 8192" \
> > +        -c "fdatasync" \
> 
> Looks like an indention issue here.
> 
> > +	-c 'stat' \
> > +	-c "reflink $DONOR1 0 $((blksz*17)) $blksz" \
> > +                $TARGET >> $seqres.full
> > +
> > +od -tx1 -Ad -c $TARGET >> $seqres.full
> > +${FILEFRAG_PROG} -v $TARGET >> $seqres.full
> 
> Seems like this filefrag is only here for debug purpose, and we could
> through away the stderr output if filefrag is not installed, so we don't
> have to _require_command for filefrag.
> 
> > +md5sum $DONOR1 | _filter_scratch
> > +md5sum $TARGET | _filter_scratch
> > +
> > +_scratch_cycle_mount
> > +
> > +od -tx1 -Ad -c $TARGET >> $seqres.full
> > +${FILEFRAG_PROG} -v $TARGET >> $seqres.full
> > +md5sum $DONOR1 | _filter_scratch
> > +md5sum $TARGET | _filter_scratch
> > +
> > +status=0
> > +exit
> > diff --git a/tests/generic/936.out b/tests/generic/936.out
> > new file mode 100644
> > index 00000000..73685490
> > --- /dev/null
> > +++ b/tests/generic/936.out
> > @@ -0,0 +1,5 @@
> > +QA output created by 936
> > +34a4daf52c562253a2f6108c5123605a  SCRATCH_MNT/a
> > +4fe4dfe3d2244bd380adcefdc5006e37  SCRATCH_MNT/b
> > +34a4daf52c562253a2f6108c5123605a  SCRATCH_MNT/a
> > +4fe4dfe3d2244bd380adcefdc5006e37  SCRATCH_MNT/b
> > diff --git a/tests/generic/937 b/tests/generic/937
> > new file mode 100755
> > index 00000000..e3a94dbb
> > --- /dev/null
> > +++ b/tests/generic/937
> > @@ -0,0 +1,81 @@
> > +#! /bin/bash
> > +# SPDX-License-Identifier: GPL-2.0
> > +# Copyright (c) 2018, Oracle and/or its affiliates.  All Rights Reserved.
> > +#
> > +# FS QA Test No. 937
> > +#
> > +# Ensuring that we cannot dedupe non-matching parts of files:
> > +#   - Fail to dedupe non-identical parts of two different files
> > +#   - Check that nothing changes in either file
> > +#
> > +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
> > +
> > +_cleanup()
> > +{
> > +    cd /
> > +    rm -rf $tmp.* $testdir
> > +}
> > +
> > +# get standard environment, filters and checks
> > +. ./common/rc
> > +. ./common/filter
> > +. ./common/reflink
> > +
> > +# real QA test starts here
> > +_supported_os Linux
> > +_require_test_dedupe
> > +
> > +rm -f $seqres.full
> > +
> > +testdir=$TEST_DIR/test-$seq
> > +rm -rf $testdir
> > +mkdir $testdir
> > +
> > +echo "Create the original files"
> > +blksz=65536
> > +_pwrite_byte 0x61 $((blksz * 2)) $((blksz * 6)) $testdir/file1 >> $seqres.full
> > +_pwrite_byte 0x61 $((blksz * 2)) $((blksz * 6)) $testdir/file2 >> $seqres.full
> > +_pwrite_byte 0x62 $(((blksz * 6) - 33)) 1 $testdir/file2 >> $seqres.full
> > +_test_cycle_mount
> > +
> > +md5sum $testdir/file1 | _filter_test_dir
> > +md5sum $testdir/file2 | _filter_test_dir
> > +
> > +_compare_range $testdir/file1 0 $testdir/file2 0 "$((blksz * 8))" \
> > +       || echo "Files 1-2 do not match (intentional)"
> > +
> > +echo "(partial) dedupe the middle blocks together"
> > +free_before=$(stat -f -c '%a' $testdir)
> > +_dedupe_range $testdir/file1 $((blksz * 4)) $testdir/file2 \
> > +		$((blksz * 4)) $((blksz * 2)) 2>&1 | _filter_xfs_io_numbers | _filter_dedupe_error
> > +_test_cycle_mount
> > +${FILEFRAG_PROG} -v $testdir/file1 >> $seqres.full
> > +${FILEFRAG_PROG} -v $testdir/file2 >> $seqres.full
> > +free_after=$(stat -f -c '%a' $testdir)
> > +echo "freesp changed by $free_before -> $free_after" >> $seqres.full
> > +
> > +echo "Compare sections"
> > +md5sum $testdir/file1 | _filter_test_dir
> > +md5sum $testdir/file2 | _filter_test_dir
> > +
> > +_compare_range $testdir/file1 0 $testdir/file2 0 $((blksz * 4)) \
> > +       || echo "Start sections do not match (error)"
> > +
> > +_compare_range $testdir/file1 $((blksz * 4)) $testdir/file2 \
> > +		$((blksz * 4)) $((blksz * 2)) \
> > +       || echo "Middle sections do not match (intentional)"
> > +
> > +_compare_range $testdir/file1 $((blksz * 6)) $testdir/file2 \
> > +		$((blksz * 6)) $((blksz * 2)) \
> > +       || echo "End sections do not match (error)"
> > +
> > +# success, all done
> > +status=0
> > +exit
> > diff --git a/tests/generic/937.out b/tests/generic/937.out
> > new file mode 100644
> > index 00000000..496975d6
> > --- /dev/null
> > +++ b/tests/generic/937.out
> > @@ -0,0 +1,12 @@
> > +QA output created by 937
> > +Create the original files
> > +35ac8d7917305c385c30f3d82c30a8f6  TEST_DIR/test-937/file1
> > +39578c21e2cb9f6049b1cf7fc7be12a6  TEST_DIR/test-937/file2
> > +Files 1-2 do not match (intentional)
> > +(partial) dedupe the middle blocks together
> > +deduped XXXX/XXXX bytes at offset XXXX
> > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> 
> I hit failure like:
> 
> -deduped XXXX/XXXX bytes at offset XXXX
> -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> +XFS_IOC_FILE_EXTENT_SAME: Extents did not match.
> 
> I suspected "Extents did not match." is what we actually expected?

Yeah.  I mistakenly thought that the dedupe ioctl could return
bytes_deduped < len, but the existing clients go berserk in shared/010
so ... I fixed the code and the test to follow the btrfs precedent.

--D

> Thanks,
> Eryu
> 
> P.S.
> Patch 1-5 look fine to me, but drop this patch for now.
> 
> > +Compare sections
> > +35ac8d7917305c385c30f3d82c30a8f6  TEST_DIR/test-937/file1
> > +39578c21e2cb9f6049b1cf7fc7be12a6  TEST_DIR/test-937/file2
> > +Middle sections do not match (intentional)
> > diff --git a/tests/generic/group b/tests/generic/group
> > index 06b062e1..ef08c0de 100644
> > --- a/tests/generic/group
> > +++ b/tests/generic/group
> > @@ -509,3 +509,7 @@
> >  504 auto quick locks
> >  505 shutdown auto quick metadata
> >  707 auto quick rw collapse zero
> > +934 auto quick clone
> > +935 auto quick clone
> > +936 auto quick clone
> > +937 auto quick dedupe clone
> > 

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

end of thread, other threads:[~2018-10-16  2:44 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-05  0:19 [PATCH 0/6] fstests: fixes and new tests Darrick J. Wong
2018-10-05  0:19 ` [PATCH 1/6] generic: add bfoster's alternate reproducer Darrick J. Wong
2018-10-05  0:19 ` [PATCH 2/6] xfs: test mount time summary counter check and fix Darrick J. Wong
2018-10-05  0:19 ` [PATCH 3/6] xfs/189: skip 'barrier' mount option test on newer kernels Darrick J. Wong
2018-10-05  0:19 ` [PATCH 4/6] xfs/270: use _scratch_xfs_set_metadata_field to fuzz rocompat bits Darrick J. Wong
2018-10-05  6:54   ` Xiao Yang
2018-10-05  0:19 ` [PATCH 5/6] xfs/288: shut up verifier error Darrick J. Wong
2018-10-05  0:19 ` [PATCH 6/6] generic: test reflink side effects Darrick J. Wong
2018-10-14 15:40   ` Eryu Guan
2018-10-15 18:57     ` Darrick J. Wong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).