Commit da12597a authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

selftests: ublk: cover PER_IO_DAEMON in more stress tests 



We have stress_03, stress_04 and stress_05 for checking new feature vs.
stress IO & device removal & ublk server crash & recovery, so let the
three existing stress tests cover PER_IO_DAEMON.

Then stress_06 can be removed, since the same test function is included in
stress_03.

Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250602132113.1398645-1-ming.lei@redhat.com


Reviewed-by: default avatarUday Shankar <ushankar@purestorage.com>
[axboe: remove test_stress_06.sh from Makefile too]
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 08652bd8

tools/testing/selftests/ublk/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ TEST_PROGS += test_stress_02.sh 
TEST_PROGS += test_stress_03.sh

TEST_PROGS += test_stress_04.sh

TEST_PROGS += test_stress_05.sh

TEST_PROGS += test_stress_06.sh



TEST_GEN_PROGS_EXTENDED = kublk

tools/testing/selftests/ublk/test_stress_03.sh

+8 −0
Original line number Diff line number Diff line
@@ -41,5 +41,13 @@ if _have_feature "AUTO_BUF_REG"; then 
fi

wait



if _have_feature "PER_IO_DAEMON"; then

	ublk_io_and_remove 8G -t null -q 4 --auto_zc --nthreads 8 --per_io_tasks &

	ublk_io_and_remove 256M -t loop -q 4 --auto_zc --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[0]}" &

	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 &

fi

wait



_cleanup_test "stress"

_show_result $TID $ERR_CODE

tools/testing/selftests/ublk/test_stress_04.sh

+7 −0
Original line number Diff line number Diff line
@@ -38,6 +38,13 @@ if _have_feature "AUTO_BUF_REG"; then 
	ublk_io_and_kill_daemon 256M -t stripe -q 4 --auto_zc "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" &

	ublk_io_and_kill_daemon 8G -t null -q 4 -z --auto_zc --auto_zc_fallback &

fi



if _have_feature "PER_IO_DAEMON"; then

	ublk_io_and_kill_daemon 8G -t null -q 4 --nthreads 8 --per_io_tasks &

	ublk_io_and_kill_daemon 256M -t loop -q 4 --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[0]}" &

	ublk_io_and_kill_daemon 256M -t stripe -q 4 --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" &

	ublk_io_and_kill_daemon 8G -t null -q 4 --nthreads 8 --per_io_tasks &

fi

wait



_cleanup_test "stress"

tools/testing/selftests/ublk/test_stress_05.sh

+7 −0
Original line number Diff line number Diff line
@@ -69,5 +69,12 @@ if _have_feature "AUTO_BUF_REG"; then 
	done

fi



if _have_feature "PER_IO_DAEMON"; then

	ublk_io_and_remove 8G -t null -q 4 --nthreads 8 --per_io_tasks -r 1 -i "$reissue" &

	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"

_show_result $TID $ERR_CODE

tools/testing/selftests/ublk/test_stress_06.sh

deleted100755 → 0
+0 −36
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0



. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh

TID="stress_06"

ERR_CODE=0



ublk_io_and_remove()

{

	run_io_and_remove "$@"

	ERR_CODE=$?

	if [ ${ERR_CODE} -ne 0 ]; then

		echo "$TID failure: $*"

		_show_result $TID $ERR_CODE

	fi

}



if ! _have_program fio; then

	exit "$UBLK_SKIP_CODE"

fi



_prep_test "stress" "run IO and remove device with per_io_tasks"



_create_backfile 0 256M

_create_backfile 1 128M

_create_backfile 2 128M



ublk_io_and_remove 8G -t null -q 4 --nthreads 5 --per_io_tasks &

ublk_io_and_remove 256M -t loop -q 4 --nthreads 3 --per_io_tasks \

        "${UBLK_BACKFILES[0]}" &

ublk_io_and_remove 256M -t stripe -q 4 --nthreads 4 --per_io_tasks \

        "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" &

wait



_cleanup_test "stress"

_show_result $TID $ERR_CODE