From: Vladimir Oltean <vladimir.olt...@nxp.com>

Some devices do not support individual 'pmac' and 'emac' stats.
For such devices, resort to 'aggregate' stats.

Cc: Shuah Khan <sh...@kernel.org>
Signed-off-by: Vladimir Oltean <vladimir.olt...@nxp.com>
Tested-by: Roger Quadros <rog...@kernel.org>
Signed-off-by: Roger Quadros <rog...@kernel.org>
---
 tools/testing/selftests/net/forwarding/ethtool_mm.sh | 11 +++++++++++
 tools/testing/selftests/net/forwarding/lib.sh        |  9 +++++++++
 2 files changed, 20 insertions(+)

Changelog:

v9: no code change. Added Kselftest maintainer in Cc.
v8: initial commit

diff --git a/tools/testing/selftests/net/forwarding/ethtool_mm.sh 
b/tools/testing/selftests/net/forwarding/ethtool_mm.sh
index 6212913f4ad1..50d5bfb17ef1 100755
--- a/tools/testing/selftests/net/forwarding/ethtool_mm.sh
+++ b/tools/testing/selftests/net/forwarding/ethtool_mm.sh
@@ -25,6 +25,10 @@ traffic_test()
        local after=
        local delta=
 
+       if [ ${has_pmac_stats[$if]} = false ]; then
+               src="aggregate"
+       fi
+
        before=$(ethtool_std_stats_get $if "eth-mac" "FramesTransmittedOK" $src)
 
        $MZ $if -q -c $num_pkts -p 64 -b bcast -t ip -R $PREEMPTIBLE_PRIO
@@ -317,6 +321,13 @@ for netif in ${NETIFS[@]}; do
                echo "SKIP: $netif does not support MAC Merge"
                exit $ksft_skip
        fi
+
+       if check_ethtool_pmac_std_stats_support $netif eth-mac; then
+               has_pmac_stats[$netif]=true
+       else
+               has_pmac_stats[$netif]=false
+               echo "$netif does not report pMAC statistics, falling back to 
aggregate"
+       fi
 done
 
 trap cleanup EXIT
diff --git a/tools/testing/selftests/net/forwarding/lib.sh 
b/tools/testing/selftests/net/forwarding/lib.sh
index 8f6ca458af9a..763c262a3453 100755
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -146,6 +146,15 @@ check_ethtool_mm_support()
        fi
 }
 
+check_ethtool_pmac_std_stats_support()
+{
+       local dev=$1; shift
+       local grp=$1; shift
+
+       [ 0 -ne $(ethtool --json -S $dev --all-groups --src pmac 2>/dev/null \
+               | jq '.[]."$grp" | length') ]
+}
+
 check_locked_port_support()
 {
        if ! bridge -d link show | grep -q " locked"; then
-- 
2.34.1


Reply via email to