selftests: ublk: integrity test cleanups
Subsystems (3)
cover selftests: ublk: integrity test cleanups
Update test_integrity_02 to allow fio-3.42 now that it's been released. Add a modified version test_integrity_03 that uses auto integrity and avoids the newer fio requirement.
Also clean up the callers of _cleanup passing an unnecessary argument.
Caleb Sander Mateos (3):
selftests: ublk: remove unused argument to _cleanup
selftests: ublk: enable test_integrity_02.sh on fio 3.42
selftests: ublk: add ublk auto integrity test
tools/testing/selftests/ublk/Makefile | 1 + tools/testing/selftests/ublk/test_batch_01.sh | 4 +- tools/testing/selftests/ublk/test_batch_02.sh | 2 +- tools/testing/selftests/ublk/test_batch_03.sh | 2 +- .../testing/selftests/ublk/test_generic_02.sh | 4 +- .../testing/selftests/ublk/test_generic_03.sh | 2 +- .../testing/selftests/ublk/test_generic_06.sh | 2 +- .../testing/selftests/ublk/test_generic_07.sh | 2 +- .../testing/selftests/ublk/test_generic_08.sh | 4 +- .../testing/selftests/ublk/test_generic_09.sh | 2 +- .../testing/selftests/ublk/test_generic_10.sh | 2 +- .../testing/selftests/ublk/test_generic_12.sh | 4 +- .../testing/selftests/ublk/test_generic_13.sh | 2 +- .../testing/selftests/ublk/test_generic_16.sh | 4 +- .../testing/selftests/ublk/test_generic_17.sh | 2 +- .../selftests/ublk/test_integrity_02.sh | 5 +- .../selftests/ublk/test_integrity_03.sh | 103 ++++++++++++++++++ tools/testing/selftests/ublk/test_loop_01.sh | 2 +- tools/testing/selftests/ublk/test_loop_02.sh | 2 +- tools/testing/selftests/ublk/test_loop_03.sh | 2 +- tools/testing/selftests/ublk/test_loop_04.sh | 2 +- tools/testing/selftests/ublk/test_loop_05.sh | 2 +- tools/testing/selftests/ublk/test_loop_06.sh | 2 +- tools/testing/selftests/ublk/test_loop_07.sh | 2 +- tools/testing/selftests/ublk/test_null_01.sh | 2 +- tools/testing/selftests/ublk/test_null_02.sh | 2 +- tools/testing/selftests/ublk/test_null_03.sh | 2 +- tools/testing/selftests/ublk/test_part_01.sh | 4 +- tools/testing/selftests/ublk/test_part_02.sh | 2 +- .../testing/selftests/ublk/test_recover_01.sh | 2 +- .../testing/selftests/ublk/test_recover_02.sh | 2 +- .../testing/selftests/ublk/test_recover_03.sh | 2 +- .../testing/selftests/ublk/test_recover_04.sh | 2 +- .../testing/selftests/ublk/test_shmemzc_01.sh | 2 +- .../testing/selftests/ublk/test_shmemzc_02.sh | 2 +- .../testing/selftests/ublk/test_shmemzc_03.sh | 2 +- .../testing/selftests/ublk/test_shmemzc_04.sh | 2 +- .../testing/selftests/ublk/test_stress_01.sh | 2 +- .../testing/selftests/ublk/test_stress_02.sh | 2 +- .../testing/selftests/ublk/test_stress_03.sh | 2 +- .../testing/selftests/ublk/test_stress_04.sh | 2 +- .../testing/selftests/ublk/test_stress_05.sh | 2 +- .../testing/selftests/ublk/test_stress_06.sh | 2 +- .../testing/selftests/ublk/test_stress_07.sh | 2 +- .../testing/selftests/ublk/test_stress_08.sh | 2 +- .../testing/selftests/ublk/test_stress_09.sh | 2 +- .../testing/selftests/ublk/test_stripe_01.sh | 2 +- .../testing/selftests/ublk/test_stripe_02.sh | 2 +- .../testing/selftests/ublk/test_stripe_03.sh | 2 +- .../testing/selftests/ublk/test_stripe_04.sh | 2 +- .../testing/selftests/ublk/test_stripe_05.sh | 2 +- .../testing/selftests/ublk/test_stripe_06.sh | 2 +- 52 files changed, 162 insertions(+), 57 deletions(-) create mode 100755 tools/testing/selftests/ublk/test_integrity_03.sh
Signature · 1 line
2.45.2
PATCH 1/3 selftests: ublk: remove unused argument to _cleanup
The _cleanup helper function doesn't take any arguments, so drop them from its callers.
--- tools/testing/selftests/ublk/test_batch_01.sh | 4 ++-- tools/testing/selftests/ublk/test_batch_02.sh | 2 +- tools/testing/selftests/ublk/test_batch_03.sh | 2 +- tools/testing/selftests/ublk/test_generic_02.sh | 4 ++-- tools/testing/selftests/ublk/test_generic_03.sh | 2 +- tools/testing/selftests/ublk/test_generic_06.sh | 2 +- tools/testing/selftests/ublk/test_generic_07.sh | 2 +- tools/testing/selftests/ublk/test_generic_08.sh | 4 ++-- tools/testing/selftests/ublk/test_generic_09.sh | 2 +- tools/testing/selftests/ublk/test_generic_10.sh | 2 +- tools/testing/selftests/ublk/test_generic_12.sh | 4 ++-- tools/testing/selftests/ublk/test_generic_13.sh | 2 +- tools/testing/selftests/ublk/test_generic_16.sh | 4 ++-- tools/testing/selftests/ublk/test_generic_17.sh | 2 +- tools/testing/selftests/ublk/test_loop_01.sh | 2 +- tools/testing/selftests/ublk/test_loop_02.sh | 2 +- tools/testing/selftests/ublk/test_loop_03.sh | 2 +- tools/testing/selftests/ublk/test_loop_04.sh | 2 +- tools/testing/selftests/ublk/test_loop_05.sh | 2 +- tools/testing/selftests/ublk/test_loop_06.sh | 2 +- tools/testing/selftests/ublk/test_loop_07.sh | 2 +- tools/testing/selftests/ublk/test_null_01.sh | 2 +- tools/testing/selftests/ublk/test_null_02.sh | 2 +- tools/testing/selftests/ublk/test_null_03.sh | 2 +- tools/testing/selftests/ublk/test_part_01.sh | 4 ++-- tools/testing/selftests/ublk/test_part_02.sh | 2 +- tools/testing/selftests/ublk/test_recover_01.sh | 2 +- tools/testing/selftests/ublk/test_recover_02.sh | 2 +- tools/testing/selftests/ublk/test_recover_03.sh | 2 +- tools/testing/selftests/ublk/test_recover_04.sh | 2 +- tools/testing/selftests/ublk/test_shmemzc_01.sh | 2 +- tools/testing/selftests/ublk/test_shmemzc_02.sh | 2 +- tools/testing/selftests/ublk/test_shmemzc_03.sh | 2 +- tools/testing/selftests/ublk/test_shmemzc_04.sh | 2 +- tools/testing/selftests/ublk/test_stress_01.sh | 2 +- tools/testing/selftests/ublk/test_stress_02.sh | 2 +- tools/testing/selftests/ublk/test_stress_03.sh | 2 +- tools/testing/selftests/ublk/test_stress_04.sh | 2 +- tools/testing/selftests/ublk/test_stress_05.sh | 2 +- tools/testing/selftests/ublk/test_stress_06.sh | 2 +- tools/testing/selftests/ublk/test_stress_07.sh | 2 +- tools/testing/selftests/ublk/test_stress_08.sh | 2 +- tools/testing/selftests/ublk/test_stress_09.sh | 2 +- tools/testing/selftests/ublk/test_stripe_01.sh | 2 +- tools/testing/selftests/ublk/test_stripe_02.sh | 2 +- tools/testing/selftests/ublk/test_stripe_03.sh | 2 +- tools/testing/selftests/ublk/test_stripe_04.sh | 2 +- tools/testing/selftests/ublk/test_stripe_05.sh | 2 +- tools/testing/selftests/ublk/test_stripe_06.sh | 2 +- 49 files changed, 55 insertions(+), 55 deletions(-)
tools/testing/selftests/ublk/test_batch_01.sh +2 -2
@@ -16,16 +16,16 @@ _create_backfile 1 256M dev_id=$(_add_ublk_dev -t loop -q 2 -b "${UBLK_BACKFILES[0]}") _check_add_dev $TID $? if ! _mkfs_mount_test /dev/ublkb"${dev_id}"; then - _cleanup_test "generic" + _cleanup_test _show_result $TID 255 fi dev_id=$(_add_ublk_dev -t stripe -b --auto_zc "${UBLK_BACKFILES[0]}" "${UBLK_BACKFILES[1]}") _check_add_dev $TID $? _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=$? -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_batch_02.sh +1 -1
@@ -23,7 +23,7 @@ _check_add_dev $TID $? # run fio over the ublk disk fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrite \ --iodepth=32 --size=100M --numjobs=4 > /dev/null 2>&1 ERR_CODE=$? -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_batch_03.sh +1 -1
@@ -23,7 +23,7 @@ _check_add_dev $TID $? # run fio over the ublk disk fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrite \ --iodepth=32 --size=100M --numjobs=4 > /dev/null 2>&1 ERR_CODE=$? -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_02.sh +2 -2
@@ -27,11 +27,11 @@ for _ in $(seq 100); do grep -q "BPFTRACE_READY" "$UBLK_TMP" 2>/dev/null && break sleep 0.1 done if ! kill -0 "$btrace_pid" 2>/dev/null; then - _cleanup_test "null" + _cleanup_test exit "$UBLK_SKIP_CODE" fi # run fio over this ublk disk (pinned to CPU 0) taskset -c 0 fio --name=write_seq \
@@ -49,7 +49,7 @@ wait if grep -q "^out_of_order:" "$UBLK_TMP"; then echo "I/O reordering detected:" grep "^out_of_order:" "$UBLK_TMP" ERR_CODE=255 fi -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_03.sh +1 -1
@@ -21,7 +21,7 @@ if [ "$max_segments" != "32" ]; then ERR_CODE=255 fi if [ "$max_segment_size" != "32768" ]; then ERR_CODE=255 fi -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_06.sh +1 -1
@@ -34,7 +34,7 @@ fi if [ $ELAPSED -ge 5 ]; then echo "dd took $ELAPSED seconds to exit (>= 5s tolerance)!" ERR_CODE=255 fi -_cleanup_test "fault_inject" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_07.sh +1 -1
@@ -21,7 +21,7 @@ ERR_CODE=$? if [ "$ERR_CODE" -eq 0 ]; then _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=$? fi -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_08.sh +2 -2
@@ -16,16 +16,16 @@ _create_backfile 1 256M dev_id=$(_add_ublk_dev -t loop -q 2 --auto_zc "${UBLK_BACKFILES[0]}") _check_add_dev $TID $? if ! _mkfs_mount_test /dev/ublkb"${dev_id}"; then - _cleanup_test "generic" + _cleanup_test _show_result $TID 255 fi dev_id=$(_add_ublk_dev -t stripe --auto_zc "${UBLK_BACKFILES[0]}" "${UBLK_BACKFILES[1]}") _check_add_dev $TID $? _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=$? -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_09.sh +1 -1
@@ -20,8 +20,8 @@ _check_add_dev $TID $? # run fio over the two disks fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrite --iodepth=32 --size=256M > /dev/null 2>&1 ERR_CODE=$? -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_10.sh +1 -1
@@ -23,7 +23,7 @@ fi new_size=$(_get_disk_size /dev/ublkb"${dev_id}") if [ "$new_size" != "$size" ]; then ERR_CODE=255 fi -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_12.sh +2 -2
@@ -23,11 +23,11 @@ dev_t=$(_get_disk_dev_t "$dev_id") bpftrace trace/count_ios_per_tid.bt "$dev_t" > "$UBLK_TMP" 2>&1 & btrace_pid=$! sleep 2 if ! kill -0 "$btrace_pid" > /dev/null 2>&1; then - _cleanup_test "null" + _cleanup_test exit "$UBLK_SKIP_CODE" fi # do imbalanced I/O on the ublk device # pin to cpu 0 to prevent migration/only target one queue
@@ -52,7 +52,7 @@ if [[ $NR_THREADS_THAT_HANDLED_IO -ne $NTHREADS ]]; then echo "only $NR_THREADS_THAT_HANDLED_IO handled I/O! expected $NTHREADS" cat "$UBLK_TMP" ERR_CODE=255 fi -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_13.sh +1 -1
@@ -13,7 +13,7 @@ if ${UBLK_PROG} features | grep -q unknown; then echo "# this failure is expected if running an older test suite against" echo "# a newer kernel with new features added" ERR_CODE=255 fi -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_16.sh +2 -2
@@ -7,11 +7,11 @@ ERR_CODE=0 _prep_test "null" "stop --safe command" # Check if SAFE_STOP_DEV feature is supported if ! _have_feature "SAFE_STOP_DEV"; then - _cleanup_test "null" + _cleanup_test exit "$UBLK_SKIP_CODE" fi # Test 1: stop --safe on idle device should succeed dev_id=$(_add_ublk_dev -t null -q 2 -d 32)
@@ -50,7 +50,7 @@ wait $dd_pid 2>/dev/null # Now device should be idle, regular delete should work _ublk_del_dev "${dev_id}" udevadm settle -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_generic_17.sh +1 -1
@@ -29,7 +29,7 @@ fi # Clean up the device. This can only succeed once teardown of the above # exited ublk server completes. So if teardown never completes, we will # time out here _ublk_del_dev "${dev_id}" -_cleanup_test "fault_inject" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_loop_01.sh +1 -1
@@ -18,8 +18,8 @@ _check_add_dev $TID $? # run fio over the ublk disk _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=256M ERR_CODE=$? -_cleanup_test "loop" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_loop_02.sh +1 -1
@@ -12,8 +12,8 @@ dev_id=$(_add_ublk_dev -t loop "${UBLK_BACKFILES[0]}") _check_add_dev $TID $? _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=$? -_cleanup_test "loop" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_loop_03.sh +1 -1
@@ -17,8 +17,8 @@ _check_add_dev $TID $? # run fio over the ublk disk _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=256M ERR_CODE=$? -_cleanup_test "loop" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_loop_04.sh +1 -1
@@ -13,8 +13,8 @@ dev_id=$(_add_ublk_dev -t loop -z "${UBLK_BACKFILES[0]}") _check_add_dev $TID $? _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=$? -_cleanup_test "loop" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_loop_05.sh +1 -1
@@ -18,8 +18,8 @@ _check_add_dev $TID $? # run fio over the ublk disk _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=256M ERR_CODE=$? -_cleanup_test "loop" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_loop_06.sh +1 -1
@@ -17,8 +17,8 @@ _check_add_dev $TID $? # run fio over the ublk disk _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=256M ERR_CODE=$? -_cleanup_test "loop" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_loop_07.sh +1 -1
@@ -13,8 +13,8 @@ dev_id=$(_add_ublk_dev -t loop -u "${UBLK_BACKFILES[0]}") _check_add_dev $TID $? _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=$? -_cleanup_test "loop" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_null_01.sh +1 -1
@@ -16,8 +16,8 @@ _check_add_dev $TID $? # run fio over the two disks fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrite --iodepth=32 --size=256M > /dev/null 2>&1 ERR_CODE=$? -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_null_02.sh +1 -1
@@ -16,8 +16,8 @@ _check_add_dev $TID $? # run fio over the two disks fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrite --iodepth=32 --size=256M > /dev/null 2>&1 ERR_CODE=$? -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_null_03.sh +1 -1
@@ -16,8 +16,8 @@ _check_add_dev $TID $? # run fio over the two disks fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrite --iodepth=32 --size=256M > /dev/null 2>&1 ERR_CODE=$? -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_part_01.sh +2 -2
@@ -80,11 +80,11 @@ if ! _have_program sfdisk || ! _have_program blockdev; then fi _prep_test "generic" "test UBLK_F_NO_AUTO_PART_SCAN" if ! _have_feature "UBLK_F_NO_AUTO_PART_SCAN"; then - _cleanup_test "generic" + _cleanup_test exit "$UBLK_SKIP_CODE" fi # Create and format backing file with partition table
@@ -98,7 +98,7 @@ format_backing_file "${UBLK_BACKFILES[0]}" # Test no auto partition scan with manual scan [ "$ERR_CODE" -eq 0 ] && test_no_auto_part_scan "${UBLK_BACKFILES[0]}" [ $? -ne 0 ] && ERR_CODE=255 -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_part_02.sh +1 -1
@@ -61,7 +61,7 @@ _prep_test "partition_scan" "verify async partition scan prevents IO hang" _test_partition_scan_no_hang "no" "DEAD" # Test 2: With recovery support - should transition to QUIESCED _test_partition_scan_no_hang "yes" "QUIESCED" -_cleanup_test "partition_scan" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_recover_01.sh +1 -1
@@ -38,7 +38,7 @@ wait ublk_run_recover_test -t null -q 2 -r 1 -i 1 & ublk_run_recover_test -t loop -q 2 -r 1 -i 1 "${UBLK_BACKFILES[0]}" & ublk_run_recover_test -t stripe -q 2 -r 1 -i 1 "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & wait -_cleanup_test "recover" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_recover_02.sh +1 -1
@@ -42,7 +42,7 @@ wait ublk_run_recover_test -t null -q 2 -r 1 -z -i 1 & ublk_run_recover_test -t loop -q 2 -r 1 -z -i 1 "${UBLK_BACKFILES[0]}" & ublk_run_recover_test -t stripe -q 2 -r 1 -z -i 1 "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & wait -_cleanup_test "recover" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_recover_03.sh +1 -1
@@ -37,7 +37,7 @@ wait ublk_run_quiesce_recover -t null -q 2 -r 1 -i 1 & ublk_run_quiesce_recover -t loop -q 2 -r 1 -i 1 "${UBLK_BACKFILES[0]}" & ublk_run_quiesce_recover -t stripe -q 2 -r 1 -i 1 "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & wait -_cleanup_test "quiesce" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_recover_04.sh +1 -1
@@ -33,7 +33,7 @@ wait ublk_run_recover_test -t null -q 2 -r 1 -u -i 1 & ublk_run_recover_test -t loop -q 2 -r 1 -u -i 1 "${UBLK_BACKFILES[0]}" & ublk_run_recover_test -t stripe -q 2 -r 1 -u -i 1 "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & wait -_cleanup_test "recover" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_shmemzc_01.sh +1 -1
@@ -65,8 +65,8 @@ _ublk_del_dev "${dev_id}" rm -f "$HTLB_FILE" umount "$HTLB_MNT" rmdir "$HTLB_MNT" echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages -_cleanup_test "shmem_zc" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_shmemzc_02.sh +1 -1
@@ -61,8 +61,8 @@ _ublk_del_dev "${dev_id}" rm -f "$HTLB_FILE" umount "$HTLB_MNT" rmdir "$HTLB_MNT" echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages -_cleanup_test "shmem_zc" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_shmemzc_03.sh +1 -1
@@ -62,8 +62,8 @@ _ublk_del_dev "${dev_id}" rm -f "$HTLB_FILE" umount "$HTLB_MNT" rmdir "$HTLB_MNT" echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages -_cleanup_test "shmem_zc" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_shmemzc_04.sh +1 -1
@@ -65,8 +65,8 @@ _ublk_del_dev "${dev_id}" rm -f "$HTLB_FILE" umount "$HTLB_MNT" rmdir "$HTLB_MNT" echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages -_cleanup_test "shmem_zc" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stress_01.sh +1 -1
@@ -27,7 +27,7 @@ _create_backfile 2 128M ublk_io_and_remove 8G -t null -q 4 & ublk_io_and_remove 256M -t loop -q 4 "${UBLK_BACKFILES[0]}" & ublk_io_and_remove 256M -t stripe -q 4 "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & wait -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stress_02.sh +1 -1
@@ -29,7 +29,7 @@ for nr_queue in 1 4; do ublk_io_and_kill_daemon 256M -t loop -q "$nr_queue" "${UBLK_BACKFILES[0]}" & ublk_io_and_kill_daemon 256M -t stripe -q "$nr_queue" "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & wait done -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stress_03.sh +1 -1
@@ -47,7 +47,7 @@ if _have_feature "PER_IO_DAEMON"; then ublk_io_and_remove 256M -t stripe -q 4 --auto_zc --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & ublk_io_and_remove 8G -t null -q 4 -z --auto_zc --auto_zc_fallback --nthreads 8 --per_io_tasks & wait fi -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stress_04.sh +1 -1
@@ -46,7 +46,7 @@ if _have_feature "PER_IO_DAEMON"; then ublk_io_and_kill_daemon 256M -t stripe -q 4 --auto_zc --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & ublk_io_and_kill_daemon 8G -t null -q 4 -z --auto_zc --auto_zc_fallback --nthreads 8 --per_io_tasks & wait fi -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stress_05.sh +1 -1
@@ -77,7 +77,7 @@ if _have_feature "PER_IO_DAEMON"; then ublk_io_and_remove 256M -t loop -q 4 --nthreads 8 --per_io_tasks -r 1 -i "$reissue" "${UBLK_BACKFILES[0]}" & ublk_io_and_remove 8G -t null -q 4 --nthreads 8 --per_io_tasks -r 1 -i "$reissue" & fi wait -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stress_06.sh +1 -1
@@ -32,7 +32,7 @@ wait ublk_io_and_remove 8G -t null -q 4 -u --nthreads 8 --per_io_tasks & ublk_io_and_remove 256M -t loop -q 4 -u --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[0]}" & ublk_io_and_remove 256M -t stripe -q 4 -u --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & wait -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stress_07.sh +1 -1
@@ -32,7 +32,7 @@ wait ublk_io_and_kill_daemon 8G -t null -q 4 -u --nthreads 8 --per_io_tasks & ublk_io_and_kill_daemon 256M -t loop -q 4 -u --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[0]}" & ublk_io_and_kill_daemon 256M -t stripe -q 4 -u --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & wait -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stress_08.sh +1 -1
@@ -38,7 +38,7 @@ ublk_io_and_remove 8G -t null -q 4 -b & ublk_io_and_remove 256M -t loop -q 4 --auto_zc -b "${UBLK_BACKFILES[0]}" & ublk_io_and_remove 256M -t stripe -q 4 --auto_zc -b "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & ublk_io_and_remove 8G -t null -q 4 -z --auto_zc --auto_zc_fallback -b & wait -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stress_09.sh +1 -1
@@ -37,7 +37,7 @@ ublk_io_and_kill_daemon 8G -t null -q 4 -z -b & ublk_io_and_kill_daemon 256M -t loop -q 4 --auto_zc -b "${UBLK_BACKFILES[0]}" & ublk_io_and_kill_daemon 256M -t stripe -q 4 -b "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & ublk_io_and_kill_daemon 8G -t null -q 4 -z --auto_zc --auto_zc_fallback -b & wait -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stripe_01.sh +1 -1
@@ -19,7 +19,7 @@ _check_add_dev $TID $? # run fio over the ublk disk _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=512M ERR_CODE=$? -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stripe_02.sh +1 -1
@@ -14,7 +14,7 @@ dev_id=$(_add_ublk_dev -t stripe "${UBLK_BACKFILES[0]}" "${UBLK_BACKFILES[1]}") _check_add_dev $TID $? _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=$? -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stripe_03.sh +1 -1
@@ -19,7 +19,7 @@ _check_add_dev $TID $? # run fio over the ublk disk _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=512M ERR_CODE=$? -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stripe_04.sh +1 -1
@@ -14,7 +14,7 @@ dev_id=$(_add_ublk_dev -t stripe -z -q 2 "${UBLK_BACKFILES[0]}" "${UBLK_BACKFILE _check_add_dev $TID $? _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=$? -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stripe_05.sh +1 -1
@@ -19,7 +19,7 @@ _check_add_dev $TID $? # run fio over the ublk disk _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=512M ERR_CODE=$? -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE
tools/testing/selftests/ublk/test_stripe_06.sh +1 -1
@@ -14,7 +14,7 @@ dev_id=$(_add_ublk_dev -t stripe -u -q 2 "${UBLK_BACKFILES[0]}" "${UBLK_BACKFILE _check_add_dev $TID $? _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=$? -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE
Signature · 1 line
2.45.2
Re: [PATCH 1/3] selftests: ublk: remove unused argument to _cleanup
Quoted 4 lines · Caleb Sander Mateos
The
_cleanuphelper function doesn't take any arguments, so drop them from its callers.Signed-off-by Caleb Sander Mateos <[email protected]>
Thanks,
Ming
PATCH 2/3 selftests: ublk: enable test_integrity_02.sh on fio 3.42
In reply to Caleb Sander Mateosfio 3.42 was released with the needed fix for test_integrity_02.sh. Allow 3.42 and newer in the fio version check.
--- tools/testing/selftests/ublk/test_integrity_02.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/ublk/test_integrity_02.sh +3 -2
@@ -5,13 +5,14 @@ if ! _have_program fio; then exit $UBLK_SKIP_CODE fi +min_fio_version=fio-3.42 fio_version=$(fio --version) -if [[ "$fio_version" =~ fio-[0-9]+\.[0-9]+$ ]]; then - echo "Requires development fio version with https://github.com/axboe/fio/pull/1992" +if ! sort --version-sort --check=quiet <(printf "%s\n%s\n" "$min_fio_version" "$fio_version"); then + echo "Requires fio version with https://github.com/axboe/fio/pull/1992" exit $UBLK_SKIP_CODE fi ERR_CODE=0
Signature · 1 line
2.45.2
Re: [PATCH 2/3] selftests: ublk: enable test_integrity_02.sh on fio 3.42
Quoted 4 lines · Caleb Sander Mateos
fio 3.42 was released with the needed fix for
test_integrity_02.sh. Allow 3.42 and newer in the fio version check.Signed-off-by Caleb Sander Mateos <[email protected]>
Thanks,
Ming
PATCH 3/3 selftests: ublk: add ublk auto integrity test
In reply to Caleb Sander MateosThe end-to-end integrity ublk selftest test_integrity_02 requires a relatively recent fio version to support I/O with integrity buffers. Add a version test_integrity_03 that uses the block layer's auto integrity path instead. The auto integrity code doesn't check the application tag, and doesn't indicate the bad guard/ref tag (just returns EILSEQ). But it's a good smoke-test of the ublk integrity code and provides coverage of the auto integrity path as well.
--- tools/testing/selftests/ublk/Makefile | 1 + .../selftests/ublk/test_integrity_03.sh | 103 ++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100755 tools/testing/selftests/ublk/test_integrity_03.sh
tools/testing/selftests/ublk/Makefile +1 -0
@@ -35,10 +35,11 @@ TEST_PROGS += test_loop_05.sh TEST_PROGS += test_loop_06.sh TEST_PROGS += test_loop_07.sh TEST_PROGS += test_integrity_01.sh TEST_PROGS += test_integrity_02.sh +TEST_PROGS += test_integrity_03.sh TEST_PROGS += test_recover_01.sh TEST_PROGS += test_recover_02.sh TEST_PROGS += test_recover_03.sh TEST_PROGS += test_recover_04.sh
tools/testing/selftests/ublk/test_integrity_03.sh new file +103 -0
103 lines not on this page · raw message
Signature · 1 line
2.45.2
Re: [PATCH 3/3] selftests: ublk: add ublk auto integrity test
Quoted 9 lines · Caleb Sander Mateos
The end-to-end integrity ublk selftest
test_integrity_02requires a relatively recent fio version to support I/O with integrity buffers. Add a versiontest_integrity_03that uses the block layer's auto integrity path instead. The auto integrity code doesn't check the application tag, and doesn't indicate the bad guard/ref tag (just returns EILSEQ). But it's a good smoke-test of the ublk integrity code and provides coverage of the auto integrity path as well.Signed-off-by Caleb Sander Mateos <[email protected]>
Thanks,
Ming
Quoted 4 lines · Caleb Sander Mateos
Update
test_integrity_02to allow fio-3.42 now that it's been released. Add a modified versiontest_integrity_03that uses auto integrity and avoids the newer fio requirement.
Quoted 8 lines
Also clean up the callers of
_cleanuppassing an unnecessary argument.Caleb Sander Mateos (3):
selftests: ublk: remove unused argument to_cleanup
selftests: ublk: enabletest_integrity_02.shon fio 3.42
selftests: ublk: add ublk auto integrity test[...]
Applied, thanks!
[1/3] selftests: ublk: remove unused argument to _cleanup
(no commit info)
[2/3] selftests: ublk: enable test_integrity_02.sh on fio 3.42
(no commit info)
[3/3] selftests: ublk: add ublk auto integrity test
(no commit info)
Best regards,
Signature · 1 line
Jens Axboe