common/config: remove redundant export variables
PATCH v5 1/6 common/config: remove redundant export variables
F2FS_IO_PROG and TIMEOUT_PROG are exported twice, remove the redudant one.
--- common/config | 2 -- 1 file changed, 2 deletions(-)
common/config +0 -2
@@ -191,7 +191,6 @@ export XFS_COPY_PROG="$(type -P xfs_copy)" export FSTRIM_PROG="$(type -P fstrim)" export DUMPE2FS_PROG="$(type -P dumpe2fs)" export RESIZE2FS_PROG="$(type -P resize2fs)" -export F2FS_IO_PROG="$(type -P f2fs_io)" export FIO_PROG="$(type -P fio)" export FILEFRAG_PROG="$(type -P filefrag)" export E4DEFRAG_PROG="$(type -P e4defrag)"
@@ -220,7 +219,6 @@ export UBIUPDATEVOL_PROG="$(type -P ubiupdatevol)" export THIN_CHECK_PROG="$(type -P thin_check)" export PYTHON3_PROG="$(type -P python3)" export SQLITE3_PROG="$(type -P sqlite3)" -export TIMEOUT_PROG="$(type -P timeout)" export SETCAP_PROG="$(type -P setcap)" export GETCAP_PROG="$(type -P getcap)" export CAPSH_PROG="$(type -P capsh)"
Signature · 1 line
2.48.1
PATCH v5 2/6 common/config: export F2FS_INJECT_PROG
export F2FS_INJECT_PROG w/ inject.f2fs, it can be used for fault injection.
--- common/config | 1 + 1 file changed, 1 insertion(+)
common/config +1 -0
@@ -316,6 +316,7 @@ export MKFS_BTRFS_PROG=$(set_mkfs_prog_path_with_opts btrfs) export MKFS_F2FS_PROG=$(set_mkfs_prog_path_with_opts f2fs) export DUMP_F2FS_PROG=$(type -P dump.f2fs) export F2FS_IO_PROG=$(type -P f2fs_io) +export F2FS_INJECT_PROG=$(type -P inject.f2fs) export BTRFS_UTIL_PROG=$(type -P btrfs) export BTRFS_SHOW_SUPER_PROG=$(type -P btrfs-show-super) export BTRFS_CONVERT_PROG=$(type -P btrfs-convert)
Signature · 1 line
2.48.1
PATCH v5 3/6 common/config: export F2FS_FSCK_PROG
In reply to Chao YuLet's export F2FS_FSCK_PROG, then we can use it in _check_f2fs_filesystem() later.
--- common/config | 1 + 1 file changed, 1 insertion(+)
common/config +1 -0
@@ -317,6 +317,7 @@ export MKFS_F2FS_PROG=$(set_mkfs_prog_path_with_opts f2fs) export DUMP_F2FS_PROG=$(type -P dump.f2fs) export F2FS_IO_PROG=$(type -P f2fs_io) export F2FS_INJECT_PROG=$(type -P inject.f2fs) +export F2FS_FSCK_PROG=$(type -P fsck.f2fs) export BTRFS_UTIL_PROG=$(type -P btrfs) export BTRFS_SHOW_SUPER_PROG=$(type -P btrfs-show-super) export BTRFS_CONVERT_PROG=$(type -P btrfs-convert)
Signature · 1 line
2.48.1
PATCH v5 4/6 common/rc: use -f for mkfs.f2fs by default
In reply to Chao YuOtherwise, mkfs will fail due to there is an existing filesystem in the image.
--- common/rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
common/rc +2 -2
@@ -993,7 +993,7 @@ _scratch_mkfs() mkfs_filter="grep -v -e ^Warning: -e \"^mke2fs \"" ;; f2fs) - mkfs_cmd="$MKFS_F2FS_PROG" + mkfs_cmd="$MKFS_F2FS_PROG -f" mkfs_filter="cat" ;; ocfs2)
@@ -1336,7 +1336,7 @@ _try_scratch_mkfs_sized() f2fs) # mkfs.f2fs requires # of sectors as an input for the size local sector_size=`blockdev --getss $SCRATCH_DEV` - $MKFS_F2FS_PROG $MKFS_OPTIONS "$@" $SCRATCH_DEV `expr $fssize / $sector_size` + $MKFS_F2FS_PROG -f $MKFS_OPTIONS "$@" $SCRATCH_DEV `expr $fssize / $sector_size` ;; tmpfs) local free_mem=`_free_memory_bytes`
Signature · 1 line
2.48.1
PATCH v5 5/6 common/rc: introduce _check_f2fs_filesystem()
In reply to Chao Yu_check_generic_filesystem() will fail the test once it detects corruption, let's introduce _check_f2fs_filesystem() to just check filesystem w/ --dry-run option, and return the error number, then let caller to decide whether the corruption is as expected or not.
--- common/rc | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
common/rc +50 -0
@@ -3527,6 +3527,50 @@ _check_generic_filesystem() return 0 } +_check_f2fs_filesystem() +{ + local device=$1 + + # If type is set, we're mounted + local type=`_fs_type $device` + local ok=1 + + if [ "$type" = "f2fs" ] + then + # mounted ... + local mountpoint=`_umount_or_remount_ro $device` + fi + + $F2FS_FSCK_PROG --dry-run $device >$tmp.fsck.f2fs 2>&1 + if [ $? -ne 0 ];then + _log_err "_check_f2fs_filesystem: filesystem on $device is inconsistent" + echo "*** fsck.f2fs output ***" >>$seqres.full + cat $tmp.fsck.f2fs >>$seqres.full + echo "*** end fsck.f2fs output" >>$seqres.full + + ok=0 + fi + rm -f $tmp.fsck.f2fs + + if [ $ok -eq 0 ] + then + echo "*** mount output ***" >>$seqres.full + _mount >>$seqres.full + echo "*** end mount output" >>$seqres.full + elif [ "$type" = "f2fs" ] + then + # was mounted ... + _mount_or_remount_rw "$MOUNT_OPTIONS" $device $mountpoint + ok=$? + fi + + if [ $ok -eq 0 ]; then + return 1 + fi + + return 0 +} + # Filter the knowen errors the UDF Verifier reports. _udf_test_known_error_filter() {
@@ -3631,6 +3675,9 @@ _check_test_fs() ubifs) # there is no fsck program for ubifs yet ;; + f2fs) + _check_f2fs_filesystem $TEST_DEV + ;; *) _check_generic_filesystem $TEST_DEV ;;
@@ -3687,6 +3734,9 @@ _check_scratch_fs() ubifs) # there is no fsck program for ubifs yet ;; + f2fs) + _check_f2fs_filesystem $device + ;; *) _check_generic_filesystem $device ;;
Signature · 1 line
2.48.1
PATCH v5 6/6 f2fs/009: detect and repair nlink corruption
In reply to Chao YuThis is a regression test to check whether fsck can handle corrupted nlinks correctly, it uses inject.f2fs to inject nlinks w/ wrong value, and expects fsck.f2fs can detect such corruption and do the repair.
---
v5:
- clean up codes suggested by Dave.
tests/f2fs/009 | 141 +++++++++++++++++++++++++++++++++++++++++++++ tests/f2fs/009.out | 2 + 2 files changed, 143 insertions(+) create mode 100755 tests/f2fs/009 create mode 100644 tests/f2fs/009.out
tests/f2fs/009 new file +141 -0
@@ -0,0 +1,141 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2025 Chao Yu. All Rights Reserved. +# +# FS QA Test No. f2fs/009 +# +# This is a regression test to check whether fsck can handle corrupted +# nlinks correctly, it uses inject.f2fs to inject nlinks w/ wrong value, +# and expects fsck.f2fs can detect such corruption and do the repair. +# +. ./common/preamble +_begin_fstest auto quick + +if [ ! -x "$(type -P socket)" ]; then + _notrun "Couldn't find socket" +fi + +_require_scratch +_require_command "$F2FS_INJECT_PROG" inject.f2fs + +_fixed_by_git_commit f2fs-tools 958cd6e \ + "fsck.f2fs: support to repair corrupted i_links" + +filename=$SCRATCH_MNT/foo +hardlink=$SCRATCH_MNT/bar + +_cleanup() +{ + if [ -n "$pid" ]; then + kill $pid &> /dev/null + wait + fi + cd / + rm -r -f $tmp.* +} + +_inject_and_check() +{ + local nlink=$1 + local ino=$2 + + echo "ino:"$ino >> $seqres.full + echo "nlink:"$nlink >> $seqres.full + + _scratch_unmount + + $F2FS_INJECT_PROG --node --mb i_links --nid $ino --val $nlink $SCRATCH_DEV \ + >> $seqres.full || _fail "fail to inject" + + _check_scratch_fs >> $seqres.full 2>&1 && _fail "can't find corruption" + _repair_scratch_fs >> $seqres.full + _check_scratch_fs >> $seqres.full 2>&1 || _fail "fsck can't fix corruption" + + _scratch_mount + _scratch_unmount + + _scratch_mkfs >> $seqres.full + _scratch_mount +} + +inject_and_check() +{ + local nlink=$1 + local create_hardlink=$2 + local ino=$3 + + if [ -z $ino ]; then + ino=`stat -c '%i' $filename` + fi + + if [ $create_hardlink == 1 ]; then + ln $filename $hardlink + fi + + _inject_and_check $nlink $ino +} + +_scratch_mkfs >> $seqres.full +_scratch_mount + +touch $filename +inject_and_check 0 0 + +mkdir $filename +inject_and_check 1 0 + +mknod $filename c 9 0 +inject_and_check 0 0 + +mknod $filename b 8 0 +inject_and_check 0 0 + +mkfifo $filename +inject_and_check 0 0 + +socket -s $filename >> $seqres.full 2>&1 & +pid=$! +sleep 2 +ino=`stat -c '%i' $filename` +kill $pid >> $seqres.full 2>&1 +inject_and_check 0 0 $ino + +ln -s $SCRATCH_MNT/empty $filename +inject_and_check 0 0 + +touch $filename +ino=`stat -c '%i' $filename` +$F2FS_IO_PROG write 1 0 1 zero atomic_commit $filename 5000 >> $seqres.full 2>&1 & +stat $filename >> $seqres.full +rm $filename +$F2FS_IO_PROG shutdown 1 $SCRATCH_MNT/ >> $seqres.full +sleep 6 +inject_and_check 1 0 $ino + +# hardlink +touch $filename +inject_and_check 0 1 + +mknod $filename c 9 0 +inject_and_check 0 1 + +mknod $filename b 8 0 +inject_and_check 0 1 + +mkfifo $filename +inject_and_check 0 1 + +socket -s $filename >> $seqres.full 2>&1 & +pid=$! +sleep 2 +ino=`stat -c '%i' $filename` +kill $pid >> $seqres.full 2>&1 +inject_and_check 0 1 $ino + +ln -s $SCRATCH_MNT/empty $filename +inject_and_check 0 1 + +echo "Silence is golden" + +status=0 +exit
tests/f2fs/009.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 009 +Silence is golden
Signature · 1 line
2.48.1
Re: [PATCH v5 6/6] f2fs/009: detect and repair nlink corruption
Quoted 27 lines · Chao Yu
This is a regression test to check whether fsck can handle corrupted nlinks correctly, it uses inject.f2fs to inject nlinks w/ wrong value, and expects fsck.f2fs can detect such corruption and do the repair.
Cc Jaegeuk Kim <[email protected]>Signed-off-by Chao Yu <[email protected]>---
v5:
- clean up codes suggested by Dave.tests/f2fs/009 | 141 +++++++++++++++++++++++++++++++++++++++++++++ tests/f2fs/009.out | 2 + 2 files changed, 143 insertions(+) create mode 100755 tests/f2fs/009 create mode 100644 tests/f2fs/009.outtests/f2fs/009 new file +6
-0@@ -0,0 +1,141 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2025 Chao Yu. All Rights Reserved. +# +# FS QA Test No. f2fs/009 +#
tests/f2fs/009 line 16
Quoted 10 lines
tests/f2fs/009 new file +10
-0+# This is a regression test to check whether fsck can handle corrupted +# nlinks correctly, it uses inject.f2fs to inject nlinks w/ wrong value, +# and expects fsck.f2fs can detect such corruption and do the repair. +# +. ./common/preamble +_begin_fstest auto quick + +if [ ! -x "$(type -P socket)" ]; then + _notrun "Couldn't find socket" +fi
Perhaps something like:
_require_command $(type -P socket) socket
would be more consistent with all the other code that checks for installed utilities that a test requires?
Quoted 10 lines
tests/f2fs/009 new file +10
-0+_require_scratch +_require_command "$F2FS_INJECT_PROG" inject.f2fs + +_fixed_by_git_commit f2fs-tools 958cd6e \ + "fsck.f2fs: support to repair corrupted i_links" + +filename=$SCRATCH_MNT/foo +hardlink=$SCRATCH_MNT/bar + +_cleanup()
tests/f2fs/009 line 37
Quoted 10 lines
tests/f2fs/009 new file +10
-0+{ + if [ -n "$pid" ]; then + kill $pid &> /dev/null + wait + fi + cd / + rm -r -f $tmp.* +} + +_inject_and_check()
Single leading "_" is reserved for fstests functions, not for local test functions.
Just call this one "inject_and_test", because that is what it does, and call this one:
Quoted 6 lines
tests/f2fs/009 new file +6
-0+inject_and_check() +{ + local nlink=$1 + local create_hardlink=$2 + local ino=$3 +
tests/f2fs/009 line 76
Quoted 10 lines
tests/f2fs/009 new file +10
-0+ if [ -z $ino ]; then + ino=`stat -c '%i' $filename` + fi + + if [ $create_hardlink == 1 ]; then + ln $filename $hardlink + fi + + _inject_and_check $nlink $ino +}
something like check_links()
Otherwise this is a good improvement.
-Dave.
Signature · 2 lines
Dave Chinner [email protected]
Re: [PATCH v5 6/6] f2fs/009: detect and repair nlink corruption
Quoted 41 lines · Dave Chinner
Quoted 27 lines · Chao Yu
This is a regression test to check whether fsck can handle corrupted nlinks correctly, it uses inject.f2fs to inject nlinks w/ wrong value, and expects fsck.f2fs can detect such corruption and do the repair.
Cc Jaegeuk Kim <[email protected]>Signed-off-by Chao Yu <[email protected]>---
v5:
- clean up codes suggested by Dave.tests/f2fs/009 | 141 +++++++++++++++++++++++++++++++++++++++++++++ tests/f2fs/009.out | 2 + 2 files changed, 143 insertions(+) create mode 100755 tests/f2fs/009 create mode 100644 tests/f2fs/009.outtests/f2fs/009 new file +6
-0@@ -0,0 +1,141 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2025 Chao Yu. All Rights Reserved. +# +# FS QA Test No. f2fs/009 +#tests/f2fs/009 line 16
Quoted 10 lines
tests/f2fs/009 new file +10
-0+# This is a regression test to check whether fsck can handle corrupted +# nlinks correctly, it uses inject.f2fs to inject nlinks w/ wrong value, +# and expects fsck.f2fs can detect such corruption and do the repair. +# +. ./common/preamble +_begin_fstest auto quick + +if [ ! -x "$(type -P socket)" ]; then + _notrun "Couldn't find socket" +fiPerhaps something like:
Quoted 1 line
_require_command$(type -P socket) socket
Good point! Maybe double quotation marks -- "$(type -P socket)" is helpful, due to if socket isn't installed, there will be only one argument.
Quoted 50 lines
would be more consistent with all the other code that checks for installed utilities that a test requires?
Quoted 10 lines
tests/f2fs/009 new file +10
-0+_require_scratch +_require_command "$F2FS_INJECT_PROG" inject.f2fs + +_fixed_by_git_commit f2fs-tools 958cd6e \ + "fsck.f2fs: support to repair corrupted i_links" + +filename=$SCRATCH_MNT/foo +hardlink=$SCRATCH_MNT/bar + +_cleanup()tests/f2fs/009 line 37
Quoted 10 lines
tests/f2fs/009 new file +10
-0+{ + if [ -n "$pid" ]; then + kill $pid &> /dev/null + wait + fi + cd / + rm -r -f $tmp.* +} + +_inject_and_check()Single leading "_" is reserved for fstests functions, not for local test functions.
Just call this one "
inject_and_test", because that is what it does, and call this one:Quoted 6 lines
tests/f2fs/009 new file +6
-0+inject_and_check() +{ + local nlink=$1 + local create_hardlink=$2 + local ino=$3 +tests/f2fs/009 line 76
Quoted 10 lines
tests/f2fs/009 new file +10
-0+ if [ -z $ino ]; then + ino=`stat -c '%i' $filename` + fi + + if [ $create_hardlink == 1 ]; then + ln $filename $hardlink + fi + + _inject_and_check $nlink $ino +}something like
check_links()
Quoted 1 line
Otherwise this is a good improvement.
Hi Chao, if you agree with all these changes, and don't need to change more, I can help to merge this patchset with above changes. Or you'd like to send a new version?
Thanks,
Zorro
Quoted 6 lines
-Dave.
Signature · 2 lines
Dave Chinner [email protected]
Re: [PATCH v5 6/6] f2fs/009: detect and repair nlink corruption
Quoted 42 lines · Zorro Lang
Quoted 41 lines · Dave Chinner
Quoted 27 lines · Chao Yu
This is a regression test to check whether fsck can handle corrupted nlinks correctly, it uses inject.f2fs to inject nlinks w/ wrong value, and expects fsck.f2fs can detect such corruption and do the repair.
Cc Jaegeuk Kim <[email protected]>Signed-off-by Chao Yu <[email protected]>---
v5:
- clean up codes suggested by Dave.tests/f2fs/009 | 141 +++++++++++++++++++++++++++++++++++++++++++++ tests/f2fs/009.out | 2 + 2 files changed, 143 insertions(+) create mode 100755 tests/f2fs/009 create mode 100644 tests/f2fs/009.outtests/f2fs/009 new file +6
-0@@ -0,0 +1,141 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2025 Chao Yu. All Rights Reserved. +# +# FS QA Test No. f2fs/009 +#tests/f2fs/009 line 16
Quoted 10 lines
tests/f2fs/009 new file +10
-0+# This is a regression test to check whether fsck can handle corrupted +# nlinks correctly, it uses inject.f2fs to inject nlinks w/ wrong value, +# and expects fsck.f2fs can detect such corruption and do the repair. +# +. ./common/preamble +_begin_fstest auto quick + +if [ ! -x "$(type -P socket)" ]; then + _notrun "Couldn't find socket" +fiPerhaps something like:
Quoted 8 lines
Quoted 1 line
_require_command$(type -P socket) socketGood point! Maybe double quotation marks -- "$(type -P socket)" is helpful, due to if socket isn't installed, there will be only one argument.
Quoted 2 lines
would be more consistent with all the other code that checks for
Agreed.
Quoted 17 lines
Quoted 17 lines
installed utilities that a test requires?
Quoted 15 lines
tests/f2fs/009 new file +15
-0+_require_scratch +_require_command "$F2FS_INJECT_PROG" inject.f2fs + +_fixed_by_git_commit f2fs-tools 958cd6e \ + "fsck.f2fs: support to repair corrupted i_links" + +filename=$SCRATCH_MNT/foo +hardlink=$SCRATCH_MNT/bar + +_cleanup() +{ + if [ -n "$pid" ]; then + kill $pid &> /dev/null + wait + fi
Quoted 8 lines
Quoted 8 lines
tests/f2fs/009 line 37
Quoted 5 lines
tests/f2fs/009 new file +5
-0+ cd / + rm -r -f $tmp.* +} + +_inject_and_check()Single leading "_" is reserved for fstests functions, not for local test functions.
Oh, got it.
Quoted 23 lines
Quoted 23 lines
Just call this one "
inject_and_test", because that is what it does, and call this one:Quoted 6 lines
tests/f2fs/009 new file +6
-0+inject_and_check() +{ + local nlink=$1 + local create_hardlink=$2 + local ino=$3 +tests/f2fs/009 line 76
Quoted 10 lines
tests/f2fs/009 new file +10
-0+ if [ -z $ino ]; then + ino=`stat -c '%i' $filename` + fi + + if [ $create_hardlink == 1 ]; then + ln $filename $hardlink + fi + + _inject_and_check $nlink $ino +}something like
check_links()
Quoted 1 line
Quoted 1 line
Otherwise this is a good improvement.
Thanks Dave for all your review and suggestion!
Quoted 3 lines
Hi Chao, if you agree with all these changes, and don't need to change more, I can help to merge this patchset with above changes. Or you'd like to send a new version?
Zorro, I'm fine w/ all the changes, I'm appreciate for that if you can help to update the patch!
Thanks,
Quoted 11 lines
Thanks,
ZorroQuoted 6 lines
-Dave.
Signature · 2 lines
Dave Chinner [email protected]