selftests: forwarding: lib.sh: Add wait for dev with timeout

Add a function that waits for device with maximum number of iterations.
It enables to limit the waiting and prevent infinite loop.

This will be used by the subsequent patch which will set two ports to
different speeds in order to make sure they cannot negotiate a link.

Waiting for all the setup is limited with 10 minutes for each device.

Signed-off-by: Amit Cohen <amitc@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 8b48ec54d058a547a869473ed3fff6a72b29df2b..1f64e7348f6999fde2209f6ea36bb98b46add0af 100644 (file)
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -18,6 +18,8 @@ NETIF_CREATE=${NETIF_CREATE:=yes}
 MCD=${MCD:=smcrouted}
 MC_CLI=${MC_CLI:=smcroutectl}
 PING_TIMEOUT=${PING_TIMEOUT:=5}
+WAIT_TIMEOUT=${WAIT_TIMEOUT:=20}
+INTERFACE_TIMEOUT=${INTERFACE_TIMEOUT:=600}
 
 relative_path="${BASH_SOURCE%/*}"
 if [[ "$relative_path" == "${BASH_SOURCE}" ]]; then
@@ -226,24 +228,45 @@ log_info()
 setup_wait_dev()
 {
        local dev=$1; shift
+       local wait_time=${1:-$WAIT_TIME}; shift
 
-       while true; do
+       setup_wait_dev_with_timeout "$dev" $INTERFACE_TIMEOUT $wait_time
+
+       if (($?)); then
+               check_err 1
+               log_test setup_wait_dev ": Interface $dev does not come up."
+               exit 1
+       fi
+}
+
+setup_wait_dev_with_timeout()
+{
+       local dev=$1; shift
+       local max_iterations=${1:-$WAIT_TIMEOUT}; shift
+       local wait_time=${1:-$WAIT_TIME}; shift
+       local i
+
+       for ((i = 1; i <= $max_iterations; ++i)); do
                ip link show dev $dev up \
                        | grep 'state UP' &> /dev/null
                if [[ $? -ne 0 ]]; then
                        sleep 1
                else
-                       break
+                       sleep $wait_time
+                       return 0
                fi
        done
+
+       return 1
 }
 
 setup_wait()
 {
        local num_netifs=${1:-$NUM_NETIFS}
+       local i
 
        for ((i = 1; i <= num_netifs; ++i)); do
-               setup_wait_dev ${NETIFS[p$i]}
+               setup_wait_dev ${NETIFS[p$i]} 0
        done
 
        # Make sure links are ready.