On Mon, Oct 25, 2021 at 12:31:28AM +0800, Eryu Guan wrote:
> On Wed, Oct 20, 2021 at 02:12:26PM +0200, Lukas Czerner wrote:
> > Add test to validate that all the ext4, ext3 and ext2 are properly
> > recognized, validate and applied to avoid regressions as ext4 moves to
> > the new mount API.
> >
> > Signed-off-by: Lukas Czerner <lczerner@xxxxxxxxxx>
> > ---
> > v2: Move minimum kernel version requirement up to 5.12
> > Rewrite kernel_gte() to work correctly
>
> fstests doesn't do version check but only actually try it and see if the
> wanted feature is supported, so I want to avoid this kernel version
> check as much as possible.
>
> OTOH, I understand that there's no good way to tell if a mount option is
> supported by current kernel, and it's not clear a mount failure is
> caused by a regression or an unsupported mount option.
I understand that fstests doesn't do version checking and. But
the fact of the matter is that it is needed for this test for the
reasons you mentioned.
>
> I'd like to see if anyone else has better ideas/suggestions.
So what's the goal here. Am I going to have to wait until someone comes
up with a better suggestion ?
>
> Some minor issues below.
>
> > +_mnt() {
>
> Local functions don't need the _ prefix, that's for common helpers.
Ok, I can rename it.
-Lukas
>
> > + print_log "mounting $fstype \"$1\" "
> > + do_mnt $@
> > + if [ $? -ne 0 ]; then
> > + fail
> > + else
> > + ok
> > + fi
> > +}
> > +
> > +mnt() {
> > + # Do we need to run the tune2fs mount option test ?
> > + t2fs=0
> > + if [ "$1" == "-t" ]; then
> > + t2fs=1
> > + shift
> > + fi
> > +
> > + _mnt $*
> > + $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
> > +
> > + [ "$t2fs" -eq 0 ] && return
> > +
> > + op_set=$1
> > + if [ $# -eq 1 ]; then
> > + check=$1
> > + elif [ $# -eq 2 ]; then
> > + check=$2
> > + else
> > + return 0
> > + fi
> > +
> > + # some options need translation for tune2fs
> > + op_set=$(echo $op_set | sed -e 's/data=journal/journal_data/' \
> > + -e 's/data=ordered/journal_data_ordered/' \
> > + -e 's/data=writeback/journal_data_writeback/')
> > + $TUNE2FS_PROG -o $op_set $SCRATCH_DEV > /dev/null 2>&1
> > + _mnt "defaults" $check
> > + $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
> > + if [ "$op_set" = ^* ]; then
> > + op_set=${op_set#^}
> > + else
> > + op_set="^${op_set}"
> > + fi
> > + $TUNE2FS_PROG -o $op_set $SCRATCH_DEV > /dev/null 2>&1
> > +}
> > +
> > +# $1 - options to mount with
> > +# $2 - options to remount with
> > +remount() {
> > + # First do this specifying both dev and mnt
> > + print_log "mounting $fstype \"$1\" "
> > + do_mnt $1
> > + [ $? -ne 0 ] && fail && return
> > + print_log "remounting \"$2\" "
> > + do_mnt remount,$2 $3
> > + if [ $? -ne 0 ]; then
> > + fail
> > + $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
> > + return
> > + else
> > + ok
> > + fi
> > + $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
> > +
> > + # Now just specify mnt
> > + print_log "mounting $fstype \"$1\" "
> > + do_mnt $1
> > + [ $? -ne 0 ] && fail && return
> > + print_log "remounting (MNT ONLY) \"$2\" "
> > + do_mnt -n remount,$2 $3
> > + if [ $? -ne 0 ]; then
> > + fail
> > + else
> > + ok
> > + fi
> > +
> > + $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
> > +}
> > +
> > +# $1 - options to mount with, or -r argument
> > +# $2 - options to remount with
> > +_not_remount() {
>
> Same here.
>
> Thanks,
> Eryu
>
> > + remount_only=0
> > + # If -r is specified we're going to do remount only
> > + if [ "$1" == "-r" ]; then
> > + remount_only=1
> > + # Dont need shift since first argument would
> > + # have been consumed by mount anyway
> > + fi
> > +
> > + if [ $remount_only -eq 0 ]; then
> > + print_log "mounting $fstype \"$1\" "
> > + do_mnt $1
> > + [ $? -ne 0 ] && fail && return
> > + fi
> > + print_log "SHOULD FAIL remounting $fstype \"$2\" "
> > + do_mnt remount,$2 $3
> > + if [ $? -eq 0 ]; then
> > + fail
> > + else
> > + ok
> > + fi
> > +
> > + # Now just specify mnt
> > + print_log "SHOULD FAIL remounting $fstype (MNT ONLY) \"$2\" "
> > + do_mnt -n remount,$2 $3
> > + if [ $? -eq 0 ]; then
> > + fail
> > + else
> > + ok
> > + fi
> > +}
> > +
> > +not_remount() {
> > + _not_remount $*
> > + $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
> > +}
> > +
> > +
> > +do_mkfs() {
> > + $MKE2FS_PROG -T $fstype -Fq $* >> $seqres.full 2>&1 ||
> > + _fail "mkfs failed - $MKFS_EXT4_PROG -Fq $* $SCRATCH_DEV"
> > +}
> > +
> > +not_ext2() {
> > + if [[ $fstype == "ext2" ]]; then
> > + not_$*
> > + else
> > + $*
> > + fi
> > +}
> > +
> > +only_ext4() {
> > + if [[ $fstype == "ext4" ]]; then
> > + $*
> > + else
> > + not_$*
> > + fi
> > +}
> > +
> > +# Create logdev for external journal
> > +LOOP_IMG=$tmp.logdev
> > +truncate -s ${LOGSIZE}k $LOOP_IMG
> > +LOOP_LOGDEV=`_create_loop_device $LOOP_IMG`
> > +majmin=`stat -c "%t:%T" $LOOP_LOGDEV`
> > +LOGDEV_DEVNUM=`echo "${majmin%:*}*2^8 + ${majmin#*:}" | bc`
> > +
> > +# Test all the extN file system supported by ext4 driver
> > +fstype=
> > +for fstype in ext2 ext3 ext4; do
> > +
> > + $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
> > + $UMOUNT_PROG $SCRATCH_DEV 2> /dev/null
> > +
> > + do_mkfs $SCRATCH_DEV ${SIZE}k
> > +
> > + # do we have fstype support ?
> > + do_mnt
> > + if [ $? -ne 0 ]; then
> > + print_log "$fstype not supported. Skipping..."
> > + ok
> > + continue
> > + fi
> > + if [ ! -f /proc/fs/ext4/$(_short_dev $SCRATCH_DEV)/options ]; then
> > + print_log "$fstype not supported. Skipping..."
> > + ok
> > + continue
> > + fi
> > +
> > + $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
> > +
> > + not_mnt failme
> > + mnt
> > + mnt bsddf
> > + mnt minixdf
> > + mnt grpid
> > + mnt -t bsdgroups grpid
> > + mnt nogrpid
> > + mnt sysvgroups nogrpid
> > + mnt resgid=1001
> > + mnt resuid=1001
> > + mnt sb=131072
> > + mnt errors=continue
> > + mnt errors=panic
> > + mnt errors=remount-ro
> > + mnt nouid32
> > + mnt debug
> > + mnt oldalloc removed
> > + mnt orlov removed
> > + mnt -t user_xattr
> > + mnt nouser_xattr
> > + mnt -t acl
> > + not_ext2 mnt noload norecovery
> > + mnt bh removed
> > + mnt nobh removed
> > + not_ext2 mnt commit=7
> > + mnt min_batch_time=200
> > + mnt max_batch_time=10000
> > + only_ext4 mnt journal_checksum
> > + only_ext4 mnt nojournal_checksum
> > + only_ext4 mnt journal_async_commit,data=writeback
> > + mnt abort ignored
> > + not_ext2 mnt -t data=journal
> > + not_ext2 mnt -t data=ordered
> > + not_ext2 mnt -t data=writeback
> > + not_ext2 mnt data_err=abort
> > + not_ext2 mnt data_err=ignore ignored
> > + mnt usrjquota=aquota.user,jqfmt=vfsv0
> > + not_mnt usrjquota=aquota.user
> > + mnt usrjquota= ignored
> > + mnt grpjquota=aquota.group,jqfmt=vfsv0
> > + not_mnt grpjquota=aquota.group
> > + mnt grpjquota= ignored
> > + mnt jqfmt=vfsold
> > + mnt jqfmt=vfsv0
> > + mnt jqfmt=vfsv1
> > + mnt grpquota
> > + mnt quota
> > + mnt noquota
> > + mnt usrquota
> > + mnt grpquota
> > + mnt barrier
> > + mnt barrier=0 nobarrier
> > + mnt barrier=1 barrier
> > + mnt barrier=99 barrier
> > + mnt -t nobarrier
> > + mnt i_version
> > + mnt stripe=512
> > + only_ext4 mnt delalloc
> > + only_ext4 mnt -t nodelalloc
> > + mnt warn_on_error
> > + mnt nowarn_on_error
> > + not_mnt debug_want_extra_isize=512
> > + mnt debug_want_extra_isize=32 ignored
> > + mnt mblk_io_submit removed
> > + mnt nomblk_io_submit removed
> > + mnt -t block_validity
> > + mnt noblock_validity
> > + mnt inode_readahead_blks=16
> > + not_ext2 mnt journal_ioprio=6 ignored
> > + mnt auto_da_alloc=0 noauto_da_alloc
> > + mnt auto_da_alloc=1 auto_da_alloc
> > + mnt auto_da_alloc=95 auto_da_alloc
> > + mnt auto_da_alloc
> > + mnt noauto_da_alloc
> > + only_ext4 mnt dioread_nolock
> > + only_ext4 mnt nodioread_nolock
> > + only_ext4 mnt dioread_lock nodioread_nolock
> > + mnt -t discard
> > + mnt nodiscard
> > + mnt init_itable=20
> > + mnt init_itable
> > + mnt init_itable=0
> > + mnt noinit_itable
> > + mnt max_dir_size_kb=4096
> > + mnt test_dummy_encryption
> > + mnt test_dummy_encryption=v1
> > + mnt test_dummy_encryption=v2
> > + not_mnt test_dummy_encryption=v3
> > + not_mnt test_dummy_encryption=
> > + mnt inlinecrypt
> > + mnt prefetch_block_bitmaps removed
> > + mnt no_prefetch_block_bitmaps
> > + # We don't currently have a way to know that the option has been
> > + # applied, so comment it out for now. This should be fixed in the
> > + # future.
> > + #mnt mb_optimize_scan=0
> > + #mnt mb_optimize_scan=1
> > + #not_mnt mb_optimize_scan=9
> > + #not_mnt mb_optimize_scan=
> > + mnt nombcache
> > + mnt no_mbcache nombcache
> > + mnt check=none removed
> > + mnt nocheck removed
> > + mnt reservation removed
> > + mnt noreservation removed
> > + mnt journal=20 ignored
> > + not_mnt nonsenseoption
> > + not_mnt nonsenseoption=value
> > +
> > + # generic mount options
> > + mnt lazytime
> > + mnt nolazytime ^lazytime
> > + mnt noatime
> > + mnt nodiratime
> > + mnt noexec
> > + mnt nosuid
> > + mnt ro
> > +
> > + # generic remount check
> > + remount barrier nobarrier
> > + remount nobarrier barrier
> > + remount discard nodiscard
> > + remount nodiscard discard
> > +
> > + # dax mount options
> > + simple_mount -o dax=always $SCRATCH_DEV $SCRATCH_MNT > /dev/null 2>&1
> > + if [ $? -eq 0 ]; then
> > + $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
> > + mnt dax
> > + mnt dax=always
> > + mnt dax=never
> > + mnt dax=inode
> > +
> > + not_remount lazytime dax
> > + not_remount dax=always dax=never
> > +
> > + if [[ $fstype != "ext2" ]]; then
> > + not_remount data=journal dax
> > + not_remount data=journal dax=always
> > + not_remount data=journal dax=never
> > + not_remount data=journal dax=inode
> > + fi
> > + fi
> > +
> > + # Quota remount check
> > + remount grpquota usrquota
> > + remount usrquota quota
> > + remount usrquota usrjquota=q.u,jqfmt=vfsv0
> > + remount grpquota grpjquota=q.g,jqfmt=vfsv0
> > +
> > + not_remount usrquota grpjquota=q.g,jqfmt=vfsv0
> > + not_remount grpquota usrjquota=q.u,jqfmt=vfsv0
> > +
> > + remount quota usrjquota=q.u,jqfmt=vfsv0
> > + not_remount quota grpjquota=q.g,jqfmt=vfsv0
> > +
> > + remount usrjquota=q.u,jqfmt=vfsv0 grpjquota=q.g
> > + not_remount usrjquota=q.u,jqfmt=vfsv0 usrjquota=q.ua
> > + not_remount grpjquota=q.g,jqfmt=vfsv0 grpjquota=q.ga
> > +
> > + remount usrjquota=q.u,jqfmt=vfsv0 usrquota usrjquota=q.u,jqfmt=vfsv0
> > + remount grpjquota=q.g,jqfmt=vfsv0 grpquota grpjquota=q.g,jqfmt=vfsv0
> > + not_remount usrjquota=q.u,jqfmt=vfsv0 grpquota
> > + not_remount grpjquota=q.g,jqfmt=vfsv0 usrquota
> > +
> > + remount grpjquota=q.g,jqfmt=vfsv0 grpjquota= ^grpjquota=
> > + remount usrjquota=q.u,jqfmt=vfsv0 usrjquota= ^usrjquota=
> > + remount grpjquota=q.g,usrjquota=q.u,jqfmt=vfsv0 grpjquota=,usrjquota= ^grpjquota=,^usrjquota=
> > +
> > + remount jqfmt=vfsv0 grpjquota=q.g
> > + remount jqfmt=vfsv0 usrjquota=q.u
> > +
> > + if [[ $fstype != "ext2" ]]; then
> > + remount noload data=journal norecovery
> > + not_remount data=ordered data=journal
> > + not_remount data=journal data=writeback
> > + not_remount data=writeback data=ordered
> > + fi
> > +
> > + do_mkfs -O journal_dev $LOOP_LOGDEV ${LOGSIZE}k
> > + do_mkfs -J device=$LOOP_LOGDEV $SCRATCH_DEV ${SIZE}k
> > + mnt defaults
> > + mnt journal_path=$LOOP_LOGDEV ignored
> > + mnt journal_dev=$LOGDEV_DEVNUM ignored
> > + not_mnt journal_path=${LOOP_LOGDEV}_nonexistent ignored
> > + not_mnt journal_dev=123456 ignored
> > + not_mnt journal_dev=999999999999999 ignored
> > +
> > + do_mkfs -E quotatype=prjquota $SCRATCH_DEV ${SIZE}k
> > + mnt prjquota
> > +
> > + # test clearing/changing journalled quota when enabled
> > + echo "== Testing active journalled quota" >> $seqres.full
> > + _mnt prjquota,grpjquota=aquota.group,usrjquota=aquota.user,jqfmt=vfsv0
> > +
> > + # Prepare and enable quota
> > + quotacheck -vugm $SCRATCH_MNT >> $seqres.full 2>&1
> > + quotaon -vug $SCRATCH_MNT >> $seqres.full 2>&1
> > +
> > + _not_remount -r grpjquota=
> > + _not_remount -r usrjquota=aaquota.user
> > + _not_remount -r grpjquota=aaquota.group
> > + _not_remount -r jqfmt=vfsv1
> > + _not_remount -r noquota
> > + _mnt remount,usrquota,grpquota ^usrquota,^grpquota
> > + $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
> > +
> > + # test clearing/changing quota when enabled
> > + do_mkfs -E quotatype=^prjquota $SCRATCH_DEV ${SIZE}k
> > + not_mnt prjquota
> > + echo "== Testing active non-journalled quota" >> $seqres.full
> > + _mnt grpquota,usrquota
> > +
> > + # Prepare and enable quota
> > + quotacheck -vugm $SCRATCH_MNT >> $seqres.full 2>&1
> > + quotaon -vug $SCRATCH_MNT >> $seqres.full 2>&1
> > +
> > + _not_remount -r noquota
> > + _not_remount -r usrjquota=aquota.user
> > + _not_remount -r grpjquota=aquota.group
> > + _not_remount -r jqfmt=vfsv1
> > + _mnt remount,grpjquota= grpquota,^grpjquota
> > + _mnt remount,usrjquota= usrquota,^usrjquota
> > + _mnt remount,usrquota,grpquota usrquota,grpquota
> > + quotaoff -f $SCRATCH_MNT >> $seqres.full 2>&1
> > + _mnt remount,noquota ^usrquota,^grpquota,quota
> > + $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
> > +
> > + # Quota feature
> > + echo "== Testing quota feature " >> $seqres.full
> > + do_mkfs -O quota -E quotatype=prjquota $SCRATCH_DEV ${SIZE}k
> > + mnt usrjquota=aquota.user,jqfmt=vfsv0 ^usrjquota=
> > + mnt grpjquota=aquota.user,jqfmt=vfsv0 ^grpjquota=
> > + mnt jqfmt=vfsv1 ^jqfmt=
> > + mnt prjquota
> > + mnt usrquota
> > + mnt grpquota
> > + not_remount defaults usrjquota=aquota.user
> > + not_remount defaults grpjquota=aquota.user
> > + not_remount defaults jqfmt=vfsv1
> > + remount defaults grpjquota=,usrjquota= ignored
> > +
> > +done #for fstype in ext2 ext3 ext4; do
> > +
> > +$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
> > +echo "$ERR errors encountered" >> $seqres.full
> > +
> > +status=$ERR
> > +exit
> > diff --git a/tests/ext4/053.out b/tests/ext4/053.out
> > new file mode 100644
> > index 00000000..d58db7e4
> > --- /dev/null
> > +++ b/tests/ext4/053.out
> > @@ -0,0 +1,2 @@
> > +QA output created by 053
> > +Silence is golden.
> > --
> > 2.31.1
>
