@@ -102,8 +102,12 @@ RUN_ZONED_TESTS=1
The NVMe tests can be additionally parameterized via environment variables.
-- nvme_trtype: 'loop' (default), 'tcp', 'rdma' and 'fc'
- Run the tests with the given transport.
+- NVMET_TRTYPES: 'loop' (default), 'tcp', 'rdma' and 'fc'
+ Set up NVME target backends with the specified transport. Multiple transports
+ can be listed with separating spaces, e.g., "loop tcp rdma". In this case, the
+ tests are repeated to cover all of the transports specified.
+ This parameter had an old name 'nvme_trtype'. The old name is still usable,
+ but not recommended.
- nvme_img_size: '1G' (default)
Run the tests with given image size in bytes. 'm', 'M', 'g'
and 'G' postfix are supported.
@@ -117,11 +121,11 @@ These tests will use the siw (soft-iWARP) driver by default. The rdma_rxe
```sh
To use the siw driver:
-nvme_trtype=rdma ./check nvme/
+NVMET_TRTYPES=rdma ./check nvme/
./check srp/
To use the rdma_rxe driver:
-use_rxe=1 nvme_trtype=rdma ./check nvme/
+use_rxe=1 NVMET_TRTYPES=rdma ./check nvme/
use_rxe=1 ./check srp/
```
@@ -18,10 +18,41 @@ def_hostid="0f01fb42-9f7f-4856-b0b3-51e60b8de349"
def_hostnqn="nqn.2014-08.org.nvmexpress:uuid:${def_hostid}"
export def_subsysnqn="blktests-subsystem-1"
export def_subsys_uuid="91fdba0d-f87b-4c25-b80f-db7be1418b9e"
-nvme_trtype=${nvme_trtype:-"loop"}
+_check_conflict_and_set_default NVMET_TRTYPES nvme_trtype "loop"
nvme_img_size=${nvme_img_size:-"1G"}
nvme_num_iter=${nvme_num_iter:-"1000"}
+_NVMET_TRTYPES_is_valid() {
+ local type
+
+ for type in $NVMET_TRTYPES; do
+ case $type in
+ loop | rdma | tcp | fc)
+ ;;
+ *)
+ SKIP_REASONS+=("Invalid NVMET_TRTYPE value: $type")
+ return 1
+ ;;
+ esac
+ done
+ return 0
+}
+
+_set_nvme_trtype() {
+ local index=$1
+ local -a types
+
+ read -r -a types <<< "$NVMET_TRTYPES"
+
+ if [[ -z $index ]]; then
+ echo ${#types[@]}
+ return
+ fi
+
+ nvme_trtype=${types[index]}
+ COND_DESC="nvmet tr=${nvme_trtype}"
+}
+
# TMPDIR can not be referred out of test() or test_device() context. Instead of
# global variable def_flie_path, use this getter function.
_nvme_def_file_path() {
@@ -61,9 +92,6 @@ _nvme_requires() {
_have_configfs
def_adrfam="fc"
;;
- *)
- SKIP_REASONS+=("unsupported nvme_trtype=${nvme_trtype}")
- return 1
esac
if [[ -n ${nvme_adrfam} ]]; then
@@ -92,6 +120,7 @@ _nvme_requires() {
group_requires() {
_have_root
+ _NVMET_TRTYPES_is_valid
}
group_device_requires() {
Some of the test cases in nvme test group can be run under various nvme target transport types. The configuration parameter nvme_trtype specifies the transport to use. But this configuration method has two drawbacks. Firstly, the blktests check script needs to be invoked multiple times to cover multiple transport types. Secondly, the test cases irrelevant to the transport types are executed exactly same conditions in the multiple blktests runs. To avoid the drawbacks, allow setting multiple transport types. Taking this chance, rename the parameter from nvme_trtype to NVMET_TRTYPES to follow the uppercase letter naming guide for environment variables. NVMET_TRTYPES can take multiple transport types like: NVMET_TRTYPES="loop tcp" Introduce _nvmet_set_nvme_trtype() which can be called from the set_conditions() hook of the transport type dependent test cases. Blktests will repeat the test case as many as the number of elements in NVMET_TRTYPES, and set nvme_trtype for each test case run. Also introduce _NVMET_TRTYPES_is_valid() to check NVMET_TRTYPES value before test run. Reviewed-by: Daniel Wagner <dwagner@suse.de> Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> --- Documentation/running-tests.md | 12 +++++++---- tests/nvme/rc | 37 ++++++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 8 deletions(-)