From: Darrick J. Wong Date: Wed, 21 Apr 2021 00:23:20 +0000 (-0700) Subject: xfs: detect time limits from filesystem X-Git-Tag: v2022.05.01~444 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=63b6a5644e71e006df56ebec49aec9d94045c73a;ds=sidebyside xfs: detect time limits from filesystem Teach fstests to extract timestamp limits of a filesystem using the new xfs_db timelimit command. Signed-off-by: Darrick J. Wong Reviewed-by: Amir Goldstein Reviewed-by: Allison Henderson Signed-off-by: Eryu Guan --- diff --git a/common/rc b/common/rc index bed322fe..2cf550ec 100644 --- a/common/rc +++ b/common/rc @@ -2124,7 +2124,7 @@ _filesystem_timestamp_range() echo "0 $u32max" ;; xfs) - echo "$s32min $s32max" + _xfs_timestamp_range "$device" ;; btrfs) echo "$s64min $s64max" diff --git a/common/xfs b/common/xfs index a0721291..559d0046 100644 --- a/common/xfs +++ b/common/xfs @@ -1166,3 +1166,22 @@ _require_scratch_xfs_inobtcount() _notrun "kernel doesn't support xfs inobtcount feature" _scratch_unmount } + +_xfs_timestamp_range() +{ + local device="$1" + local use_db=0 + local dbprog="$XFS_DB_PROG $device" + test "$device" = "$SCRATCH_DEV" && dbprog=_scratch_xfs_db + + $dbprog -f -c 'help timelimit' | grep -v -q 'not found' && use_db=1 + if [ $use_db -eq 0 ]; then + # The "timelimit" command was added to xfs_db at the same time + # that bigtime was added to xfsprogs. Therefore, we can assume + # the old timestamp range if the command isn't present. + echo "-$((1<<31)) $(((1<<31)-1))" + else + $dbprog -f -c 'timelimit --compact' | \ + awk '{printf("%s %s", $1, $2);}' + fi +} diff --git a/tests/xfs/159 b/tests/xfs/159 new file mode 100755 index 00000000..20744946 --- /dev/null +++ b/tests/xfs/159 @@ -0,0 +1,44 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2021 Oracle. All Rights Reserved. +# +# FS QA Test No. 159 +# +# Check that the xfs_db timelimit command prints the ranges that we expect. +# This in combination with an xfs_ondisk.h build time check in the kernel +# ensures that the kernel agrees with userspace. + +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 / +} + +# get standard environment, filters and checks +. ./common/rc + +# real QA test starts here +_supported_fs xfs +_require_scratch +_require_xfs_db_command timelimit + +rm -f $seqres.full + +# Format filesystem without bigtime support and populate it +_scratch_mkfs > $seqres.full +echo classic xfs timelimits +_scratch_xfs_db -c 'timelimit --classic' +echo bigtime xfs timelimits +_scratch_xfs_db -c 'timelimit --bigtime' + +# success, all done +status=0 +exit diff --git a/tests/xfs/159.out b/tests/xfs/159.out new file mode 100644 index 00000000..7723bfc1 --- /dev/null +++ b/tests/xfs/159.out @@ -0,0 +1,15 @@ +QA output created by 159 +classic xfs timelimits +time.min = -2147483648 +time.max = 2147483647 +dqtimer.min = 1 +dqtimer.max = 4294967295 +dqgrace.min = 0 +dqgrace.min = 4294967295 +bigtime xfs timelimits +time.min = -2147483648 +time.max = 16299260424 +dqtimer.min = 4 +dqtimer.max = 16299260424 +dqgrace.min = 0 +dqgrace.min = 4294967295 diff --git a/tests/xfs/group b/tests/xfs/group index e746ddee..e719ba58 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -156,6 +156,7 @@ 156 auto quick admin 157 auto quick admin 158 auto quick inobtcount +159 auto quick bigtime 164 rw pattern auto prealloc quick 165 rw pattern auto prealloc quick 166 rw metadata auto quick