tools/create_btrfs_image.sh: fix up and re-run

The previous commit did not get all intended changes. Follow up to 2066
2024-11-26 21:00:30 +00:00 · 2020-09-14 11:03:13 +02:00 · 2020-09-14 11:03:13 +02:00 · dfb4c36914
commit dfb4c36914
parent fcf44ed305
81 changed files with 232 additions and 54 deletions
--- a/sys/linux/test/syz_mount_image_btrfs_0
+++ b/sys/linux/test/syz_mount_image_btrfs_0
--- a/sys/linux/test/syz_mount_image_btrfs_1
+++ b/sys/linux/test/syz_mount_image_btrfs_1
--- a/sys/linux/test/syz_mount_image_btrfs_10
+++ b/sys/linux/test/syz_mount_image_btrfs_10
--- a/sys/linux/test/syz_mount_image_btrfs_11
+++ b/sys/linux/test/syz_mount_image_btrfs_11
--- a/sys/linux/test/syz_mount_image_btrfs_12
+++ b/sys/linux/test/syz_mount_image_btrfs_12
--- a/sys/linux/test/syz_mount_image_btrfs_13
+++ b/sys/linux/test/syz_mount_image_btrfs_13
--- a/sys/linux/test/syz_mount_image_btrfs_14
+++ b/sys/linux/test/syz_mount_image_btrfs_14
--- a/sys/linux/test/syz_mount_image_btrfs_15
+++ b/sys/linux/test/syz_mount_image_btrfs_15
--- a/sys/linux/test/syz_mount_image_btrfs_16
+++ b/sys/linux/test/syz_mount_image_btrfs_16
--- a/sys/linux/test/syz_mount_image_btrfs_17
+++ b/sys/linux/test/syz_mount_image_btrfs_17
--- a/sys/linux/test/syz_mount_image_btrfs_18
+++ b/sys/linux/test/syz_mount_image_btrfs_18
--- a/sys/linux/test/syz_mount_image_btrfs_19
+++ b/sys/linux/test/syz_mount_image_btrfs_19
--- a/sys/linux/test/syz_mount_image_btrfs_2
+++ b/sys/linux/test/syz_mount_image_btrfs_2
--- a/sys/linux/test/syz_mount_image_btrfs_20
+++ b/sys/linux/test/syz_mount_image_btrfs_20
--- a/sys/linux/test/syz_mount_image_btrfs_21
+++ b/sys/linux/test/syz_mount_image_btrfs_21
--- a/sys/linux/test/syz_mount_image_btrfs_22
+++ b/sys/linux/test/syz_mount_image_btrfs_22
--- a/sys/linux/test/syz_mount_image_btrfs_23
+++ b/sys/linux/test/syz_mount_image_btrfs_23
--- a/sys/linux/test/syz_mount_image_btrfs_24
+++ b/sys/linux/test/syz_mount_image_btrfs_24
--- a/sys/linux/test/syz_mount_image_btrfs_25
+++ b/sys/linux/test/syz_mount_image_btrfs_25
--- a/sys/linux/test/syz_mount_image_btrfs_26
+++ b/sys/linux/test/syz_mount_image_btrfs_26
--- a/sys/linux/test/syz_mount_image_btrfs_27
+++ b/sys/linux/test/syz_mount_image_btrfs_27
--- a/sys/linux/test/syz_mount_image_btrfs_28
+++ b/sys/linux/test/syz_mount_image_btrfs_28
--- a/sys/linux/test/syz_mount_image_btrfs_29
+++ b/sys/linux/test/syz_mount_image_btrfs_29
--- a/sys/linux/test/syz_mount_image_btrfs_3
+++ b/sys/linux/test/syz_mount_image_btrfs_3
--- a/sys/linux/test/syz_mount_image_btrfs_30
+++ b/sys/linux/test/syz_mount_image_btrfs_30
--- a/sys/linux/test/syz_mount_image_btrfs_31
+++ b/sys/linux/test/syz_mount_image_btrfs_31
--- a/sys/linux/test/syz_mount_image_btrfs_32
+++ b/sys/linux/test/syz_mount_image_btrfs_32
--- a/sys/linux/test/syz_mount_image_btrfs_33
+++ b/sys/linux/test/syz_mount_image_btrfs_33
--- a/sys/linux/test/syz_mount_image_btrfs_34
+++ b/sys/linux/test/syz_mount_image_btrfs_34
--- a/sys/linux/test/syz_mount_image_btrfs_35
+++ b/sys/linux/test/syz_mount_image_btrfs_35
--- a/sys/linux/test/syz_mount_image_btrfs_36
+++ b/sys/linux/test/syz_mount_image_btrfs_36
--- a/sys/linux/test/syz_mount_image_btrfs_37
+++ b/sys/linux/test/syz_mount_image_btrfs_37
--- a/sys/linux/test/syz_mount_image_btrfs_38
+++ b/sys/linux/test/syz_mount_image_btrfs_38
--- a/sys/linux/test/syz_mount_image_btrfs_39
+++ b/sys/linux/test/syz_mount_image_btrfs_39
--- a/sys/linux/test/syz_mount_image_btrfs_4
+++ b/sys/linux/test/syz_mount_image_btrfs_4
--- a/sys/linux/test/syz_mount_image_btrfs_40
+++ b/sys/linux/test/syz_mount_image_btrfs_40
--- a/sys/linux/test/syz_mount_image_btrfs_41
+++ b/sys/linux/test/syz_mount_image_btrfs_41
--- a/sys/linux/test/syz_mount_image_btrfs_42
+++ b/sys/linux/test/syz_mount_image_btrfs_42
--- a/sys/linux/test/syz_mount_image_btrfs_43
+++ b/sys/linux/test/syz_mount_image_btrfs_43
--- a/sys/linux/test/syz_mount_image_btrfs_44
+++ b/sys/linux/test/syz_mount_image_btrfs_44
--- a/sys/linux/test/syz_mount_image_btrfs_45
+++ b/sys/linux/test/syz_mount_image_btrfs_45
--- a/sys/linux/test/syz_mount_image_btrfs_46
+++ b/sys/linux/test/syz_mount_image_btrfs_46
--- a/sys/linux/test/syz_mount_image_btrfs_47
+++ b/sys/linux/test/syz_mount_image_btrfs_47
--- a/sys/linux/test/syz_mount_image_btrfs_48
+++ b/sys/linux/test/syz_mount_image_btrfs_48
--- a/sys/linux/test/syz_mount_image_btrfs_49
+++ b/sys/linux/test/syz_mount_image_btrfs_49
--- a/sys/linux/test/syz_mount_image_btrfs_5
+++ b/sys/linux/test/syz_mount_image_btrfs_5
--- a/sys/linux/test/syz_mount_image_btrfs_50
+++ b/sys/linux/test/syz_mount_image_btrfs_50
--- a/sys/linux/test/syz_mount_image_btrfs_51
+++ b/sys/linux/test/syz_mount_image_btrfs_51
--- a/sys/linux/test/syz_mount_image_btrfs_52
+++ b/sys/linux/test/syz_mount_image_btrfs_52
--- a/sys/linux/test/syz_mount_image_btrfs_53
+++ b/sys/linux/test/syz_mount_image_btrfs_53
--- a/sys/linux/test/syz_mount_image_btrfs_54
+++ b/sys/linux/test/syz_mount_image_btrfs_54
--- a/sys/linux/test/syz_mount_image_btrfs_55
+++ b/sys/linux/test/syz_mount_image_btrfs_55
--- a/sys/linux/test/syz_mount_image_btrfs_56
+++ b/sys/linux/test/syz_mount_image_btrfs_56
--- a/sys/linux/test/syz_mount_image_btrfs_57
+++ b/sys/linux/test/syz_mount_image_btrfs_57
--- a/sys/linux/test/syz_mount_image_btrfs_58
+++ b/sys/linux/test/syz_mount_image_btrfs_58
--- a/sys/linux/test/syz_mount_image_btrfs_59
+++ b/sys/linux/test/syz_mount_image_btrfs_59
--- a/sys/linux/test/syz_mount_image_btrfs_6
+++ b/sys/linux/test/syz_mount_image_btrfs_6
--- a/sys/linux/test/syz_mount_image_btrfs_60
+++ b/sys/linux/test/syz_mount_image_btrfs_60
--- a/sys/linux/test/syz_mount_image_btrfs_61
+++ b/sys/linux/test/syz_mount_image_btrfs_61
--- a/sys/linux/test/syz_mount_image_btrfs_62
+++ b/sys/linux/test/syz_mount_image_btrfs_62
--- a/sys/linux/test/syz_mount_image_btrfs_63
+++ b/sys/linux/test/syz_mount_image_btrfs_63
--- a/sys/linux/test/syz_mount_image_btrfs_64
+++ b/sys/linux/test/syz_mount_image_btrfs_64
--- a/sys/linux/test/syz_mount_image_btrfs_65
+++ b/sys/linux/test/syz_mount_image_btrfs_65
--- a/sys/linux/test/syz_mount_image_btrfs_66
+++ b/sys/linux/test/syz_mount_image_btrfs_66
--- a/sys/linux/test/syz_mount_image_btrfs_67
+++ b/sys/linux/test/syz_mount_image_btrfs_67
--- a/sys/linux/test/syz_mount_image_btrfs_68
+++ b/sys/linux/test/syz_mount_image_btrfs_68
--- a/sys/linux/test/syz_mount_image_btrfs_69
+++ b/sys/linux/test/syz_mount_image_btrfs_69
--- a/sys/linux/test/syz_mount_image_btrfs_7
+++ b/sys/linux/test/syz_mount_image_btrfs_7
--- a/sys/linux/test/syz_mount_image_btrfs_70
+++ b/sys/linux/test/syz_mount_image_btrfs_70
--- a/sys/linux/test/syz_mount_image_btrfs_71
+++ b/sys/linux/test/syz_mount_image_btrfs_71
--- a/sys/linux/test/syz_mount_image_btrfs_72
+++ b/sys/linux/test/syz_mount_image_btrfs_72
--- a/sys/linux/test/syz_mount_image_btrfs_73
+++ b/sys/linux/test/syz_mount_image_btrfs_73
--- a/sys/linux/test/syz_mount_image_btrfs_74
+++ b/sys/linux/test/syz_mount_image_btrfs_74
--- a/sys/linux/test/syz_mount_image_btrfs_75
+++ b/sys/linux/test/syz_mount_image_btrfs_75
--- a/sys/linux/test/syz_mount_image_btrfs_76
+++ b/sys/linux/test/syz_mount_image_btrfs_76
--- a/sys/linux/test/syz_mount_image_btrfs_77
+++ b/sys/linux/test/syz_mount_image_btrfs_77
--- a/sys/linux/test/syz_mount_image_btrfs_78
+++ b/sys/linux/test/syz_mount_image_btrfs_78
--- a/sys/linux/test/syz_mount_image_btrfs_79
+++ b/sys/linux/test/syz_mount_image_btrfs_79
--- a/sys/linux/test/syz_mount_image_btrfs_8
+++ b/sys/linux/test/syz_mount_image_btrfs_8
--- a/sys/linux/test/syz_mount_image_btrfs_9
+++ b/sys/linux/test/syz_mount_image_btrfs_9
--- a/tools/create_btrfs_image.sh
+++ b/tools/create_btrfs_image.sh
@ -2,10 +2,14 @@
 # Copyright 2020 syzkaller project authors. All rights reserved.
 # Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.

