xfs/260: Move and update xfs/260

1) Both ext4 and xfs have supported FS_XFLAG_DAX so move it to generic.
2) Modifying FS_XFLAG_DAX on flies does not take effect immediately so
   make files inherit the DAX state of parent directory.
3) Setting/clearing FS_XFLAG_DAX have no chance to change S_DAX flag if
   mount with dax option so remove the related subtest.
4) Setting/clearing FS_XFLAG_DAX doesn't change S_DAX flag on older xfs
   due to commit 742d84290739 ("xfs: disable per-inode DAX flag") so
   only do test when fs supports new dax=inode option.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Xiao Yang
2020-08-06 10:13:39 +08:00
committed by Eryu Guan
parent ab0680e581
commit f85344a72f
5 changed files with 43 additions and 36 deletions
-143
View File
@@ -1,143 +0,0 @@
#! /bin/bash
# SPDX-License-Identifier: GPL-2.0
# Copyright (c) 2017 Red Hat Inc. All Rights Reserved.
#
# FS QA Test 260
#
# Test per-inode DAX flag by mmap direct/buffered IO.
#
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
_supported_fs xfs
_supported_os Linux
_require_scratch_dax_mountopt "dax"
_require_test_program "feature"
_require_test_program "t_mmap_dio"
_require_dax_iflag
_require_xfs_io_command "falloc"
prep_files()
{
rm -f $SCRATCH_MNT/tf_{s,d}
$XFS_IO_PROG -f -c "falloc 0 $tsize" \
$SCRATCH_MNT/tf_{s,d} >> $seqres.full 2>&1
}
t_both_dax()
{
prep_files
$XFS_IO_PROG -c "chattr +x" $SCRATCH_MNT/tf_{s,d}
# with O_DIRECT first
$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
$here/src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
$1 "buffered both dax"
}
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
$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
$here/src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
$1 "buffered nondax to dax"
}
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
$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
$here/src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
$1 "buffered dax to nondax"
}
t_both_nondax()
{
prep_files
$XFS_IO_PROG -c "chattr -x" $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}
$here/src/t_mmap_dio -b $SCRATCH_MNT/tf_{s,d} \
$1 "buffered both nondax"
}
# $1 mmap read/write size
t_dax_flag_mmap_dio()
{
t_both_dax $1
t_dax_to_nondax $1
t_nondax_to_dax $1
t_both_nondax $1
}
do_tests()
{
# less than page size
t_dax_flag_mmap_dio 1024
# page size
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 aligned for PMD fault testing
_scratch_mkfs_geom $(_get_hugepagesize) 1 >> $seqres.full 2>&1
# mount with dax option
_scratch_mount "-o dax"
tsize=$((128 * 1024 * 1024))
do_tests
_scratch_unmount
# mount again without dax option
export MOUNT_OPTIONS=""
_scratch_mount
do_tests
# success, all done
echo "Silence is golden"
status=0
exit
-2
View File
@@ -1,2 +0,0 @@
QA output created by 260
Silence is golden
-1
View File
@@ -257,7 +257,6 @@
257 auto quick clone
258 auto quick clone
259 auto quick
260 auto attr quick dax
261 auto quick quota
262 dangerous_fuzzers dangerous_scrub dangerous_online_repair
263 auto quick quota