xfstests: generic swap file tests
v3 cover xfstests: generic swap file tests
From: Omar Sandoval <[email protected]>
Changes since v2:
- Remove file before formatting in _format_swapfile
- Comment on chattr in _format_swapfile
- Remove unnecessary label
- Fix typo in commit message of patch 3
- Redirect chattr +C output in patch 5 to fix XFS failures
Omar Sandoval (5):
xfstests: create swap group
generic: enable swapfile tests on Btrfs
generic: add test for dedupe on an active swapfile
generic: add test for truncate/fpunch of an active swapfile
generic: test invalid swap file activation
.gitignore | 2 ++ common/rc | 17 +++++++-- src/Makefile | 2 +- src/mkswap.c | 83 +++++++++++++++++++++++++++++++++++++++++++ src/swapon.c | 24 +++++++++++++ tests/generic/356 | 7 ++-- tests/generic/357 | 6 ++-- tests/generic/492 | 76 +++++++++++++++++++++++++++++++++++++++ tests/generic/492.out | 7 ++++ tests/generic/493 | 73 +++++++++++++++++++++++++++++++++++++ tests/generic/493.out | 8 +++++ tests/generic/494 | 77 +++++++++++++++++++++++++++++++++++++++ tests/generic/494.out | 5 +++ tests/generic/group | 7 ++-- tests/xfs/group | 2 +- 15 files changed, 383 insertions(+), 13 deletions(-) create mode 100644 src/mkswap.c create mode 100644 src/swapon.c create mode 100755 tests/generic/492 create mode 100644 tests/generic/492.out create mode 100755 tests/generic/493 create mode 100644 tests/generic/493.out create mode 100755 tests/generic/494 create mode 100644 tests/generic/494.out
Signature · 1 line
2.17.0
PATCH v3 1/5 xfstests: create swap group
From: Omar Sandoval <[email protected]>
I'm going to add a bunch of tests for swap files, so create a group for them and add the existing tests.
Signed-off-by Omar Sandoval <[email protected]>
--- tests/generic/group | 4 ++-- tests/xfs/group | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
tests/generic/group +2 -2
@@ -358,8 +358,8 @@ 353 auto quick clone 354 auto 355 auto quick -356 auto quick clone -357 auto quick clone +356 auto quick clone swap +357 auto quick clone swap 358 auto quick clone 359 auto quick clone 360 auto quick metadata
tests/xfs/group +1 -1
@@ -416,7 +416,7 @@ 416 dangerous_fuzzers dangerous_scrub dangerous_repair 417 dangerous_fuzzers dangerous_scrub dangerous_online_repair 418 dangerous_fuzzers dangerous_scrub dangerous_repair -419 auto quick +419 auto quick swap 420 auto quick clone dedupe 421 auto quick clone dedupe 422 dangerous_scrub dangerous_online_repair
Signature · 1 line
2.17.0
PATCH v3 2/5 generic: enable swapfile tests on Btrfs
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
Commit 8c96cfbfe530 ("generic/35[67]: disable swapfile tests on Btrfs") disabled the swapfile tests on Btrfs because it did not support swapfiles at the time. Now that we're adding support, we want these tests to run, but they don't. _require_scratch_swapfile always fails for Btrfs because swapfiles on Btrfs must be set to nocow. After fixing that, generic/356 and generic/357 fail for the same reason. After fixing _that_, both tests still fail because we don't allow reflinking a non-checksummed extent (which nocow implies) to a checksummed extent. Add a helper for formatting a swap file which does the chattr, and chattr the second file, which gets these tests running on kernels supporting Btrfs swapfiles.
Signed-off-by Omar Sandoval <[email protected]>
--- common/rc | 17 ++++++++++++++--- tests/generic/356 | 7 ++++--- tests/generic/357 | 6 +++--- 3 files changed, 21 insertions(+), 9 deletions(-)
common/rc +14 -3
@@ -2222,6 +2222,19 @@ _require_odirect() rm -f $testfile 2>&1 > /dev/null } +_format_swapfile() { + local fname="$1" + local sz="$2" + + rm -f "$fname" + touch "$fname" + chmod 0600 "$fname" + # Swap files must be nocow on Btrfs. + $CHATTR_PROG +C "$fname" > /dev/null 2>&1 + _pwrite_byte 0x61 0 "$sz" "$fname" >> $seqres.full + mkswap "$fname" >> $seqres.full +} + # Check that the filesystem supports swapfiles _require_scratch_swapfile() {
@@ -2231,10 +2244,8 @@ _require_scratch_swapfile() _scratch_mount # Minimum size for mkswap is 10 pages - local size=$(($(get_page_size) * 10)) + _format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) - _pwrite_byte 0x61 0 "$size" "$SCRATCH_MNT/swap" >/dev/null 2>&1 - mkswap "$SCRATCH_MNT/swap" >/dev/null 2>&1 if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then _scratch_unmount _notrun "swapfiles are not supported"
tests/generic/356 +4 -3
@@ -59,11 +59,12 @@ blocks=160 blksz=65536 echo "Initialize file" -echo >> $seqres.full -_pwrite_byte 0x61 0 $((blocks * blksz)) $testdir/file1 >> $seqres.full -mkswap -U 27376b42-ff65-42ca-919f-6c9b62292a5c $testdir/file1 >> $seqres.full +_format_swapfile "$testdir/file1" $((blocks * blksz)) swapon $testdir/file1 +touch "$testdir/file2" +$CHATTR_PROG +C "$testdir/file2" >/dev/null 2>&1 + echo "Try to reflink" _cp_reflink $testdir/file1 $testdir/file2 2>&1 | _filter_scratch
tests/generic/357 +3 -3
@@ -59,9 +59,9 @@ blocks=160 blksz=65536 echo "Initialize file" -echo >> $seqres.full -_pwrite_byte 0x61 0 $((blocks * blksz)) $testdir/file1 >> $seqres.full -mkswap -U 27376b42-ff65-42ca-919f-6c9b62292a5c $testdir/file1 >> $seqres.full +_format_swapfile "$testdir/file1" $((blocks * blksz)) +touch "$testdir/file2" +$CHATTR_PROG +C "$testdir/file2" >/dev/null 2>&1 _cp_reflink $testdir/file1 $testdir/file2 2>&1 | _filter_scratch echo "Try to swapon"
Signature · 1 line
2.17.0
PATCH v3 3/5 generic: add test for dedupe on an active swapfile
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
Similar to the reflink test generic/356, but makes sure we can't dedupe an active swapfile.
Signed-off-by Omar Sandoval <[email protected]>
--- tests/generic/492 | 76 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/492.out | 7 ++++ tests/generic/group | 1 + 3 files changed, 84 insertions(+) create mode 100755 tests/generic/492 create mode 100644 tests/generic/492.out
tests/generic/492 new file +76 -0
@@ -0,0 +1,76 @@ +#! /bin/bash +# FS QA Test 492 +# +# Check that we can't dedupe a swapfile. +# +#----------------------------------------------------------------------- +# Copyright (c) 2018 Facebook. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +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.* +} + +. ./common/rc +. ./common/filter +. ./common/reflink + +rm -f $seqres.full + +_supported_fs generic +_supported_os Linux +_require_scratch_swapfile +_require_scratch_dedupe + +echo "Format and mount" +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount >> $seqres.full 2>&1 + +testdir="$SCRATCH_MNT/test-$seq" +mkdir "$testdir" + +blocks=160 +blksz=65536 + +echo "Initialize file" +_format_swapfile "$testdir/file1" $((blocks * blksz)) +swapon "$testdir/file1" + +touch "$testdir/file2" +$CHATTR_PROG +C "$testdir/file2" >/dev/null 2>&1 + +echo "Try to dedupe" +cp "$testdir/file1" "$testdir/file2" +_dedupe_range "$testdir/file1" 0 "$testdir/file2" 0 $((blocks * blksz)) +_dedupe_range "$testdir/file2" 0 "$testdir/file1" 0 $((blocks * blksz)) + +echo "Tear it down" +swapoff "$testdir/file1" + +status=0 +exit
tests/generic/492.out new file +7 -0
@@ -0,0 +1,7 @@ +QA output created by 492 +Format and mount +Initialize file +Try to dedupe +XFS_IOC_FILE_EXTENT_SAME: Text file busy +XFS_IOC_FILE_EXTENT_SAME: Text file busy +Tear it down
tests/generic/group +1 -0
@@ -494,3 +494,4 @@ 489 auto quick attr 490 auto quick rw 491 auto quick freeze mount +492 auto quick swap
Signature · 1 line
2.17.0
PATCH v3 4/5 generic: add test for truncate/fpunch of an active swapfile
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
These should not be allowed.
Signed-off-by Omar Sandoval <[email protected]>
--- tests/generic/493 | 73 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/493.out | 8 +++++ tests/generic/group | 1 + 3 files changed, 82 insertions(+) create mode 100755 tests/generic/493 create mode 100644 tests/generic/493.out
tests/generic/493 new file +73 -0
@@ -0,0 +1,73 @@ +#! /bin/bash +# FS QA Test 493 +# +# Test truncation/hole punching of an active swapfile. +# +#----------------------------------------------------------------------- +# Copyright (c) 2018 Facebook. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +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.* +} + +. ./common/rc +. ./common/filter + +rm -f $seqres.full + +_supported_fs generic +_supported_os Linux +_require_scratch_swapfile +_require_xfs_io_command "fpunch" + +echo "Format and mount" +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount >> $seqres.full 2>&1 + +testdir="$SCRATCH_MNT/test-$seq" +mkdir "$testdir" + +blocks=160 +blksz=65536 + +echo "Initialize file" +_format_swapfile "$testdir/file1" $((blocks * blksz)) +swapon "$testdir/file1" + +echo "Try to truncate" +$XFS_IO_PROG -c "truncate $blksz" "$testdir/file1" + +echo "Try to punch hole" +$XFS_IO_PROG -c "fpunch $blksz $((2 * blksz))" "$testdir/file1" + +echo "Tear it down" +swapoff "$testdir/file1" + +status=0 +exit
tests/generic/493.out new file +8 -0
@@ -0,0 +1,8 @@ +QA output created by 493 +Format and mount +Initialize file +Try to truncate +ftruncate: Text file busy +Try to punch hole +fallocate: Text file busy +Tear it down
tests/generic/group +1 -0
@@ -495,3 +495,4 @@ 490 auto quick rw 491 auto quick freeze mount 492 auto quick swap +493 auto quick swap
Signature · 1 line
2.17.0
PATCH v3 5/5 generic: test invalid swap file activation
In reply to Omar SandovalFrom: Omar Sandoval <[email protected]>
Swap files cannot have holes, and they must at least two pages. swapon(8) and mkswap(8) have stricter restrictions, so add versions of those commands without any restrictions.
Signed-off-by Omar Sandoval <[email protected]>
--- .gitignore | 2 ++ src/Makefile | 2 +- src/mkswap.c | 83 +++++++++++++++++++++++++++++++++++++++++++ src/swapon.c | 24 +++++++++++++ tests/generic/494 | 77 +++++++++++++++++++++++++++++++++++++++ tests/generic/494.out | 5 +++ tests/generic/group | 1 + 7 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 src/mkswap.c create mode 100644 src/swapon.c create mode 100755 tests/generic/494 create mode 100644 tests/generic/494.out
.gitignore +2 -0
@@ -92,6 +92,7 @@ /src/lstat64 /src/makeextents /src/metaperf +/src/mkswap /src/mmapcat /src/multi_open_unlink /src/nametest
@@ -111,6 +112,7 @@ /src/seek_sanity_test /src/stale_handle /src/stat_test +/src/swapon /src/t_access_root /src/t_dir_offset /src/t_dir_offset2
src/Makefile +1 -1
@@ -26,7 +26,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ renameat2 t_getcwd e4compact test-nextquota punch-alternating \ attr-list-by-handle-cursor-test listxattr dio-interleaved t_dir_type \ dio-invalidate-cache stat_test t_encrypted_d_revalidate \ - attr_replace_test + attr_replace_test swapon mkswap SUBDIRS = log-writes perf
src/mkswap.c new file +83 -0
83 lines not on this page · raw message
src/swapon.c new file +24 -0
@@ -0,0 +1,24 @@ +/* swapon(8) without any sanity checks; simply calls swapon(2) directly. */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <sys/swap.h> + +int main (int argc,char **argv) +{ +int ret; + +if (argc !=2 ) { +fprintf (stderr,"usage: %s PATH\n" , argv[0 ]); +return EXIT_FAILURE ; + } + + ret =swapon (argv[1 ],0 ); +if (ret) { +perror ("swapon" ); +return EXIT_FAILURE ; + } + +return EXIT_SUCCESS ; +}
tests/generic/494 new file +77 -0
77 lines not on this page · raw message
tests/generic/494.out new file +5 -0
@@ -0,0 +1,5 @@ +QA output created by 494 +File with holes +swapon: Invalid argument +Empty swap file (only swap header) +swapon: Invalid argument
tests/generic/group +1 -0
@@ -496,3 +496,4 @@ 491 auto quick freeze mount 492 auto quick swap 493 auto quick swap +494 auto quick swap
Signature · 1 line
2.17.0