+# This script generates sys/linux/test/syz_mount_image_btrfs_* files.
+
+set -eu
+
 # Currently disabled
 # declare -a Op1=("-d raid0 " "-d raid1 " "-d raid5 " "-d raid6 " "-d raid10 " "-d single " "-d dup ")
 declare -a Op1=("-M " "")
-declare -a Op2=("-O mixed-bg " "-O extref " "-O raid56 " "-O no-holes " "-O raid1c34 ")
+declare -a Op2=("-O mixed-bg --nodesize 4096 " "-O extref " "-O raid56 " "-O no-holes " "-O raid1c34 ")
 declare -a Op3=("-K " "")
 declare -a Op4=("--csum crc32c " "--csum xxhash " "--csum sha256 " "--csum blake2 ")
 declare -i dex=0
@ -14,17 +18,31 @@ dir=`dirname $0`
 echo $dir

 for op1 in "${Op1[@]}"; do
-  for op2 in "${Op2[@]}"; do
-    for op3 in "${Op3[@]}"; do
-      for op4 in "${Op4[@]}"; do
-        echo mkfs.btrfs ${op1}${op2}${op3}${op4} disk.raw
-        fallocate -l 128M disk.raw
-        mkfs.btrfs ${op1}${op2}${op3}${op4} disk.raw 
-        go run "$dir/syz-imagegen/imagegen.go" -image=./disk.raw -fs=btrfs > "$dir/../sys/linux/test/syz_image_mount_btrfs_$dex"
-        rm disk.raw
-        dex=dex+1
-      done
-    done
-  done
+	for op2 in "${Op2[@]}"; do
+		for op3 in "${Op3[@]}"; do
+			for op4 in "${Op4[@]}"; do
+				for size in 16M 32M 64M 128M; do
+					echo mkfs.btrfs ${op1}${op2}${op3}${op4} disk.raw ${size}
+					rm -f disk.raw
+					fallocate -l ${size} disk.raw
+					err=""
+					mkfs.btrfs ${op1}${op2}${op3}${op4} disk.raw >/dev/null || err="1"
+					if [ "$err" != "" ]; then
+						if [ "$size" == "128M" ]; then
+							exit 1
+						fi
+						continue
+					fi
+					out="$dir/../sys/linux/test/syz_mount_image_btrfs_$dex"
+					echo "# Code generated by tools/create_f2fs_image.sh. DO NOT EDIT." > $out
+					echo "# requires: manual" >> $out
+					echo >> $out
+					go run "$dir/syz-imagegen/imagegen.go" -image=./disk.raw -fs=btrfs >> $out
+					dex=dex+1
+					break
+				done
+			done
+		done
+	done
 done
-
+rm -f disk.raw