ethtool: add pause frame stats
Subsystems (13)
Jakub Kicinski
maintainerv3 cover ethtool: add pause frame stats
Hi!
This is the first (small) series which exposes some stats via the corresponding ethtool interface. Here (thanks to the excitability of netlink) we expose pause frame stats via the same interfaces as ethtool -a / -A.
In particular the following stats from the standard:
- 30.3.4.2 aPAUSEMACCtrlFramesTransmitted
- 30.3.4.3 aPAUSEMACCtrlFramesReceived
4 real drivers are converted, I believe we got confirmation from maintainers that all exposed stats match the standard.
v3:
- fix mlx5 build
- adjust the init logic in patch 1
v2:
- netdevsim: add missing static
- bnxt: fix sparse warning
- mlx5: address Saeed's comments
Jakub Kicinski (8):
ethtool: add standard pause stats
docs: net: include the new ethtool pause stats in the stats doc
netdevsim: add pause frame stats
selftests: add a test for ethtool pause stats
bnxt: add pause frame stats
ixgbe: add pause frame stats
mlx5: add pause frame stats
mlx4: add pause frame stats
Documentation/networking/ethtool-netlink.rst | 11 ++ Documentation/networking/statistics.rst | 57 ++++++++- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 17 +++ .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 11 ++ .../net/ethernet/mellanox/mlx4/en_ethtool.c | 19 +++ .../net/ethernet/mellanox/mlx4/mlx4_stats.h | 12 ++ .../ethernet/mellanox/mlx5/core/en_ethtool.c | 9 ++ .../net/ethernet/mellanox/mlx5/core/en_rep.c | 9 ++ .../ethernet/mellanox/mlx5/core/en_stats.c | 29 +++++ .../ethernet/mellanox/mlx5/core/en_stats.h | 3 + drivers/net/netdevsim/Makefile | 2 +- drivers/net/netdevsim/ethtool.c | 64 +++++++++++ drivers/net/netdevsim/netdev.c | 1 + drivers/net/netdevsim/netdevsim.h | 11 ++ include/linux/ethtool.h | 26 +++++ include/uapi/linux/ethtool_netlink.h | 18 ++- net/ethtool/pause.c | 63 +++++++++- .../drivers/net/netdevsim/ethtool-pause.sh | 108 ++++++++++++++++++ 18 files changed, 462 insertions(+), 8 deletions(-) create mode 100644 drivers/net/netdevsim/ethtool.c create mode 100755 tools/testing/selftests/drivers/net/netdevsim/ethtool-pause.sh
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v3 1/8 ethtool: add standard pause stats
Currently drivers have to report their pause frames statistics via ethtool -S, and there is a wide variety of names used for these statistics.
Add the two statistics defined in IEEE 802.3x to the standard API. Create a new ethtool request header flag for including statistics in the response to GET commands.
Always create the ETHTOOL_A_PAUSE_STATS nest in replies when flag is set. Testing if driver declares the op is not a reliable way of checking if any stats will actually be included and therefore we don't want to give the impression that presence of ETHTOOL_A_PAUSE_STATS indicates driver support.
Note that this patch does not include PFC counters, which may fit better in dcbnl? But mostly I don't need them/have a setup to test them so I haven't looked deeply into exposing them :)
v3:
- add a helper for "uninitializing" stats, rather than a cryptic memset() (Andrew)
--- Documentation/networking/ethtool-netlink.rst | 11 ++++ include/linux/ethtool.h | 26 ++++++++ include/uapi/linux/ethtool_netlink.h | 18 +++++- net/ethtool/pause.c | 63 +++++++++++++++++++- 4 files changed, 116 insertions(+), 2 deletions(-)
Documentation/networking/ethtool-netlink.rst +11 -0
@@ -68,6 +68,7 @@ types. The interpretation of these flags is the same for all request types but ================================= =================================== ``ETHTOOL_FLAG_COMPACT_BITSETS`` use compact format bitsets in reply ``ETHTOOL_FLAG_OMIT_REPLY`` omit optional reply (_SET and _ACT) + ``ETHTOOL_FLAG_STATS`` include optional device statistics ================================= =================================== New request flags should follow the general idea that if the flag is not set,
@@ -989,8 +990,18 @@ Gets channel counts like ``ETHTOOL_GPAUSE`` ioctl request. ``ETHTOOL_A_PAUSE_AUTONEG`` bool pause autonegotiation ``ETHTOOL_A_PAUSE_RX`` bool receive pause frames ``ETHTOOL_A_PAUSE_TX`` bool transmit pause frames + ``ETHTOOL_A_PAUSE_STATS`` nested pause statistics ===================================== ====== ========================== +``ETHTOOL_A_PAUSE_STATS`` are reported if ``ETHTOOL_FLAG_STATS`` was set +in ``ETHTOOL_A_HEADER_FLAGS``. +It will be empty if driver did not report any statistics. Drivers fill in +the statistics in the following structure: + +.. kernel-doc:: include/linux/ethtool.h + :identifiers: ethtool_pause_stats + +Each member has a corresponding attribute defined. PAUSE_SET ============
include/linux/ethtool.h +26 -0
@@ -241,6 +241,27 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32, ETHTOOL_COALESCE_PKT_RATE_LOW | ETHTOOL_COALESCE_PKT_RATE_HIGH | \ ETHTOOL_COALESCE_RATE_SAMPLE_INTERVAL) +#define ETHTOOL_STAT_NOT_SET (~0ULL) + +/** +* struct ethtool_pause_stats - statistics for IEEE 802.3x pause frames +* @tx_pause_frames: transmitted pause frame count. Reported to user space +* as %ETHTOOL_A_PAUSE_STAT_TX_FRAMES. +* +* Equivalent to `30.3.4.2 aPAUSEMACCtrlFramesTransmitted` +* from the standard. +* +* @rx_pause_frames: received pause frame count. Reported to user space +* as %ETHTOOL_A_PAUSE_STAT_RX_FRAMES. Equivalent to: +* +* Equivalent to `30.3.4.3 aPAUSEMACCtrlFramesReceived` +* from the standard. +*/ +struct ethtool_pause_stats { +u64 tx_pause_frames; +u64 rx_pause_frames; +}; +/** * struct ethtool_ops - optional netdev operations * @supported_coalesce_params: supported types of interrupt coalescing.
@@ -282,6 +303,9 @@ bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,* Returns a negative error code or zero. * @get_ringparam: Report ring sizes * @set_ringparam: Set ring sizes. Returns a negative error code or zero. +* @get_pause_stats: Report pause frame statistics. Drivers must not zero +* statistics which they don't report. The stats structure is initialized +* to ETHTOOL_STAT_NOT_SET indicating driver does not report statistics. * @get_pauseparam: Report pause parameters * @set_pauseparam: Set pause parameters. Returns a negative error code * or zero.
@@ -418,6 +442,8 @@ struct ethtool_ops { struct ethtool_ringparam *);int (*set_ringparam)(struct net_device *,struct ethtool_ringparam *); +void (*get_pause_stats)(struct net_device *dev, +struct ethtool_pause_stats *pause_stats);void (*get_pauseparam)(struct net_device *,struct ethtool_pauseparam *); int (*set_pauseparam)(struct net_device *,
include/uapi/linux/ethtool_netlink.h +17 -1
@@ -91,9 +91,12 @@ enum {#define ETHTOOL_FLAG_COMPACT_BITSETS (1 << 0)/* provide optional reply for SET or ACT requests */ #define ETHTOOL_FLAG_OMIT_REPLY (1 << 1) +/* request statistics, if supported by the driver */ +#define ETHTOOL_FLAG_STATS (1 << 2)#define ETHTOOL_FLAG_ALL (ETHTOOL_FLAG_COMPACT_BITSETS | \ - ETHTOOL_FLAG_OMIT_REPLY) + ETHTOOL_FLAG_OMIT_REPLY | \ + ETHTOOL_FLAG_STATS)enum {ETHTOOL_A_HEADER_UNSPEC ,
@@ -376,12 +379,25 @@ enum {ETHTOOL_A_PAUSE_AUTONEG ,/* u8 */ ETHTOOL_A_PAUSE_RX ,/* u8 */ ETHTOOL_A_PAUSE_TX ,/* u8 */ +ETHTOOL_A_PAUSE_STATS ,/* nest - _PAUSE_STAT_* */ /* add new constants above here */ __ETHTOOL_A_PAUSE_CNT,ETHTOOL_A_PAUSE_MAX = (__ETHTOOL_A_PAUSE_CNT -1 ) }; +enum { +ETHTOOL_A_PAUSE_STAT_UNSPEC , +ETHTOOL_A_PAUSE_STAT_PAD , + +ETHTOOL_A_PAUSE_STAT_TX_FRAMES , +ETHTOOL_A_PAUSE_STAT_RX_FRAMES , + +/* add new constants above here */ + __ETHTOOL_A_PAUSE_STAT_CNT, +ETHTOOL_A_PAUSE_STAT_MAX = (__ETHTOOL_A_PAUSE_STAT_CNT -1 ) +}; +/* EEE */ enum {
net/ethtool/pause.c +62 -1
107 lines not on this page · raw message
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v3 2/8 docs: net: include the new ethtool pause stats in the stats doc
In reply to Jakub KicinskiTell people that there now is an interface for querying pause frames. A little bit of restructuring is needed given this is a first source of such statistics.
--- Documentation/networking/statistics.rst | 57 ++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-)
Documentation/networking/statistics.rst +52 -5
@@ -4,16 +4,23 @@ Interface statistics ==================== +Overview +======== + This document is a guide to Linux network interface statistics. -There are two main sources of interface statistics in Linux: +There are three main sources of interface statistics in Linux: - standard interface statistics based on - :c:type:`struct rtnl_link_stats64 <rtnl_link_stats64>`; and + :c:type:`struct rtnl_link_stats64 <rtnl_link_stats64>`; + - protocol-specific statistics; and - driver-defined statistics available via ethtool. -There are multiple interfaces to reach the former. Most commonly used -is the `ip` command from `iproute2`:: +Standard interface statistics +----------------------------- + +There are multiple interfaces to reach the standard statistics. +Most commonly used is the `ip` command from `iproute2`:: $ ip -s -s link show dev ens4u1u1 6: ens4u1u1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel state UP mode DEFAULT group default qlen 1000
@@ -34,7 +41,26 @@ If `-s` is specified once the detailed errors won't be shown. `ip` supports JSON formatting via the `-j` option. -Ethtool statistics can be dumped using `ethtool -S $ifc`, e.g.:: +Protocol-specific statistics +---------------------------- + +Some of the interfaces used for configuring devices are also able +to report related statistics. For example ethtool interface used +to configure pause frames can report corresponding hardware counters:: + + $ ethtool --include-statistics -a eth0 + Pause parameters for eth0: + Autonegotiate: on + RX: on + TX: on + Statistics: + tx_pause_frames: 1 + rx_pause_frames: 1 + +Driver-defined statistics +------------------------- + +Driver-defined ethtool statistics can be dumped using `ethtool -S $ifc`, e.g.:: $ ethtool -S ens4u1u1 NIC statistics:
@@ -94,6 +120,17 @@ Identifiers via `ETHTOOL_GSTRINGS` with `string_set` set to `ETH_SS_STATS`, and values via `ETHTOOL_GSTATS`. User space should use `ETHTOOL_GDRVINFO` to retrieve the number of statistics (`.n_stats`). +ethtool-netlink +--------------- + +Ethtool netlink is a replacement for the older IOCTL interface. + +Protocol-related statistics can be requested in get commands by setting +the `ETHTOOL_FLAG_STATS` flag in `ETHTOOL_A_HEADER_FLAGS`. Currently +statistics are supported in the following commands: + + - `ETHTOOL_MSG_PAUSE_GET` + debugfs -------
@@ -130,3 +167,13 @@ user space trying to read them. Statistics must persist across routine operations like bringing the interface down and up. + +Kernel-internal data structures +------------------------------- + +The following structures are internal to the kernel, their members are +translated to netlink attributes when dumped. Drivers must not overwrite +the statistics they don't report with 0. + +.. kernel-doc:: include/linux/ethtool.h + :identifiers: ethtool_pause_stats
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v3 3/8 netdevsim: add pause frame stats
In reply to Jakub KicinskiAdd minimal ethtool interface for testing ethtool pause stats.
v2: add missing static on nsim_ethtool_ops
--- drivers/net/netdevsim/Makefile | 2 +- drivers/net/netdevsim/ethtool.c | 64 +++++++++++++++++++++++++++++++ drivers/net/netdevsim/netdev.c | 1 + drivers/net/netdevsim/netdevsim.h | 11 ++++++ 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 drivers/net/netdevsim/ethtool.c
drivers/net/netdevsim/Makefile +1 -1
@@ -3,7 +3,7 @@ obj-$(CONFIG_NETDEVSIM) += netdevsim.o netdevsim-objs := \ - netdev.o dev.o fib.o bus.o health.o udp_tunnels.o + netdev.o dev.o ethtool.o fib.o bus.o health.o udp_tunnels.o ifeq ($(CONFIG_BPF_SYSCALL),y) netdevsim-objs += \
drivers/net/netdevsim/ethtool.c new file +64 -0
64 lines not on this page · raw message
drivers/net/netdevsim/netdev.c +1 -0
@@ -301,6 +301,7 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) ns->nsim_bus_dev = nsim_dev->nsim_bus_dev;SET_NETDEV_DEV (dev, &ns->nsim_bus_dev->dev); dev->netdev_ops = &nsim_netdev_ops; +nsim_ethtool_init (ns); err =nsim_udp_tunnels_info_create (nsim_dev, dev);if (err)
drivers/net/netdevsim/netdevsim.h +11 -0
@@ -50,6 +50,13 @@ struct nsim_ipsec {u32 ok; }; +struct nsim_ethtool { +bool rx; +bool tx; +bool report_stats_rx; +bool report_stats_tx; +}; +struct netdevsim {struct net_device *netdev;struct nsim_dev *nsim_dev;
@@ -80,12 +87,16 @@ struct netdevsim {u32 ports[2 ][NSIM_UDP_TUNNEL_N_PORTS ];struct debugfs_u32_array dfs_ports[2 ]; } udp_ports; + +struct nsim_ethtool ethtool; };struct netdevsim *nsim_create (struct nsim_dev *nsim_dev,struct nsim_dev_port *nsim_dev_port);void nsim_destroy (struct netdevsim *ns); +void nsim_ethtool_init (struct netdevsim *ns); +void nsim_udp_tunnels_debugfs_create (struct nsim_dev *nsim_dev);int nsim_udp_tunnels_info_create (struct nsim_dev *nsim_dev,struct net_device *dev);
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v3 4/8 selftests: add a test for ethtool pause stats
In reply to Jakub KicinskiMake sure the empty nest is reported even without stats. Make sure reporting only selected stats works fine.
--- .../drivers/net/netdevsim/ethtool-pause.sh | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100755 tools/testing/selftests/drivers/net/netdevsim/ethtool-pause.sh
tools/testing/selftests/drivers/net/netdevsim/ethtool-pause.sh new file +108 -0
@@ -0,0 +1,108 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0-only + +NSIM_ID=$((RANDOM % 1024)) +NSIM_DEV_SYS=/sys/bus/netdevsim/devices/netdevsim$NSIM_ID +NSIM_DEV_DFS=/sys/kernel/debug/netdevsim/netdevsim$NSIM_ID +NSIM_NETDEV= +num_passes=0 +num_errors=0 + +function cleanup_nsim { + if [ -e $NSIM_DEV_SYS ]; then + echo $NSIM_ID > /sys/bus/netdevsim/del_device + fi +} + +function cleanup { + cleanup_nsim +} + +trap cleanup EXIT + +function get_netdev_name { + local -n old=$1 + + new=$(ls /sys/class/net) + + for netdev in $new; do + for check in $old; do + [ $netdev == $check ] && break + done + + if [ $netdev != $check ]; then + echo $netdev + break + fi + done +} + +function check { + local code=$1 + local str=$2 + local exp_str=$3 + + if [ $code -ne 0 ]; then + ((num_errors++)) + return + fi + + if [ "$str" != "$exp_str" ]; then + echo -e "Expected: '$exp_str', got '$str'" + ((num_errors++)) + return + fi + + ((num_passes++)) +} + +# Bail if ethtool is too old +if ! ethtool -h | grep include-stat 2>&1 >/dev/null; then + echo "SKIP: No --include-statistics support in ethtool" + exit 4 +fi + +# Make a netdevsim +old_netdevs=$(ls /sys/class/net) + +modprobe netdevsim +echo $NSIM_ID > /sys/bus/netdevsim/new_device + +NSIM_NETDEV=`get_netdev_name old_netdevs` + +set -o pipefail + +echo n > $NSIM_DEV_DFS/ethtool/pause/report_stats_tx +echo n > $NSIM_DEV_DFS/ethtool/pause/report_stats_rx + +s=$(ethtool --json -a $NSIM_NETDEV | jq '.[].statistics') +check $? "$s" "null" + +s=$(ethtool -I --json -a $NSIM_NETDEV | jq '.[].statistics') +check $? "$s" "{}" + +echo y > $NSIM_DEV_DFS/ethtool/pause/report_stats_tx + +s=$(ethtool -I --json -a $NSIM_NETDEV | jq '.[].statistics | length') +check $? "$s" "1" + +s=$(ethtool -I --json -a $NSIM_NETDEV | jq '.[].statistics.tx_pause_frames') +check $? "$s" "2" + +echo y > $NSIM_DEV_DFS/ethtool/pause/report_stats_rx + +s=$(ethtool -I --json -a $NSIM_NETDEV | jq '.[].statistics | length') +check $? "$s" "2" + +s=$(ethtool -I --json -a $NSIM_NETDEV | jq '.[].statistics.rx_pause_frames') +check $? "$s" "1" +s=$(ethtool -I --json -a $NSIM_NETDEV | jq '.[].statistics.tx_pause_frames') +check $? "$s" "2" + +if [ $num_errors -eq 0 ]; then + echo "PASSED all $((num_passes)) checks" + exit 0 +else + echo "FAILED $num_errors/$((num_errors+num_passes)) checks" + exit 1 +fi
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v3 5/8 bnxt: add pause frame stats
In reply to Jakub KicinskiThese stats are already reported in ethtool -S. Michael confirms they are equivalent to standard stats.
v2: - fix sparse warning about endian by using the macro
- use u64 for pointer type
--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +17 -0
@@ -1778,6 +1778,22 @@ static void bnxt_get_pauseparam(struct net_device *dev, epause->tx_pause = !!(link_info->req_flow_ctrl &BNXT_LINK_PAUSE_TX ); } +static void bnxt_get_pause_stats (struct net_device *dev, +struct ethtool_pause_stats *epstat) +{ +struct bnxt *bp =netdev_priv (dev); +u64 *rx, *tx; + +if (BNXT_VF (bp) || !(bp->flags &BNXT_FLAG_PORT_STATS )) +return ; + + rx = bp->port_stats.sw_stats; + tx = bp->port_stats.sw_stats +BNXT_TX_PORT_STATS_BYTE_OFFSET /8 ; + + epstat->rx_pause_frames =BNXT_GET_RX_PORT_STATS64 (rx, rx_pause_frames); + epstat->tx_pause_frames =BNXT_GET_TX_PORT_STATS64 (tx, tx_pause_frames); +} +static int bnxt_set_pauseparam (struct net_device *dev,struct ethtool_pauseparam *epause) {
@@ -3645,6 +3661,7 @@ const struct ethtool_ops bnxt_ethtool_ops = { ETHTOOL_COALESCE_USE_ADAPTIVE_RX, .get_link_ksettings = bnxt_get_link_ksettings, .set_link_ksettings = bnxt_set_link_ksettings, + .get_pause_stats = bnxt_get_pause_stats, .get_pauseparam = bnxt_get_pauseparam, .set_pauseparam = bnxt_set_pauseparam, .get_drvinfo = bnxt_get_drvinfo,
Signature · 1 line
2.26.2
Re: [PATCH net-next v3 5/8] bnxt: add pause frame stats
Quoted 9 lines · Jakub Kicinski
These stats are already reported in ethtool -S. Michael confirms they are equivalent to standard stats.
v2: - fix sparse warning about endian by using the macro
- use u64 for pointer typeSigned-off-by Jakub Kicinski <[email protected]>Reviewed-by Saeed Mahameed <[email protected]>
Thanks.
Jakub Kicinski
maintainerPATCH v3 6/8 ixgbe: add pause frame stats
In reply to Jakub KicinskiReport standard pause frame stats. They are already aggregated in struct ixgbe_hw_stats.
The combination of the registers is suggested as equivalent to PAUSEMACCtrlFramesTransmitted / PAUSEMACCtrlFramesReceived by the Intel 82576EB datasheet, I could not find any information in the HW actually supported by ixgbe.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +11 -0
@@ -531,6 +531,16 @@ static int ixgbe_set_link_ksettings(struct net_device *netdev,return err; } +static void ixgbe_get_pause_stats (struct net_device *netdev, +struct ethtool_pause_stats *stats) +{ +struct ixgbe_adapter *adapter =netdev_priv (netdev); +struct ixgbe_hw_stats *hwstats = &adapter->stats; + + stats->tx_pause_frames = hwstats->lxontxc + hwstats->lxofftxc; + stats->rx_pause_frames = hwstats->lxonrxc + hwstats->lxoffrxc; +} +static void ixgbe_get_pauseparam (struct net_device *netdev,struct ethtool_pauseparam *pause) {
@@ -3546,6 +3556,7 @@ static const struct ethtool_ops ixgbe_ethtool_ops = { .set_eeprom = ixgbe_set_eeprom, .get_ringparam = ixgbe_get_ringparam, .set_ringparam = ixgbe_set_ringparam, + .get_pause_stats = ixgbe_get_pause_stats, .get_pauseparam = ixgbe_get_pauseparam, .set_pauseparam = ixgbe_set_pauseparam, .get_msglevel = ixgbe_get_msglevel,
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v3 7/8 mlx5: add pause frame stats
In reply to Jakub KicinskiPlumb through all the indirection and copy some code from ethtool -S. The names of the group indicate that these are the stats we are after (and Saeed confirms it).
v3:
- fix build in mlx5_rep
v2:
- drop the ethool helper and call stats directly
- don't pass 0 as initialized to in buffer
- use local buffer
--- .../ethernet/mellanox/mlx5/core/en_ethtool.c | 9 ++++++ .../net/ethernet/mellanox/mlx5/core/en_rep.c | 9 ++++++ .../ethernet/mellanox/mlx5/core/en_stats.c | 29 +++++++++++++++++++ .../ethernet/mellanox/mlx5/core/en_stats.h | 3 ++ 4 files changed, 50 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +9 -0
@@ -1341,6 +1341,14 @@ static int mlx5e_set_tunable(struct net_device *dev,return err; } +static void mlx5e_get_pause_stats (struct net_device *netdev, +struct ethtool_pause_stats *pause_stats) +{ +struct mlx5e_priv *priv =netdev_priv (netdev); + +mlx5e_stats_pause_get (priv, pause_stats); +} +void mlx5e_ethtool_get_pauseparam (struct mlx5e_priv *priv,struct ethtool_pauseparam *pauseparam) {
@@ -2033,6 +2041,7 @@ const struct ethtool_ops mlx5e_ethtool_ops = { .set_rxnfc = mlx5e_set_rxnfc, .get_tunable = mlx5e_get_tunable, .set_tunable = mlx5e_set_tunable, + .get_pause_stats = mlx5e_get_pause_stats, .get_pauseparam = mlx5e_get_pauseparam, .set_pauseparam = mlx5e_set_pauseparam, .get_ts_info = mlx5e_get_ts_info,
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +9 -0
@@ -288,6 +288,14 @@ static u32 mlx5e_rep_get_rxfh_indir_size(struct net_device *netdev)return mlx5e_ethtool_get_rxfh_indir_size (priv); } +static void mlx5e_uplink_rep_get_pause_stats (struct net_device *netdev, +struct ethtool_pause_stats *stats) +{ +struct mlx5e_priv *priv =netdev_priv (netdev); + +mlx5e_stats_pause_get (priv, stats); +} +static void mlx5e_uplink_rep_get_pauseparam (struct net_device *netdev,struct ethtool_pauseparam *pauseparam) {
@@ -362,6 +370,7 @@ static const struct ethtool_ops mlx5e_uplink_rep_ethtool_ops = { .set_rxfh = mlx5e_set_rxfh, .get_rxnfc = mlx5e_get_rxnfc, .set_rxnfc = mlx5e_set_rxnfc, + .get_pause_stats = mlx5e_uplink_rep_get_pause_stats, .get_pauseparam = mlx5e_uplink_rep_get_pauseparam, .set_pauseparam = mlx5e_uplink_rep_set_pauseparam, };
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +29 -0
@@ -677,6 +677,35 @@ static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(802_3)mlx5_core_access_reg (mdev, in, sz, out, sz,MLX5_REG_PPCNT ,0 ,0 ); } +#define MLX5E_READ_CTR64_BE_F (ptr, c) \ + be64_to_cpu(*(__be64 *)((char *)ptr + \ + MLX5_BYTE_OFF(ppcnt_reg, \ + counter_set.eth_802_3_cntrs_grp_data_layout.c##_high))) + +void mlx5e_stats_pause_get (struct mlx5e_priv *priv, +struct ethtool_pause_stats *pause_stats) +{ +u32 ppcnt_ieee_802_3[MLX5_ST_SZ_DW (ppcnt_reg)]; +struct mlx5_core_dev *mdev = priv->mdev; +u32 in[MLX5_ST_SZ_DW (ppcnt_reg)] = {}; +int sz =MLX5_ST_SZ_BYTES (ppcnt_reg); + +if (!MLX5_BASIC_PPCNT_SUPPORTED (mdev)) +return ; + +MLX5_SET (ppcnt_reg, in, local_port,1 ); +MLX5_SET (ppcnt_reg, in, grp,MLX5_IEEE_802_3_COUNTERS_GROUP ); +mlx5_core_access_reg (mdev, in, sz, ppcnt_ieee_802_3, + sz,MLX5_REG_PPCNT ,0 ,0 ); + + pause_stats->tx_pause_frames = +MLX5E_READ_CTR64_BE_F (ppcnt_ieee_802_3, + a_pause_mac_ctrl_frames_transmitted); + pause_stats->rx_pause_frames = +MLX5E_READ_CTR64_BE_F (ppcnt_ieee_802_3, + a_pause_mac_ctrl_frames_received); +} +#define PPORT_2863_OFF (c) \ MLX5_BYTE_OFF(ppcnt_reg, \ counter_set.eth_2863_cntrs_grp_data_layout.c##_high)
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h +3 -0
@@ -104,6 +104,9 @@ void mlx5e_stats_update(struct mlx5e_priv *priv);void mlx5e_stats_fill (struct mlx5e_priv *priv,u64 *data,int idx);void mlx5e_stats_fill_strings (struct mlx5e_priv *priv,u8 *data); +void mlx5e_stats_pause_get (struct mlx5e_priv *priv, +struct ethtool_pause_stats *pause_stats); +/* Concrete NIC Stats */ struct mlx5e_sw_stats {
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerPATCH v3 8/8 mlx4: add pause frame stats
In reply to Jakub KicinskiCheck if the pause stats are reported by HW by checking the bitmap. Calculation is based on the order of strings in main_strings from ethtool -S. Hopefully the semantics of these stats match the standard..
--- .../net/ethernet/mellanox/mlx4/en_ethtool.c | 19 +++++++++++++++++++ .../net/ethernet/mellanox/mlx4/mlx4_stats.h | 12 ++++++++++++ 2 files changed, 31 insertions(+)
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +19 -0
@@ -1106,6 +1106,24 @@ static int mlx4_en_set_pauseparam(struct net_device *dev,return err; } +static void mlx4_en_get_pause_stats (struct net_device *dev, +struct ethtool_pause_stats *stats) +{ +struct mlx4_en_priv *priv =netdev_priv (dev); +struct bitmap_iterator it; + +bitmap_iterator_init (&it, priv->stats_bitmap.bitmap,NUM_ALL_STATS ); + +spin_lock_bh (&priv->stats_lock); +if (test_bit (FLOW_PRIORITY_STATS_IDX_TX_FRAMES , + priv->stats_bitmap.bitmap)) + stats->tx_pause_frames = priv->tx_flowstats.tx_pause; +if (test_bit (FLOW_PRIORITY_STATS_IDX_RX_FRAMES , + priv->stats_bitmap.bitmap)) + stats->rx_pause_frames = priv->rx_flowstats.rx_pause; +spin_unlock_bh (&priv->stats_lock); +} +static void mlx4_en_get_pauseparam (struct net_device *dev,struct ethtool_pauseparam *pause) {
@@ -2138,6 +2156,7 @@ const struct ethtool_ops mlx4_en_ethtool_ops = { .set_msglevel = mlx4_en_set_msglevel, .get_coalesce = mlx4_en_get_coalesce, .set_coalesce = mlx4_en_set_coalesce, + .get_pause_stats = mlx4_en_get_pause_stats, .get_pauseparam = mlx4_en_get_pauseparam, .set_pauseparam = mlx4_en_set_pauseparam, .get_ringparam = mlx4_en_get_ringparam,
drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h +12 -0
@@ -84,6 +84,11 @@ struct mlx4_en_flow_stats_rx { MLX4_NUM_PRIORITIES) }; +#define FLOW_PRIORITY_STATS_IDX_RX_FRAMES (NUM_MAIN_STATS + \ + NUM_PORT_STATS + \ + NUM_PF_STATS + \ + NUM_FLOW_PRIORITY_STATS_RX) +struct mlx4_en_flow_stats_tx {u64 tx_pause;u64 tx_pause_duration;
@@ -93,6 +98,13 @@ struct mlx4_en_flow_stats_tx { MLX4_NUM_PRIORITIES) }; +#define FLOW_PRIORITY_STATS_IDX_TX_FRAMES (NUM_MAIN_STATS + \ + NUM_PORT_STATS + \ + NUM_PF_STATS + \ + NUM_FLOW_PRIORITY_STATS_RX + \ + NUM_FLOW_STATS_RX + \ + NUM_FLOW_PRIORITY_STATS_TX) +#define NUM_FLOW_STATS (NUM_FLOW_STATS_RX + NUM_FLOW_STATS_TX + \ NUM_FLOW_PRIORITY_STATS_TX + \ NUM_FLOW_PRIORITY_STATS_RX)
Signature · 1 line
2.26.2
David Miller
maintainerFrom: Jakub Kicinski <[email protected]>
Date: Mon, 14 Sep 2020 17:11:51 -0700
Quoted 11 lines
This is the first (small) series which exposes some stats via the corresponding ethtool interface. Here (thanks to the excitability of netlink) we expose pause frame stats via the same interfaces as ethtool -a / -A.
In particular the following stats from the standard:
- 30.3.4.2 aPAUSEMACCtrlFramesTransmitted
- 30.3.4.3 aPAUSEMACCtrlFramesReceived4 real drivers are converted, I believe we got confirmation from maintainers that all exposed stats match the standard.
...
Series applied, thanks.