ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/bdev: Add xnvme support to blockdev.sh setup

Browse Source 
Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: I86ffc7d35243560bcfedc31bf21630b2381d8c18
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14995
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Kamil Godzwon <kamilx.godzwon@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Michal Berger 2022-10-14 23:20:54 +02:00 committed by Tomasz Zawadzki
parent 367fc7a9cf
commit 008139c8de
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autotest.sh
View File

@ -223,6 +223,7 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then
if [[ $SPDK_TEST_XNVME -eq 1 ]]; then if [[ $SPDK_TEST_XNVME -eq 1 ]]; then
run_test "nvme_xnvme" test/nvme/xnvme/xnvme.sh run_test "nvme_xnvme" test/nvme/xnvme/xnvme.sh
run_test "blockdev_xnvme" test/bdev/blockdev.sh "xnvme"
fi fi
fi fi

23
test/bdev/blockdev.sh
View File

@ -34,6 +34,9 @@ function cleanup() {
wipefs --all "$gpt_nvme" wipefs --all "$gpt_nvme"
fi fi
fi fi
if [[ $test_type == xnvme ]]; then
"$rootdir/scripts/setup.sh"
fi
} }
function start_spdk_tgt() { function start_spdk_tgt() {
@ -73,6 +76,23 @@ function setup_nvme_conf() {
"$rpc_py" load_subsystem_config -j "'${json[*]}'" "$rpc_py" load_subsystem_config -j "'${json[*]}'"
} }
function setup_xnvme_conf() {
# TODO: Switch to io_uring_cmd when proper CI support is in place
local io_mechanism=io_uring
local nvme nvmes
"$rootdir/scripts/setup.sh" reset
get_zoned_devs
for nvme in /dev/nvme*n*; do
[[ -b $nvme && -z ${zoned_devs["${nvme##*/}"]} ]] || continue
nvmes+=("bdev_xnvme_create $nvme ${nvme##*/} $io_mechanism")
done
((${#nvmes[@]} > 0))
"$rpc_py" < <(printf '%s\n' "${nvmes[@]}")
}
function setup_gpt_conf() { function setup_gpt_conf() {
$rootdir/scripts/setup.sh reset $rootdir/scripts/setup.sh reset
get_zoned_devs get_zoned_devs
@ -530,6 +550,9 @@ case "$test_type" in
raid5f) raid5f)
setup_raid5f_conf setup_raid5f_conf
;; ;;
xnvme)
setup_xnvme_conf
;;
*) *)
echo "invalid test name" echo "invalid test name"
exit 1 exit 1