tests/bcachefs: switch from md faulty to dm-flakey

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

4 files changed, 29 insertions, 26 deletions

diff --git a/tests/bcachefs/ec.ktest b/tests/bcachefs/ec.ktest
index ee35000..ab0f8d8 100755
--- a/tests/bcachefs/ec.ktest
+++ b/tests/bcachefs/ec.ktest
@@ -4,10 +4,6 @@
 
 require-kernel-config BCACHEFS_ERASURE_CODING
 
-require-kernel-config MD
-require-kernel-config BLK_DEV_MD
-require-kernel-config MD_FAULTY
-
 config-scratch-devs 4G
 config-scratch-devs 4G
 config-scratch-devs 4G
diff --git a/tests/bcachefs/nas_apps.ktest b/tests/bcachefs/nas_apps.ktest
index 97b0a3a..3ea1c04 100755
--- a/tests/bcachefs/nas_apps.ktest
+++ b/tests/bcachefs/nas_apps.ktest
@@ -4,7 +4,6 @@
 
 require-kernel-config MD
 require-kernel-config BLK_DEV_MD
-require-kernel-config MD_FAULTY
 require-kernel-config NET
 require-kernel-config BLK_DEV
 require-kernel-config BLK_DEV_NBD
diff --git a/tests/bcachefs/replication.ktest b/tests/bcachefs/replication.ktest
index ce62859..1041fef 100755
--- a/tests/bcachefs/replication.ktest
+++ b/tests/bcachefs/replication.ktest
@@ -3,8 +3,8 @@
 . $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/bcachefs-test-libs.sh
 
 require-kernel-config MD
-require-kernel-config BLK_DEV_MD
-require-kernel-config MD_FAULTY
+require-kernel-config BLK_DEV_DM
+require-kernel-config DM_FLAKEY
 
 config-scratch-devs 4G
 config-scratch-devs 4G
@@ -498,15 +498,19 @@ do_replicas_errors_test()
     local p=/sys/module/bcachefs/parameters/verify_all_btree_replicas
     [[ -f $p ]] && echo 1 > $p
 
-    mdadm -B /dev/md0 -lfaulty -n1 ${ktest_scratch_dev[1]}
+    local BLK_DEV_SIZE=`blockdev --getsz ${ktest_scratch_dev[1]}`
+    local FLAKEY_TABLE="0 $BLK_DEV_SIZE flakey ${ktest_scratch_dev[1]} 0 180 0"
+    local FLAKEY_TABLE_ERROR="0 $BLK_DEV_SIZE flakey ${ktest_scratch_dev[1]} 0 0 180 1 $error_type"
 
-    run_quiet "" bcachefs format		\
+    dmsetup create flakey --table "$FLAKEY_TABLE"
+
+    run_quiet "" bcachefs format -f		\
 	--replicas=2				\
-	/dev/md0 ${ktest_scratch_dev[0]}
+	${ktest_scratch_dev[0]} /dev/mapper/flakey
 
-    mount -t bcachefs -o degraded ${ktest_scratch_dev[0]}:/dev/md0 /mnt
+    mount -t bcachefs -o degraded ${ktest_scratch_dev[0]}:/dev/mapper/flakey /mnt
 
-    mdadm -G /dev/md0 -p$error_type
+    echo $FLAKEY_TABLE_ERROR|dmsetup load flakey
 
     run_fio_randrw
 
@@ -515,7 +519,7 @@ do_replicas_errors_test()
     dd if=/mnt/fiotest of=/dev/null bs=4k iflag=direct
 
     umount /mnt
-    mdadm --stop /dev/md0
+    dmsetup remove flakey
 
     bcachefs fsck -ny ${ktest_scratch_dev[0]} ${ktest_scratch_dev[1]}
     check_counters ${ktest_scratch_dev[0]}
@@ -526,12 +530,12 @@ do_replicas_errors_test()
 
 test_replicas_write_errors()
 {
-    do_replicas_errors_test write-all
+    do_replicas_errors_test error_writes
 }
 
 test_replicas_read_errors()
 {
-    do_replicas_errors_test read-persistent1
+    do_replicas_errors_test error_reads
 }
 
 test_cmd_fs_usage()
diff --git a/tests/bcachefs/single_device.ktest b/tests/bcachefs/single_device.ktest
index b02e44e..d036207 100755
--- a/tests/bcachefs/single_device.ktest
+++ b/tests/bcachefs/single_device.ktest
@@ -6,8 +6,8 @@ require-kernel-config BCACHEFS_TESTS
 require-kernel-config BCACHEFS_QUOTA
 
 require-kernel-config MD
-require-kernel-config BLK_DEV_MD
-require-kernel-config MD_FAULTY
+require-kernel-config BLK_DEV_DM
+require-kernel-config DM_FLAKEY
 
 config-scratch-devs 4G
 config-scratch-devs 4G
@@ -282,14 +282,18 @@ test_merge_torture_flakey()
     local loops=$((($ktest_priority + 1) * 3))
     local n=40M
 
-    mdadm -B /dev/md0 -lfaulty -n1 ${ktest_scratch_dev[0]}
+    local BLK_DEV_SIZE=`blockdev --getsz ${ktest_scratch_dev[0]}`
+    local FLAKEY_TABLE="0 $BLK_DEV_SIZE flakey ${ktest_scratch_dev[0]} 0 180 0"
+    local FLAKEY_TABLE_ERROR="0 $BLK_DEV_SIZE flakey ${ktest_scratch_dev[0]} 0 0 180 1 error_writes"
+
+    dmsetup create flakey --table "$FLAKEY_TABLE"
 
-    run_quiet "" bcachefs format -f --btree_node_size=32k --errors=panic /dev/md0
+    run_quiet "" bcachefs format -f --btree_node_size=32k --errors=panic /dev/mapper/flakey
 
     for i in `seq 0 $loops`; do
 	echo "loop: $i"
 
-	mount -t bcachefs -o fsck /dev/md0 /mnt
+	mount -t bcachefs -o fsck /dev/mapper/flakey /mnt
 
 	echo seq_delete		$n 1	> /sys/fs/bcachefs/*/perf_test
 	echo -n "nodes: "
@@ -298,24 +302,24 @@ test_merge_torture_flakey()
 
 	echo seq_insert		$n 1	> /sys/fs/bcachefs/*/perf_test &
 	sleep 10
-	mdadm -G /dev/md0 -pwrite-all
+	echo $FLAKEY_TABLE_ERROR|dmsetup load flakey
 	wait
 
 	umount /mnt
-	mdadm -G /dev/md0 -pnone
+	echo $FLAKEY_TABLE|dmsetup load flakey
 
-	mount -t bcachefs -o fsck /dev/md0 /mnt
+	mount -t bcachefs -o fsck /dev/mapper/flakey /mnt
 
 	echo seq_delete		$n 1	> /sys/fs/bcachefs/*/perf_test &
 	sleep 2
-	mdadm -G /dev/md0 -pwrite-all
+	echo $FLAKEY_TABLE_ERROR|dmsetup load flakey
 	wait
 
 	umount /mnt
-	mdadm -G /dev/md0 -pnone
+	echo $FLAKEY_TABLE|dmsetup load flakey
     done
 
-    mdadm --stop /dev/md0
+    dmsetup remove flakey
 
     bcachefs fsck -ny ${ktest_scratch_dev[0]}
     check_counters ${ktest_scratch_dev[0]}