selftests: mlxsw: Add qos_lib.sh

Extract reusable code from qos_mc_aware.sh and put into a new library.

Signed-off-by: Petr Machata <petrm@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/drivers/net/mlxsw/qos_lib.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
new file mode 100644 (file)
index 0000000..e80be65
--- /dev/null
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
@@ -0,0 +1,98 @@
+# SPDX-License-Identifier: GPL-2.0
+
+humanize()
+{
+       local speed=$1; shift
+
+       for unit in bps Kbps Mbps Gbps; do
+               if (($(echo "$speed < 1024" | bc))); then
+                       break
+               fi
+
+               speed=$(echo "scale=1; $speed / 1024" | bc)
+       done
+
+       echo "$speed${unit}"
+}
+
+rate()
+{
+       local t0=$1; shift
+       local t1=$1; shift
+       local interval=$1; shift
+
+       echo $((8 * (t1 - t0) / interval))
+}
+
+start_traffic()
+{
+       local h_in=$1; shift    # Where the traffic egresses the host
+       local sip=$1; shift
+       local dip=$1; shift
+       local dmac=$1; shift
+
+       $MZ $h_in -p 8000 -A $sip -B $dip -c 0 \
+               -a own -b $dmac -t udp -q &
+       sleep 1
+}
+
+stop_traffic()
+{
+       # Suppress noise from killing mausezahn.
+       { kill %% && wait %%; } 2>/dev/null
+}
+
+check_rate()
+{
+       local rate=$1; shift
+       local min=$1; shift
+       local what=$1; shift
+
+       if ((rate > min)); then
+               return 0
+       fi
+
+       echo "$what $(humanize $ir) < $(humanize $min)" > /dev/stderr
+       return 1
+}
+
+measure_rate()
+{
+       local sw_in=$1; shift   # Where the traffic ingresses the switch
+       local host_in=$1; shift # Where it ingresses another host
+       local counter=$1; shift # Counter to use for measurement
+       local what=$1; shift
+
+       local interval=10
+       local i
+       local ret=0
+
+       # Dips in performance might cause momentary ingress rate to drop below
+       # 1Gbps. That wouldn't saturate egress and MC would thus get through,
+       # seemingly winning bandwidth on account of UC. Demand at least 2Gbps
+       # average ingress rate to somewhat mitigate this.
+       local min_ingress=2147483648
+
+       for i in {5..0}; do
+               local t0=$(ethtool_stats_get $host_in $counter)
+               local u0=$(ethtool_stats_get $sw_in $counter)
+               sleep $interval
+               local t1=$(ethtool_stats_get $host_in $counter)
+               local u1=$(ethtool_stats_get $sw_in $counter)
+
+               local ir=$(rate $u0 $u1 $interval)
+               local er=$(rate $t0 $t1 $interval)
+
+               if check_rate $ir $min_ingress "$what ingress rate"; then
+                       break
+               fi
+
+               # Fail the test if we can't get the throughput.
+               if ((i == 0)); then
+                       ret=1
+               fi
+       done
+
+       echo $ir $er
+       return $ret
+}

diff --git a/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh b/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh
index 2e17fe3b4872ea6aa3d25e51c1091e3d632ab6b3..71231ad2dbfb5d2d4c3082a6669578dab59fcaef 100755 (executable)
--- a/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh
@@ -68,6 +68,7 @@ lib_dir=$(dirname $0)/../../../net/forwarding
 NUM_NETIFS=6
 source $lib_dir/lib.sh
 source $lib_dir/devlink_lib.sh
+source qos_lib.sh
 
 h1_create()
 {
@@ -220,107 +221,28 @@ ping_ipv4()
        ping_test $h2 192.0.2.130
 }
 
