ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3cc3dba342
Spdk/test/vhost/initiator/blockdev.sh

88 lines
3.6 KiB
Bash
Raw Normal View History

test/vhost: Fio tests for vhost initiator. Change-Id: Iad11eef12c0f7f80c26264f65a38df798eae1a27 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.gerrithub.io/378071 Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-09-12 13:47:30 +00:00
#!/usr/bin/env bash
vhost: Use standard path names throughout tests Follow the pattern that most of the other tests follow by defining testdir and rootdir at the top, then sourcing the common files. Change-Id: I8f4374e91f20edc244e8e8bcf8f9df198b4509c6 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454380 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-05-10 17:54:24 +00:00
testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..)
source $rootdir/test/common/autotest_common.sh
test/vhost: make run_fio.py to just run fio Make shell scripts prepare fio jobs and just call run_fio.py to run those jobs. This way run_fio.py don't need to know anything about test environment configuration. Change-Id: I10b6954011855e9139ff7b5372070ec553009d33 Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-on: https://review.gerrithub.io/391929 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
2017-12-15 15:11:02 +00:00
function run_spdk_fio() {
test/vhost/initiator: don't use test/vhost/common.sh That common.sh requires e.g. qemu installed, which is completely unnecessary for this test. vhost_kill() used to clean up e.g. leftover fio files, but now instead of deleting them, just tell FIO not to create them by using --verify_state_save=0 fio param. Change-Id: I5e63dad5681e715ee5dac131ec9b5c17bfdac2eb Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1550 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 11:51:50 +00:00
fio_bdev --ioengine=spdk_bdev "$@" --spdk_mem=1024 --spdk_single_seg=1 \
--verify_state_save=0
test/vhost: Fio tests for vhost initiator. Change-Id: Iad11eef12c0f7f80c26264f65a38df798eae1a27 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.gerrithub.io/378071 Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2017-09-12 13:47:30 +00:00
}
test/vhost/initiator: generate json config at runtime Drop the static configuration file from spdk repo and generate it with save_config RPC instead. This also lets us drop a huge wart from those test that is discover_bdevs. Change-Id: I74b2adbc2f391a04db9acd9ac7d0e8f381b41da0 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1549 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-03-27 11:35:22 +00:00
function err_cleanup() {
rm -f $testdir/bdev.json
test/vhost/initiator: don't use test/vhost/common.sh That common.sh requires e.g. qemu installed, which is completely unnecessary for this test. vhost_kill() used to clean up e.g. leftover fio files, but now instead of deleting them, just tell FIO not to create them by using --verify_state_save=0 fio param. Change-Id: I5e63dad5681e715ee5dac131ec9b5c17bfdac2eb Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1550 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 11:51:50 +00:00
killprocess $vhost_pid
check_format: Reformat the Bash code in compliance with shfmt Change-Id: I93e7b9d355870b0528a0ac3382fba1a10a558d45 Signed-off-by: Michal Berger <michalx.berger@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1718 Community-CI: Mellanox Build Bot Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
2020-05-07 11:27:06 +00:00
if [[ -n "$dummy_spdk_pid" ]] && kill -0 $dummy_spdk_pid &> /dev/null; then
test/vhost/initiator: generate json config at runtime Drop the static configuration file from spdk repo and generate it with save_config RPC instead. This also lets us drop a huge wart from those test that is discover_bdevs. Change-Id: I74b2adbc2f391a04db9acd9ac7d0e8f381b41da0 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1549 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-03-27 11:35:22 +00:00
killprocess $dummy_spdk_pid
fi
test/vhost: Fio test for vhost initiator for unmap Change-Id: I0bb922d6a135d4b49d2f5f89ec3874251b898090 Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com> Reviewed-on: https://review.gerrithub.io/381642 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2017-10-06 14:42:32 +00:00
}
test/vhost/initiator: inline create_bdev_config() This function is not really reusable. Inline it to have a simple, top-to-bottom test flow. This already shows the test is unnecessarily complicated. If anything with lib/virtio goes wrong this file is the last script that will be used for debugging. It would be OK if there simpler tests for lib/virtio, but there are not. While here, also add comments for the three major steps in this test script because it finally looks sane. Change-Id: Ic8ae611d853d4a685d38aa3112d16e396b0e110d Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1552 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:05:32 +00:00
# start vhost and configure it
test/vhost/initiator: generate json config at runtime Drop the static configuration file from spdk repo and generate it with save_config RPC instead. This also lets us drop a huge wart from those test that is discover_bdevs. Change-Id: I74b2adbc2f391a04db9acd9ac7d0e8f381b41da0 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1549 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-03-27 11:35:22 +00:00
trap 'err_cleanup; exit 1' SIGINT SIGTERM EXIT
test/vhost: verify cpumask argument for controller creation `--cpumask` argument for vhost controller creation was untested. This patch specifies this argument and verifies output under following conditions: - no cpumask, resulting in it being equal to the app cpumask - cpumask equal to app cpumask - single core - single non-main core - two cores It was motivated by recent changes to reactor code affecting vhost without it being caught by CI. See commit 7cc83b62. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I92c603061619092007bc27a189d3d8787461a16f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6211 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
2021-02-01 10:11:33 +00:00
$SPDK_BIN_DIR/vhost -m 0xf &
test/vhost/initiator: don't use test/vhost/common.sh That common.sh requires e.g. qemu installed, which is completely unnecessary for this test. vhost_kill() used to clean up e.g. leftover fio files, but now instead of deleting them, just tell FIO not to create them by using --verify_state_save=0 fio param. Change-Id: I5e63dad5681e715ee5dac131ec9b5c17bfdac2eb Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1550 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 11:51:50 +00:00
vhost_pid=$!
waitforlisten $vhost_pid
test/vhost/initiator: don't override the ERR trap It's set once in autotest_common.sh and must not be set anywhere else. Change-Id: I575d42f2b5caa38d9836f26b8aa6e414682d9554 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1548 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-03-27 11:05:28 +00:00
script/gen_nvme: do not generate legacy configuration gen_nvme.sh will no longer generate the legacy configuration. "--json" option will still work for any current users of the script. Tests were modified to no longer use the "--json" option. Meanwhile others were simplified with switch to "--json-with-subsystems". Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I8450be98660e54c64c27d8401fc40d649f9403ea Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4802 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Paul Luse <paul.e.luse@intel.com>
2020-10-21 10:59:09 +00:00
$rootdir/scripts/gen_nvme.sh | $rootdir/scripts/rpc.py load_subsystem_config
test/vhost/initiator: inline create_bdev_config() This function is not really reusable. Inline it to have a simple, top-to-bottom test flow. This already shows the test is unnecessarily complicated. If anything with lib/virtio goes wrong this file is the last script that will be used for debugging. It would be OK if there simpler tests for lib/virtio, but there are not. While here, also add comments for the three major steps in this test script because it finally looks sane. Change-Id: Ic8ae611d853d4a685d38aa3112d16e396b0e110d Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1552 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:05:32 +00:00
if [ -z "$(rpc_cmd bdev_get_bdevs | jq '.[] | select(.name=="Nvme0n1")')" ]; then
echo "Nvme0n1 bdev not found!" && false
fi
rpc_cmd bdev_split_create Nvme0n1 6
rpc_cmd vhost_create_scsi_controller naa.Nvme0n1_scsi0.0
rpc_cmd vhost_scsi_controller_add_target naa.Nvme0n1_scsi0.0 0 Nvme0n1p0
rpc_cmd vhost_scsi_controller_add_target naa.Nvme0n1_scsi0.0 1 Nvme0n1p1
rpc_cmd vhost_scsi_controller_add_target naa.Nvme0n1_scsi0.0 2 Nvme0n1p2
rpc_cmd vhost_scsi_controller_add_target naa.Nvme0n1_scsi0.0 3 Nvme0n1p3
test/vhost: verify cpumask argument for controller creation `--cpumask` argument for vhost controller creation was untested. This patch specifies this argument and verifies output under following conditions: - no cpumask, resulting in it being equal to the app cpumask - cpumask equal to app cpumask - single core - single non-main core - two cores It was motivated by recent changes to reactor code affecting vhost without it being caught by CI. See commit 7cc83b62. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I92c603061619092007bc27a189d3d8787461a16f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6211 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
2021-02-01 10:11:33 +00:00
[[ "$(rpc_cmd vhost_get_controllers -n naa.Nvme0n1_scsi0.0 | jq -r '.[].cpumask')" == "0xf" ]]
test/vhost/initiator: inline create_bdev_config() This function is not really reusable. Inline it to have a simple, top-to-bottom test flow. This already shows the test is unnecessarily complicated. If anything with lib/virtio goes wrong this file is the last script that will be used for debugging. It would be OK if there simpler tests for lib/virtio, but there are not. While here, also add comments for the three major steps in this test script because it finally looks sane. Change-Id: Ic8ae611d853d4a685d38aa3112d16e396b0e110d Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1552 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:05:32 +00:00
test/vhost: verify cpumask argument for controller creation `--cpumask` argument for vhost controller creation was untested. This patch specifies this argument and verifies output under following conditions: - no cpumask, resulting in it being equal to the app cpumask - cpumask equal to app cpumask - single core - single non-main core - two cores It was motivated by recent changes to reactor code affecting vhost without it being caught by CI. See commit 7cc83b62. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I92c603061619092007bc27a189d3d8787461a16f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6211 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
2021-02-01 10:11:33 +00:00
rpc_cmd vhost_create_blk_controller naa.Nvme0n1_blk0.0 Nvme0n1p4 --cpumask 0xf
[[ "$(rpc_cmd vhost_get_controllers -n naa.Nvme0n1_blk0.0 | jq -r '.[].cpumask')" == "0xf" ]]
rpc_cmd vhost_create_blk_controller naa.Nvme0n1_blk1.0 Nvme0n1p5 --cpumask 0x1
[[ "$(rpc_cmd vhost_get_controllers -n naa.Nvme0n1_blk1.0 | jq -r '.[].cpumask')" == "0x1" ]]
test/vhost/initiator: inline create_bdev_config() This function is not really reusable. Inline it to have a simple, top-to-bottom test flow. This already shows the test is unnecessarily complicated. If anything with lib/virtio goes wrong this file is the last script that will be used for debugging. It would be OK if there simpler tests for lib/virtio, but there are not. While here, also add comments for the three major steps in this test script because it finally looks sane. Change-Id: Ic8ae611d853d4a685d38aa3112d16e396b0e110d Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1552 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:05:32 +00:00
rpc_cmd bdev_malloc_create 128 512 --name Malloc0
test/vhost: verify cpumask argument for controller creation `--cpumask` argument for vhost controller creation was untested. This patch specifies this argument and verifies output under following conditions: - no cpumask, resulting in it being equal to the app cpumask - cpumask equal to app cpumask - single core - single non-main core - two cores It was motivated by recent changes to reactor code affecting vhost without it being caught by CI. See commit 7cc83b62. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I92c603061619092007bc27a189d3d8787461a16f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6211 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
2021-02-01 10:11:33 +00:00
rpc_cmd vhost_create_scsi_controller naa.Malloc0.0 --cpumask 0x2
test/vhost/initiator: inline create_bdev_config() This function is not really reusable. Inline it to have a simple, top-to-bottom test flow. This already shows the test is unnecessarily complicated. If anything with lib/virtio goes wrong this file is the last script that will be used for debugging. It would be OK if there simpler tests for lib/virtio, but there are not. While here, also add comments for the three major steps in this test script because it finally looks sane. Change-Id: Ic8ae611d853d4a685d38aa3112d16e396b0e110d Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1552 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:05:32 +00:00
rpc_cmd vhost_scsi_controller_add_target naa.Malloc0.0 0 Malloc0
test/vhost: verify cpumask argument for controller creation `--cpumask` argument for vhost controller creation was untested. This patch specifies this argument and verifies output under following conditions: - no cpumask, resulting in it being equal to the app cpumask - cpumask equal to app cpumask - single core - single non-main core - two cores It was motivated by recent changes to reactor code affecting vhost without it being caught by CI. See commit 7cc83b62. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I92c603061619092007bc27a189d3d8787461a16f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6211 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
2021-02-01 10:11:33 +00:00
[[ "$(rpc_cmd vhost_get_controllers -n naa.Malloc0.0 | jq -r '.[].cpumask')" == "0x2" ]]
test/vhost/initiator: inline create_bdev_config() This function is not really reusable. Inline it to have a simple, top-to-bottom test flow. This already shows the test is unnecessarily complicated. If anything with lib/virtio goes wrong this file is the last script that will be used for debugging. It would be OK if there simpler tests for lib/virtio, but there are not. While here, also add comments for the three major steps in this test script because it finally looks sane. Change-Id: Ic8ae611d853d4a685d38aa3112d16e396b0e110d Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1552 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:05:32 +00:00
rpc_cmd bdev_malloc_create 128 4096 --name Malloc1
test/vhost: verify cpumask argument for controller creation `--cpumask` argument for vhost controller creation was untested. This patch specifies this argument and verifies output under following conditions: - no cpumask, resulting in it being equal to the app cpumask - cpumask equal to app cpumask - single core - single non-main core - two cores It was motivated by recent changes to reactor code affecting vhost without it being caught by CI. See commit 7cc83b62. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I92c603061619092007bc27a189d3d8787461a16f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6211 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
2021-02-01 10:11:33 +00:00
rpc_cmd vhost_create_scsi_controller naa.Malloc1.0 --cpumask 0xc
test/vhost/initiator: inline create_bdev_config() This function is not really reusable. Inline it to have a simple, top-to-bottom test flow. This already shows the test is unnecessarily complicated. If anything with lib/virtio goes wrong this file is the last script that will be used for debugging. It would be OK if there simpler tests for lib/virtio, but there are not. While here, also add comments for the three major steps in this test script because it finally looks sane. Change-Id: Ic8ae611d853d4a685d38aa3112d16e396b0e110d Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1552 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:05:32 +00:00
rpc_cmd vhost_scsi_controller_add_target naa.Malloc1.0 0 Malloc1
test/vhost: verify cpumask argument for controller creation `--cpumask` argument for vhost controller creation was untested. This patch specifies this argument and verifies output under following conditions: - no cpumask, resulting in it being equal to the app cpumask - cpumask equal to app cpumask - single core - single non-main core - two cores It was motivated by recent changes to reactor code affecting vhost without it being caught by CI. See commit 7cc83b62. Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: I92c603061619092007bc27a189d3d8787461a16f Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6211 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
2021-02-01 10:11:33 +00:00
[[ "$(rpc_cmd vhost_get_controllers -n naa.Malloc1.0 | jq -r '.[].cpumask')" == "0xc" ]]
test/virtio: Refactor existing code - replace generating job files with pre-existent fio job file - construct vhost scsi controllers with rpc - replace generating path to vhost socket in bdev.conf with static path - add function usage Change-Id: I44dedb7fd9a3d96e3d348450c4351cfae6d20116 Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com> Reviewed-on: https://review.gerrithub.io/391827 Reviewed-by: Jim Harris <james.r.harris@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
2017-12-14 19:32:58 +00:00
test/vhost/initiator: inline create_bdev_config() This function is not really reusable. Inline it to have a simple, top-to-bottom test flow. This already shows the test is unnecessarily complicated. If anything with lib/virtio goes wrong this file is the last script that will be used for debugging. It would be OK if there simpler tests for lib/virtio, but there are not. While here, also add comments for the three major steps in this test script because it finally looks sane. Change-Id: Ic8ae611d853d4a685d38aa3112d16e396b0e110d Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1552 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:05:32 +00:00
# start a dummy app, create vhost bdevs in it, then dump the config for FIO
build: Output executables from the app directory to build/bin Automatically place binaries produced from the app directory into build/bin. This matches with the output in build/lib that already exists. Change-Id: I13cd2da71d2f88592e22308fe8a907bf458458b5 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2379 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
2020-05-11 21:15:03 +00:00
$SPDK_BIN_DIR/spdk_tgt -r /tmp/spdk2.sock -g &
test/vhost/initiator: generate json config at runtime Drop the static configuration file from spdk repo and generate it with save_config RPC instead. This also lets us drop a huge wart from those test that is discover_bdevs. Change-Id: I74b2adbc2f391a04db9acd9ac7d0e8f381b41da0 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1549 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-03-27 11:35:22 +00:00
dummy_spdk_pid=$!
waitforlisten $dummy_spdk_pid /tmp/spdk2.sock
rpc_cmd -s /tmp/spdk2.sock bdev_virtio_attach_controller --trtype user --traddr 'naa.Nvme0n1_scsi0.0' -d scsi --vq-count 8 'VirtioScsi0'
rpc_cmd -s /tmp/spdk2.sock bdev_virtio_attach_controller --trtype user --traddr 'naa.Nvme0n1_blk0.0' -d blk --vq-count 8 'VirtioBlk3'
rpc_cmd -s /tmp/spdk2.sock bdev_virtio_attach_controller --trtype user --traddr 'naa.Nvme0n1_blk1.0' -d blk --vq-count 8 'VirtioBlk4'
rpc_cmd -s /tmp/spdk2.sock bdev_virtio_attach_controller --trtype user --traddr 'naa.Malloc0.0' -d scsi --vq-count 8 'VirtioScsi1'
rpc_cmd -s /tmp/spdk2.sock bdev_virtio_attach_controller --trtype user --traddr 'naa.Malloc1.0' -d scsi --vq-count 8 'VirtioScsi2'
check_format: Reformat the Bash code in compliance with shfmt Change-Id: I93e7b9d355870b0528a0ac3382fba1a10a558d45 Signed-off-by: Michal Berger <michalx.berger@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1718 Community-CI: Mellanox Build Bot Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
2020-05-07 11:27:06 +00:00
cat <<- CONF > $testdir/bdev.json
test/vhost/initiator: generate json config at runtime Drop the static configuration file from spdk repo and generate it with save_config RPC instead. This also lets us drop a huge wart from those test that is discover_bdevs. Change-Id: I74b2adbc2f391a04db9acd9ac7d0e8f381b41da0 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1549 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-03-27 11:35:22 +00:00
{"subsystems":[
$(rpc_cmd -s /tmp/spdk2.sock save_subsystem_config -n bdev)
]}
CONF
killprocess $dummy_spdk_pid
test/vhost/initiator: inline create_bdev_config() This function is not really reusable. Inline it to have a simple, top-to-bottom test flow. This already shows the test is unnecessarily complicated. If anything with lib/virtio goes wrong this file is the last script that will be used for debugging. It would be OK if there simpler tests for lib/virtio, but there are not. While here, also add comments for the three major steps in this test script because it finally looks sane. Change-Id: Ic8ae611d853d4a685d38aa3112d16e396b0e110d Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1552 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:05:32 +00:00
# run FIO with previously acquired spdk config files
test/virtio: Refactor existing code - replace generating job files with pre-existent fio job file - construct vhost scsi controllers with rpc - replace generating path to vhost socket in bdev.conf with static path - add function usage Change-Id: I44dedb7fd9a3d96e3d348450c4351cfae6d20116 Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com> Reviewed-on: https://review.gerrithub.io/391827 Reviewed-by: Jim Harris <james.r.harris@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
2017-12-14 19:32:58 +00:00
timing_enter run_spdk_fio
test/vhost/initiator: remove unused fio sections They had no effect, only the first section was run. I'm not sure how to run more than one, but it's not a problem if we stick to just one. There's another case right below where no `--section` param is specified and all sections are run. Change-Id: I399bef07b671ee81bd289e77f2a8203c96268807 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1553 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:11:22 +00:00
run_spdk_fio $testdir/bdev.fio --filename=* --section=job_randwrite --spdk_json_conf=$testdir/bdev.json
test/virtio: Refactor existing code - replace generating job files with pre-existent fio job file - construct vhost scsi controllers with rpc - replace generating path to vhost socket in bdev.conf with static path - add function usage Change-Id: I44dedb7fd9a3d96e3d348450c4351cfae6d20116 Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com> Reviewed-on: https://review.gerrithub.io/391827 Reviewed-by: Jim Harris <james.r.harris@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
2017-12-14 19:32:58 +00:00
timing_exit run_spdk_fio
test/virtio: Perform unmap tests on unmap supporting devices -perform rw tests on all devices -perform unmap tests + rw tests to match number of jobs and queues Change-Id: Ica59ea3667c1c3a639ec9cded0fd43ea9d83ef03 Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com> Reviewed-on: https://review.gerrithub.io/394074 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2018-01-09 17:55:20 +00:00
timing_enter run_spdk_fio_unmap
test/vhost/initiator: generate json config at runtime Drop the static configuration file from spdk repo and generate it with save_config RPC instead. This also lets us drop a huge wart from those test that is discover_bdevs. Change-Id: I74b2adbc2f391a04db9acd9ac7d0e8f381b41da0 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1549 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-03-27 11:35:22 +00:00
run_spdk_fio $testdir/bdev.fio --filename="VirtioScsi1t0:VirtioScsi2t0" --spdk_json_conf=$testdir/bdev.json
test/virtio: Perform unmap tests on unmap supporting devices -perform rw tests on all devices -perform unmap tests + rw tests to match number of jobs and queues Change-Id: Ica59ea3667c1c3a639ec9cded0fd43ea9d83ef03 Signed-off-by: Pawel Niedzwiecki <pawelx.niedzwiecki@intel.com> Reviewed-on: https://review.gerrithub.io/394074 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
2018-01-09 17:55:20 +00:00
timing_exit run_spdk_fio_unmap
test/vhost/initiator: use RPC daemon About 1 second speedup. We can use RPC deamon everywhere except for load_subsystem_config (since it's not a real RPC and it's handled differently). Change-Id: If14964c6688976e0f2edec40198c30d5cbc21e83 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1551 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 16:02:08 +00:00
rpc_cmd bdev_nvme_detach_controller Nvme0
bdev: add delete_nvme_bdev call Since delete_bdev should be used only for debug purpose, this patch adds delete call specific for NVMe bdev. Signed-off-by: Maciej Szwed <maciej.szwed@intel.com> Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Change-Id: Ib9a0475d735af2616a3005d04530ca825ece8a52 Reviewed-on: https://review.gerrithub.io/416546 Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
2018-07-26 12:54:20 +00:00
test/vhost/initiator: don't override the ERR trap It's set once in autotest_common.sh and must not be set anywhere else. Change-Id: I575d42f2b5caa38d9836f26b8aa6e414682d9554 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1548 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-03-27 11:05:28 +00:00
trap - SIGINT SIGTERM EXIT
test/vhost/initiator: generate json config at runtime Drop the static configuration file from spdk repo and generate it with save_config RPC instead. This also lets us drop a huge wart from those test that is discover_bdevs. Change-Id: I74b2adbc2f391a04db9acd9ac7d0e8f381b41da0 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1549 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-03-27 11:35:22 +00:00
rm -f $testdir/bdev.json
test/vhost/initiator: don't override the ERR trap It's set once in autotest_common.sh and must not be set anywhere else. Change-Id: I575d42f2b5caa38d9836f26b8aa6e414682d9554 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1548 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2020-03-27 11:05:28 +00:00
test/vhost/initiator: don't use test/vhost/common.sh That common.sh requires e.g. qemu installed, which is completely unnecessary for this test. vhost_kill() used to clean up e.g. leftover fio files, but now instead of deleting them, just tell FIO not to create them by using --verify_state_save=0 fio param. Change-Id: I5e63dad5681e715ee5dac131ec9b5c17bfdac2eb Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1550 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Mellanox Build Bot
2020-03-27 11:51:50 +00:00
killprocess $vhost_pid
Reference in New Issue Copy Permalink