ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: Improve script that detects RDMA NICs

Browse Source 
Work around an issue with the mlx4 driver.
Make discovery of NICs more generic.

Change-Id: I9701d8d7937faa299d12d7ca4bfe1c923983c263
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-06-17 12:56:56 -07:00
parent 213e7a640d
commit e1d1040703
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/nvmf/common.sh
View File

@ -1,11 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
NVMF_PORT=7174 NVMF_PORT=7174
NVMF_IP_PREFIX="192.168.100." NVMF_IP_PREFIX="192.168.100"
NVMF_IP_LEAST_ADDR=8 NVMF_IP_LEAST_ADDR=8
NVMF_FIRST_TARGET_IP=$NVMF_IP_PREFIX$NVMF_IP_LEAST_ADDR NVMF_FIRST_TARGET_IP=$NVMF_IP_PREFIX.$NVMF_IP_LEAST_ADDR
nvmf_nic_bdfs=""
function load_ib_rdma_modules() function load_ib_rdma_modules()
{ {
@ -13,7 +11,6 @@ function load_ib_rdma_modules()
exit 0 exit 0
fi fi
modprobe ib_addr ib_mad ib_sa || true # part of core since 4.7
modprobe ib_cm modprobe ib_cm
modprobe ib_core modprobe ib_core
modprobe ib_ucm modprobe ib_ucm
@ -68,6 +65,10 @@ function detect_mellanox_nics()
modprobe $mlx_en_driver modprobe $mlx_en_driver
fi fi
# The mlx4 driver takes an extra few seconds to load after modprobe returns,
# otherwise ifconfig operations will do nothing.
sleep 5
trap - SIGINT SIGTERM EXIT trap - SIGINT SIGTERM EXIT
} }
@ -79,19 +80,14 @@ function detect_rdma_nics()
function allocate_nic_ips() function allocate_nic_ips()
{ {
LEAST_ADDR=$NVMF_IP_LEAST_ADDR let count=$NVMF_IP_LEAST_ADDR
for bdf in $1; do for nic_type in `ls /sys/class/infiniband`; do
dir=`find /sys -name $bdf | grep "/sys/devices"` for nic_name in `ls /sys/class/infiniband/${nic_type}/device/net`; do
if [ -e $dir ]; then ifconfig $nic_name $NVMF_IP_PREFIX.$count netmask 255.255.255.0 up
if [ -e $dir"/net" ]; then let count=$count+1
nic_name=`ls $dir"/net"` done
# just get the first nic
nic_name=`echo $nic_name | awk '{ print $1; }'`
ifconfig $nic_name $NVMF_IP_PREFIX$LEAST_ADDR netmask 255.255.255.0 up
LEAST_ADDR=$[$LEAST_ADDR + 1]
fi
fi
done done
# check whether the IP is configured # check whether the IP is configured
result=`ifconfig | grep $NVMF_IP_PREFIX` result=`ifconfig | grep $NVMF_IP_PREFIX`
if [ -z "$result" ]; then if [ -z "$result" ]; then
@ -110,6 +106,6 @@ function rdma_device_init()
{ {
load_ib_rdma_modules load_ib_rdma_modules
detect_rdma_nics detect_rdma_nics
allocate_nic_ips $nvmf_nic_bdfs allocate_nic_ips
} }