-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tobias Waldekranz says: ==================== net: dsa: mv88e6xxx: Add "eth-mac" and "rmon" counter group support The majority of the changes (2/8) are about refactoring the existing ethtool statistics support to make it possible to read individual counters, rather than the whole set. 4/8 tries to collect all information about a stat in a single place using a mapper macro, which is then used to generate the original list of stats, along with a matching enum. checkpatch is less than amused with this construct, but prior art exists (__BPF_FUNC_MAPPER in include/uapi/linux/bpf.h, for example). To support the histogram counters from the "rmon" group, we have to change mv88e6xxx's configuration of them. Instead of counting rx and tx, we restrict them to rx-only. 6/8 has the details. With that in place, adding the actual counter groups is pretty straight forward (5,7/8). Tie it all together with a selftest (8/8). v3 -> v4: - Return size_t from mv88e6xxx_stats_get_stats - Spelling errors in commit message of 6/8 - Improve selftest: - Report progress per-bucket - Test both ports in the pair - Increase MTU, if required v2 -> v3: - Added 6/8 - Added 8/8 v1 -> v2: - Added 1/6 - Added 3/6 - Changed prototype of stats operation to reflect the fact that the number of read stats are returned, no errors - Moved comma into MV88E6XXX_HW_STAT_MAPPER definition - Avoid the construction of mapping table iteration which relied on struct layouts outside of mv88e6xxx's control ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
- Loading branch information
Showing
8 changed files
with
435 additions
and
166 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| #!/bin/bash | ||
| # SPDX-License-Identifier: GPL-2.0 | ||
|
|
||
| ALL_TESTS=" | ||
| rmon_rx_histogram | ||
| rmon_tx_histogram | ||
| " | ||
|
|
||
| NUM_NETIFS=2 | ||
| source lib.sh | ||
|
|
||
| ETH_FCS_LEN=4 | ||
| ETH_HLEN=$((6+6+2)) | ||
|
|
||
| declare -A netif_mtu | ||
|
|
||
| ensure_mtu() | ||
| { | ||
| local iface=$1; shift | ||
| local len=$1; shift | ||
| local current=$(ip -j link show dev $iface | jq -r '.[0].mtu') | ||
| local required=$((len - ETH_HLEN - ETH_FCS_LEN)) | ||
|
|
||
| if [ $current -lt $required ]; then | ||
| ip link set dev $iface mtu $required || return 1 | ||
| fi | ||
| } | ||
|
|
||
| bucket_test() | ||
| { | ||
| local iface=$1; shift | ||
| local neigh=$1; shift | ||
| local set=$1; shift | ||
| local bucket=$1; shift | ||
| local len=$1; shift | ||
| local num_rx=10000 | ||
| local num_tx=20000 | ||
| local expected= | ||
| local before= | ||
| local after= | ||
| local delta= | ||
|
|
||
| # Mausezahn does not include FCS bytes in its length - but the | ||
| # histogram counters do | ||
| len=$((len - ETH_FCS_LEN)) | ||
|
|
||
| before=$(ethtool --json -S $iface --groups rmon | \ | ||
| jq -r ".[0].rmon[\"${set}-pktsNtoM\"][$bucket].val") | ||
|
|
||
| # Send 10k one way and 20k in the other, to detect counters | ||
| # mapped to the wrong direction | ||
| $MZ $neigh -q -c $num_rx -p $len -a own -b bcast -d 10us | ||
| $MZ $iface -q -c $num_tx -p $len -a own -b bcast -d 10us | ||
|
|
||
| after=$(ethtool --json -S $iface --groups rmon | \ | ||
| jq -r ".[0].rmon[\"${set}-pktsNtoM\"][$bucket].val") | ||
|
|
||
| delta=$((after - before)) | ||
|
|
||
| expected=$([ $set = rx ] && echo $num_rx || echo $num_tx) | ||
|
|
||
| # Allow some extra tolerance for other packets sent by the stack | ||
| [ $delta -ge $expected ] && [ $delta -le $((expected + 100)) ] | ||
| } | ||
|
|
||
| rmon_histogram() | ||
| { | ||
| local iface=$1; shift | ||
| local neigh=$1; shift | ||
| local set=$1; shift | ||
| local nbuckets=0 | ||
| local step= | ||
|
|
||
| RET=0 | ||
|
|
||
| while read -r -a bucket; do | ||
| step="$set-pkts${bucket[0]}to${bucket[1]} on $iface" | ||
|
|
||
| for if in $iface $neigh; do | ||
| if ! ensure_mtu $if ${bucket[0]}; then | ||
| log_test_skip "$if does not support the required MTU for $step" | ||
| return | ||
| fi | ||
| done | ||
|
|
||
| if ! bucket_test $iface $neigh $set $nbuckets ${bucket[0]}; then | ||
| check_err 1 "$step failed" | ||
| return 1 | ||
| fi | ||
| log_test "$step" | ||
| nbuckets=$((nbuckets + 1)) | ||
| done < <(ethtool --json -S $iface --groups rmon | \ | ||
| jq -r ".[0].rmon[\"${set}-pktsNtoM\"][]|[.low, .high]|@tsv" 2>/dev/null) | ||
|
|
||
| if [ $nbuckets -eq 0 ]; then | ||
| log_test_skip "$iface does not support $set histogram counters" | ||
| return | ||
| fi | ||
| } | ||
|
|
||
| rmon_rx_histogram() | ||
| { | ||
| rmon_histogram $h1 $h2 rx | ||
| rmon_histogram $h2 $h1 rx | ||
| } | ||
|
|
||
| rmon_tx_histogram() | ||
| { | ||
| rmon_histogram $h1 $h2 tx | ||
| rmon_histogram $h2 $h1 tx | ||
| } | ||
|
|
||
| setup_prepare() | ||
| { | ||
| h1=${NETIFS[p1]} | ||
| h2=${NETIFS[p2]} | ||
|
|
||
| for iface in $h1 $h2; do | ||
| netif_mtu[$iface]=$(ip -j link show dev $iface | jq -r '.[0].mtu') | ||
| ip link set dev $iface up | ||
| done | ||
| } | ||
|
|
||
| cleanup() | ||
| { | ||
| pre_cleanup | ||
|
|
||
| for iface in $h2 $h1; do | ||
| ip link set dev $iface \ | ||
| mtu ${netif_mtu[$iface]} \ | ||
| down | ||
| done | ||
| } | ||
|
|
||
| check_ethtool_counter_group_support | ||
| trap cleanup EXIT | ||
|
|
||
| setup_prepare | ||
| setup_wait | ||
|
|
||
| tests_run | ||
|
|
||
| exit $EXIT_STATUS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters