Add _ublk_del_dev() to delete a specific ublk device by ID and use it in all test scripts instead of calling UBLK_PROG directly.
Also remove unused _remove_ublk_devices() function. Signed-off-by: Ming Lei <[email protected]> --- tools/testing/selftests/ublk/test_common.sh | 13 +++++++------ tools/testing/selftests/ublk/test_generic_16.sh | 4 ++-- tools/testing/selftests/ublk/test_null_04.sh | 8 ++++---- tools/testing/selftests/ublk/test_part_02.sh | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/ublk/test_common.sh b/tools/testing/selftests/ublk/test_common.sh index 8d298a7ee7b1..0f1fdb0892b4 100755 --- a/tools/testing/selftests/ublk/test_common.sh +++ b/tools/testing/selftests/ublk/test_common.sh @@ -106,11 +106,6 @@ _check_root() { fi } -_remove_ublk_devices() { - ${UBLK_PROG} del -a - modprobe -r ublk_drv > /dev/null 2>&1 -} - _get_ublk_dev_state() { ${UBLK_PROG} list -n "$1" | grep "state" | awk '{print $11}' } @@ -277,10 +272,16 @@ __ublk_kill_daemon() echo "$state" } -__remove_ublk_dev_return() { +_ublk_del_dev() { local dev_id=$1 ${UBLK_PROG} del -n "${dev_id}" +} + +__remove_ublk_dev_return() { + local dev_id=$1 + + _ublk_del_dev "${dev_id}" local res=$? udevadm settle return ${res} diff --git a/tools/testing/selftests/ublk/test_generic_16.sh b/tools/testing/selftests/ublk/test_generic_16.sh index 42e8d2e16ec9..3ef367836ac5 100755 --- a/tools/testing/selftests/ublk/test_generic_16.sh +++ b/tools/testing/selftests/ublk/test_generic_16.sh @@ -24,7 +24,7 @@ if ! ${UBLK_PROG} stop -n "${dev_id}" --safe; then fi # Clean up device -${UBLK_PROG} del -n "${dev_id}" > /dev/null 2>&1 +_ublk_del_dev "${dev_id}" > /dev/null 2>&1 udevadm settle # Test 2: stop --safe on device with active opener should fail @@ -49,7 +49,7 @@ kill $dd_pid 2>/dev/null wait $dd_pid 2>/dev/null # Now device should be idle, regular delete should work -${UBLK_PROG} del -n "${dev_id}" +_ublk_del_dev "${dev_id}" udevadm settle _cleanup_test "null" diff --git a/tools/testing/selftests/ublk/test_null_04.sh b/tools/testing/selftests/ublk/test_null_04.sh index a5599d38583a..6713b280a6ff 100755 --- a/tools/testing/selftests/ublk/test_null_04.sh +++ b/tools/testing/selftests/ublk/test_null_04.sh @@ -34,7 +34,7 @@ _test_metadata_only() { "$(cat "/sys/block/ublkb$dev_id/integrity/protection_interval_bytes")" 512 && _check_value "tag_size" "$(cat "/sys/block/ublkb$dev_id/integrity/tag_size")" 0 - ${UBLK_PROG} del -n "${dev_id}" + _ublk_del_dev "${dev_id}" } _test_integrity_capable_ip() { @@ -53,7 +53,7 @@ _test_integrity_capable_ip() { "$(cat "/sys/block/ublkb$dev_id/integrity/protection_interval_bytes")" 512 && _check_value "tag_size" "$(cat "/sys/block/ublkb$dev_id/integrity/tag_size")" 0 - ${UBLK_PROG} del -n "${dev_id}" + _ublk_del_dev "${dev_id}" } _test_integrity_reftag_t10dif() { @@ -72,7 +72,7 @@ _test_integrity_reftag_t10dif() { "$(cat "/sys/block/ublkb$dev_id/integrity/protection_interval_bytes")" 512 && _check_value "tag_size" "$(cat "/sys/block/ublkb$dev_id/integrity/tag_size")" 0 - ${UBLK_PROG} del -n "${dev_id}" + _ublk_del_dev "${dev_id}" } _test_nvme_csum() { @@ -91,7 +91,7 @@ _test_nvme_csum() { "$(cat "/sys/block/ublkb$dev_id/integrity/protection_interval_bytes")" 512 && _check_value "tag_size" "$(cat "/sys/block/ublkb$dev_id/integrity/tag_size")" 8 - ${UBLK_PROG} del -n "${dev_id}" + _ublk_del_dev "${dev_id}" } _prep_test "null" "integrity params" diff --git a/tools/testing/selftests/ublk/test_part_02.sh b/tools/testing/selftests/ublk/test_part_02.sh index 727d0f4610d6..acd098deda3a 100755 --- a/tools/testing/selftests/ublk/test_part_02.sh +++ b/tools/testing/selftests/ublk/test_part_02.sh @@ -46,13 +46,13 @@ _test_partition_scan_no_hang() if [ "$state" != "${expected_state}" ]; then echo "FAIL: Device state is $state, expected ${expected_state}" ERR_CODE=255 - ${UBLK_PROG} del -n "${dev_id}" > /dev/null 2>&1 + _ublk_del_dev "${dev_id}" > /dev/null 2>&1 return fi echo "PASS: Device transitioned to ${expected_state} in ${elapsed}s without hanging" # Clean up the device - ${UBLK_PROG} del -n "${dev_id}" > /dev/null 2>&1 + _ublk_del_dev "${dev_id}" > /dev/null 2>&1 } _prep_test "partition_scan" "verify async partition scan prevents IO hang" -- 2.47.0
