generic/413, xfs/260: Improve format operation for PMD fault testing

[xfstests-dev.git] / tests / xfs / 260

diff --git a/tests/xfs/260 b/tests/xfs/260
index ba6069983fef5751ff924c50e18febaea31b20d3..81b42f01cae363b6fcd43f14dd75693875dec9ef 100755 (executable)
--- a/tests/xfs/260
+++ b/tests/xfs/260
@@ -30,10 +30,10 @@ rm -f $seqres.full
 
 _supported_fs xfs
 _supported_os Linux
-_require_scratch_dax
+_require_scratch_dax_mountopt "dax"
 _require_test_program "feature"
 _require_test_program "t_mmap_dio"
-_require_xfs_io_command "chattr" "+/-x"
+_require_dax_iflag
 _require_xfs_io_command "falloc"
 
 prep_files()
@@ -49,12 +49,12 @@ t_both_dax()
        prep_files
        $XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_{s,d}
        # with O_DIRECT first
-       src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio both dax"
+       $here/src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} $1 "dio both dax"
 
        prep_files
        $XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_{s,d}
        # again with buffered IO
-       src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+       $here/src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
                $1 "buffered both dax"
 }
 
@@ -63,13 +63,13 @@ t_nondax_to_dax()
        prep_files
        $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
        $XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_d
-       src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
+       $here/src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
                $1 "dio nondax to dax"
 
        prep_files
        $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_s
        $XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_d
-       src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+       $here/src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
                $1 "buffered nondax to dax"
 }
 
@@ -78,13 +78,13 @@ t_dax_to_nondax()
        prep_files
        $XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
        $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
-       src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
+       $here/src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
                $1 "dio dax to nondax"
 
        prep_files
        $XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_s
        $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_d
-       src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+       $here/src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
                $1 "buffered dax to nondax"
 }
 
@@ -92,12 +92,12 @@ t_both_nondax()
 {
        prep_files
        $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_{s,d}
-       src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
+       $here/src/t_mmap_dio $SCRATCH_MNT/tf_{s,d} \
                $1 "dio both nondax"
 
        prep_files
        $XFS_IO_PROG -c "chattr -x" $SCRATCH_MNT/tf_{s,d}
-       src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
+       $here/src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
                $1 "buffered both nondax"
 }
 
@@ -115,14 +115,14 @@ do_tests()
        # less than page size
        t_dax_flag_mmap_dio 1024
        # page size
-       t_dax_flag_mmap_dio `src/feature -s`
+       t_dax_flag_mmap_dio `$here/src/feature -s`
        # bigger sizes, for PMD faults
        t_dax_flag_mmap_dio $((16 * 1024 * 1024))
        t_dax_flag_mmap_dio $((64 * 1024 * 1024))
 }
 
-# make xfs 2Mb aligned for PMD fault testing
-_scratch_mkfs "-d su=2m,sw=1" > /dev/null 2>&1
+# make xfs aligned for PMD fault testing
+_scratch_mkfs_geom $(_get_hugepagesize) 1 >> $seqres.full 2>&1
 
 # mount with dax option
 _scratch_mount "-o dax"