-humanize()
-{
-       local speed=$1; shift
-
-       for unit in bps Kbps Mbps Gbps; do
-               if (($(echo "$speed < 1024" | bc))); then
-                       break
-               fi
-
-               speed=$(echo "scale=1; $speed / 1024" | bc)
-       done
-
-       echo "$speed${unit}"
-}
-
-rate()
-{
-       local t0=$1; shift
-       local t1=$1; shift
-       local interval=$1; shift
-
-       echo $((8 * (t1 - t0) / interval))
-}
-
-check_rate()
-{
-       local rate=$1; shift
-       local min=$1; shift
-       local what=$1; shift
-
-       if ((rate > min)); then
-               return 0
-       fi
-
-       echo "$what $(humanize $ir) < $(humanize $min_ingress)" > /dev/stderr
-       return 1
-}
-
-measure_uc_rate()
-{
-       local what=$1; shift
-
-       local interval=10
-       local i
-       local ret=0
-
-       # Dips in performance might cause momentary ingress rate to drop below
-       # 1Gbps. That wouldn't saturate egress and MC would thus get through,
-       # seemingly winning bandwidth on account of UC. Demand at least 2Gbps
-       # average ingress rate to somewhat mitigate this.
-       local min_ingress=2147483648
-
-       $MZ $h2.111 -p 8000 -A 192.0.2.129 -B 192.0.2.130 -c 0 \
-               -a own -b $h3mac -t udp -q &
-       sleep 1
-
-       for i in {5..0}; do
-               local t0=$(ethtool_stats_get $h3 rx_octets_prio_1)
-               local u0=$(ethtool_stats_get $swp2 rx_octets_prio_1)
-               sleep $interval
-               local t1=$(ethtool_stats_get $h3 rx_octets_prio_1)
-               local u1=$(ethtool_stats_get $swp2 rx_octets_prio_1)
-
-               local ir=$(rate $u0 $u1 $interval)
-               local er=$(rate $t0 $t1 $interval)
-
-               if check_rate $ir $min_ingress "$what ingress rate"; then
-                       break
-               fi
-
-               # Fail the test if we can't get the throughput.
-               if ((i == 0)); then
-                       ret=1
-               fi
-       done
-
-       # Suppress noise from killing mausezahn.
-       { kill %% && wait; } 2>/dev/null
-
-       echo $ir $er
-       exit $ret
-}
-
 test_mc_aware()
 {
        RET=0
 
        local -a uc_rate
-       uc_rate=($(measure_uc_rate "UC-only"))
+       start_traffic $h2.111 192.0.2.129 192.0.2.130 $h3mac
+       uc_rate=($(measure_rate $swp2 $h3 rx_octets_prio_1 "UC-only"))
        check_err $? "Could not get high enough UC-only ingress rate"
+       stop_traffic
        local ucth1=${uc_rate[1]}
 
-       $MZ $h1 -p 8000 -c 0 -a own -b bc -t udp -q &
+       start_traffic $h1 own bc bc
 
        local d0=$(date +%s)
        local t0=$(ethtool_stats_get $h3 rx_octets_prio_0)
        local u0=$(ethtool_stats_get $swp1 rx_octets_prio_0)
 
        local -a uc_rate_2
-       uc_rate_2=($(measure_uc_rate "UC+MC"))
+       start_traffic $h2.111 192.0.2.129 192.0.2.130 $h3mac
+       uc_rate_2=($(measure_rate $swp2 $h3 rx_octets_prio_1 "UC+MC"))
        check_err $? "Could not get high enough UC+MC ingress rate"
+       stop_traffic
        local ucth2=${uc_rate_2[1]}
 
        local d1=$(date +%s)
@@ -338,8 +260,7 @@ test_mc_aware()
        local mc_ir=$(rate $u0 $u1 $interval)
        local mc_er=$(rate $t0 $t1 $interval)
 
-       # Suppress noise from killing mausezahn.
-       { kill %% && wait; } 2>/dev/null
+       stop_traffic
 
        log_test "UC performace under MC overload"
 
@@ -363,8 +284,7 @@ test_uc_aware()
 {
        RET=0
 
-       $MZ $h2.111 -p 8000 -A 192.0.2.129 -B 192.0.2.130 -c 0 \
-               -a own -b $h3mac -t udp -q &
+       start_traffic $h2.111 192.0.2.129 192.0.2.130 $h3mac
 
        local d0=$(date +%s)
        local t0=$(ethtool_stats_get $h3 rx_octets_prio_1)
@@ -394,8 +314,7 @@ test_uc_aware()
        ((attempts == passes))
        check_err $?
 
-       # Suppress noise from killing mausezahn.
-       { kill %% && wait; } 2>/dev/null
+       stop_traffic
 
        log_test "MC performace under UC overload"
        echo "    ingress UC throughput $(humanize ${uc_ir})"