Change the default RDMA driver from rdma_rxe to siw

Since the siw driver is more stable than the rdma_rxe driver, change the default into siw. See e.g. https://lore.kernel.org/all/[email protected]/. Signed-off-by: Bart Van Assche <[email protected]>
bvanassche · Aug 23, 2023 · c11ec5e · c11ec5e
1 parent 2454f2b
commit c11ec5e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Documentation/running-tests.md b/Documentation/running-tests.md
@@ -110,17 +110,19 @@ The NVMe tests can be additionally parameterized via environment variables.
 - nvme_num_iter: 1000 (default)
   The number of iterations a test should do.
 
-### Running nvme-rdma srp tests
+### Running nvme-rdma and SRP tests
+
+These tests will use the siw (soft-iWARP) driver by default. The rdma_rxe
+(soft-RoCE) driver is also supported.
 
-Most of these tests will use the rdma_rxe (soft-RoCE) driver by default. The siw (soft-iWARP) driver is also supported.
 ```sh
-To use the rdma_rxe driver:
+To use the siw driver:
 nvme_trtype=rdma ./check nvme/
 ./check srp/
 
-To use the siw driver:
-use_siw=1 nvme_trtype=rdma ./check nvme/
-use_siw=1 ./check srp/
+To use the rdma_rxe driver:
+use_rxe=1 nvme_trtype=rdma ./check nvme/
+use_rxe=1 ./check srp/
 ```
 
 ### Normal user

diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma
@@ -396,7 +396,7 @@ start_soft_rdma() {
 	local type
 
 	{
-	if [ -n "$use_siw" ]; then
+	if [ -z "$use_rxe" ]; then
 		modprobe siw || return $?
 		type=siw
 	else

diff --git a/tests/srp/rc b/tests/srp/rc
@@ -51,7 +51,7 @@ group_requires() {
 	_have_module ib_uverbs
 	_have_module null_blk
 	_have_module rdma_cm
-	_have_module rdma_rxe
+	_have_module rdma_rxe || _have_module siw
 	_have_module scsi_debug
 	_have_module target_core_iblock
 	_have_module target_core_mod