Skip to content

Commit f51ee53

Browse files
yizhanglinuxosandov
authored andcommitted
tests/srp: fix module loading issue during srp tests
The ib_isert/ib_srpt modules will be automatically loaded after the first time rdma_rxe/siw setup, which will lead srp tests fail. $ modprobe rdma_rxe $ echo eno1 >/sys/module/rdma_rxe/parameters/add $ lsmod | grep -E "ib_srpt|iscsi_target_mod|ib_isert" ib_srpt 167936 0 ib_isert 139264 0 iscsi_target_mod 843776 1 ib_isert target_core_mod 1069056 3 iscsi_target_mod,ib_srpt,ib_isert rdma_cm 315392 5 rpcrdma,ib_srpt,ib_iser,ib_isert,rdma_ucm ib_cm 344064 2 rdma_cm,ib_srpt ib_core 1101824 10 rdma_cm,rdma_rxe,rpcrdma,ib_srpt,iw_cm,ib_iser,ib_isert,rdma_ucm,ib_uverbs,ib_cm $ ./check srp/001 srp/001 (Create and remove LUNs) [failed] runtime ... 3.675s --- tests/srp/001.out 2021-10-13 01:18:50.846740093 -0400 +++ /root/blktests/results/nodev/srp/001.out.bad 2021-10-14 03:24:18.593852208 -0400 @@ -1,3 +1 @@ -Configured SRP target driver -count_luns(): 3 <> 3 -Passed +insmod: ERROR: could not insert module /lib/modules/5.15.0-rc5.fix+/kernel/drivers/infiniband/ulp/srpt/ib_srpt.ko: File exists modprobe: FATAL: Module iscsi_target_mod is in use. Reviewed-by: Bart Van Assche <[email protected]> Signed-off-by: Yi Zhang <[email protected]>
1 parent e786064 commit f51ee53

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

  • tests/srp

tests/srp/rc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,8 @@ start_lio_srpt() {
494494
if modinfo ib_srpt | grep -q '^parm:[[:blank:]]*rdma_cm_port:'; then
495495
opts+=("rdma_cm_port=${srp_rdma_cm_port}")
496496
fi
497-
insmod "/lib/modules/$(uname -r)/kernel/drivers/infiniband/ulp/srpt/ib_srpt."* "${opts[@]}" || return $?
497+
unload_module ib_srpt
498+
modprobe ib_srpt "${opts[@]}" || return $?
498499
i=0
499500
for r in "${vdev_path[@]}"; do
500501
if [ -b "$(readlink -f "$r")" ]; then
@@ -551,7 +552,7 @@ stop_lio_srpt() {
551552
rmdir /sys/kernel/config/target/*/* >&/dev/null
552553
rmdir /sys/kernel/config/target/* >&/dev/null
553554

554-
for m in ib_srpt iscsi_target_mod target_core_pscsi target_core_iblock \
555+
for m in ib_srpt ib_isert iscsi_target_mod target_core_pscsi target_core_iblock \
555556
target_core_file target_core_stgt target_core_user \
556557
target_core_mod
557558
do

0 commit comments

Comments
 (0)