selftests: Move two functions from mlxsw's qos_lib to lib

The function humanize() is used for converting value in bits/s to a
human-friendly approximate value in Kbps, Mbps or Gbps. There is nothing
hardware-specific in that, so move the function to lib.sh.

Similarly for the rate() function, which just does a bit of math to
calculate a rate, given two counter values and a time interval.

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
index a5937069ac16b11f55de177c0e8bd224138eab98..faa51012cdaca05255eddf0bb4ed607145565166 100644 (file)
--- a/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh
@@ -1,29 +1,5 @@
 # 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))
-}
-
 check_rate()
 {
        local rate=$1; shift

diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 8dc5fac98cbc88d7d06aa1bb621e9288c766f921..10cdfc0adca835497e7ce0f78f7cf93370c9422b 100644 (file)
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -588,6 +588,30 @@ ethtool_stats_get()
        ethtool -S $dev | grep "^ *$stat:" | head -n 1 | cut -d: -f2
 }
 
+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))
+}
+
 mac_get()
 {
        local if_name=$1