File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -110,17 +110,19 @@ The NVMe tests can be additionally parameterized via environment variables.
110110- nvme_num_iter: 1000 (default)
111111 The number of iterations a test should do.
112112
113- ### Running nvme-rdma srp tests
113+ ### Running nvme-rdma and SRP tests
114+
115+ These tests will use the siw (soft-iWARP) driver by default. The rdma_rxe
116+ (soft-RoCE) driver is also supported.
114117
115- Most of these tests will use the rdma_rxe (soft-RoCE) driver by default. The siw (soft-iWARP) driver is also supported.
116118``` sh
117- To use the rdma_rxe driver:
119+ To use the siw driver:
118120nvme_trtype=rdma ./check nvme/
119121./check srp/
120122
121- To use the siw driver:
122- use_siw =1 nvme_trtype=rdma ./check nvme/
123- use_siw =1 ./check srp/
123+ To use the rdma_rxe driver:
124+ use_rxe =1 nvme_trtype=rdma ./check nvme/
125+ use_rxe =1 ./check srp/
124126```
125127
126128### Normal user
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ filesystem_type=ext4
1212fio_aux_path=/tmp/fio-state-files
1313memtotal=$( sed -n ' s/^MemTotal:[[:blank:]]*\([0-9]*\)[[:blank:]]*kB$/\1/p' /proc/meminfo)
1414max_ramdisk_size=$(( 1 << 25 ))
15- use_siw =${use_siw :- " " }
15+ use_rxe =${use_rxe :- " " }
1616ramdisk_size=$(( memtotal* (1024 / 16 )) ) # in bytes
1717if [ $ramdisk_size -gt $max_ramdisk_size ]; then
1818 ramdisk_size=$max_ramdisk_size
@@ -396,7 +396,7 @@ start_soft_rdma() {
396396 local type
397397
398398 {
399- if [ -n " $use_siw " ]; then
399+ if [ -z " $use_rxe " ]; then
400400 modprobe siw || return $?
401401 type=siw
402402 else
Original file line number Diff line number Diff line change @@ -51,7 +51,13 @@ group_requires() {
5151 _have_module ib_uverbs
5252 _have_module null_blk
5353 _have_module rdma_cm
54- _have_module rdma_rxe
54+ if [ -n " $use_rxe " ]; then
55+ _have_module rdma_rxe
56+ else
57+ _have_module siw
58+ _have_kver 5 5
59+ _have_iproute2 190404
60+ fi
5561 _have_module scsi_debug
5662 _have_module target_core_iblock
5763 _have_module target_core_mod
You can’t perform that action at this time.
0 commit comments