mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 00:04:15 +08:00
Merge branch 'ethtool-stats'
Jakub Kicinski says: ==================== ethtool: add uAPI for reading standard stats Continuing the effort of providing a unified access method to standard stats, and explicitly tying the definitions to the standards this series adds an API for general stats which do no fit into more targeted control APIs. There is nothing clever here, just a netlink API for dumping statistics defined by standards and RFCs which today end up in ethtool -S under infinite variations of names. This series adds basic IEEE stats (for PHY, MAC, Ctrl frames) and RMON stats. AFAICT other RFCs only duplicate the IEEE stats. This series does _not_ add a netlink API to read driver-defined stats. There seems to be little to gain from moving that part to netlink. The netlink message format is very simple, and aims to allow adding stats and groups with no changes to user tooling (which IIUC is expected for ethtool). On user space side we can re-use -S, and make it dump standard stats if --groups are defined. $ ethtool -S eth0 --groups eth-phy eth-mac eth-ctrl rmon Stats for eth0: eth-phy-SymbolErrorDuringCarrier: 0 eth-mac-FramesTransmittedOK: 0 eth-mac-FrameTooLongErrors: 0 eth-ctrl-MACControlFramesTransmitted: 0 eth-ctrl-MACControlFramesReceived: 1 eth-ctrl-UnsupportedOpcodesReceived: 0 rmon-etherStatsUndersizePkts: 0 rmon-etherStatsJabbers: 0 rmon-rx-etherStatsPkts64Octets: 1 rmon-rx-etherStatsPkts128to255Octets: 0 rmon-rx-etherStatsPkts1024toMaxOctets: 1 rmon-tx-etherStatsPkts64Octets: 1 rmon-tx-etherStatsPkts128to255Octets: 0 rmon-tx-etherStatsPkts1024toMaxOctets: 1 v1: Driver support for mlxsw, mlx5 and bnxt included. Compared to the RFC I went ahead with wrapping the stats into a 1:1 nest. Now IDs of stats can start from 0, at a cost of slightly "careful" u64 alignment handling. v2: Add missing kdoc in patch 5. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
1c86514d7f
@ -210,6 +210,7 @@ Userspace to kernel:
|
||||
``ETHTOOL_MSG_TUNNEL_INFO_GET`` get tunnel offload info
|
||||
``ETHTOOL_MSG_FEC_GET`` get FEC settings
|
||||
``ETHTOOL_MSG_FEC_SET`` set FEC settings
|
||||
``ETHTOOL_MSG_STATS_GET`` get standard statistics
|
||||
===================================== ================================
|
||||
|
||||
Kernel to userspace:
|
||||
@ -246,6 +247,7 @@ Kernel to userspace:
|
||||
``ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY`` tunnel offload info
|
||||
``ETHTOOL_MSG_FEC_GET_REPLY`` FEC settings
|
||||
``ETHTOOL_MSG_FEC_NTF`` FEC settings
|
||||
``ETHTOOL_MSG_STATS_GET_REPLY`` standard statistics
|
||||
===================================== =================================
|
||||
|
||||
``GET`` requests are sent by userspace applications to retrieve device
|
||||
@ -1391,6 +1393,86 @@ Kernel response contents:
|
||||
``ETHTOOL_A_MODULE_EEPROM_DATA`` has an attribute length equal to the amount of
|
||||
bytes driver actually read.
|
||||
|
||||
STATS_GET
|
||||
=========
|
||||
|
||||
Get standard statistics for the interface. Note that this is not
|
||||
a re-implementation of ``ETHTOOL_GSTATS`` which exposed driver-defined
|
||||
stats.
|
||||
|
||||
Request contents:
|
||||
|
||||
======================================= ====== ==========================
|
||||
``ETHTOOL_A_STATS_HEADER`` nested request header
|
||||
``ETHTOOL_A_STATS_GROUPS`` bitset requested groups of stats
|
||||
======================================= ====== ==========================
|
||||
|
||||
Kernel response contents:
|
||||
|
||||
+-----------------------------------+--------+--------------------------------+
|
||||
| ``ETHTOOL_A_STATS_HEADER`` | nested | reply header |
|
||||
+-----------------------------------+--------+--------------------------------+
|
||||
| ``ETHTOOL_A_STATS_GRP`` | nested | one or more group of stats |
|
||||
+-+---------------------------------+--------+--------------------------------+
|
||||
| | ``ETHTOOL_A_STATS_GRP_ID`` | u32 | group ID - ``ETHTOOL_STATS_*`` |
|
||||
+-+---------------------------------+--------+--------------------------------+
|
||||
| | ``ETHTOOL_A_STATS_GRP_SS_ID`` | u32 | string set ID for names |
|
||||
+-+---------------------------------+--------+--------------------------------+
|
||||
| | ``ETHTOOL_A_STATS_GRP_STAT`` | nested | nest containing a statistic |
|
||||
+-+---------------------------------+--------+--------------------------------+
|
||||
| | ``ETHTOOL_A_STATS_GRP_HIST_RX`` | nested | histogram statistic (Rx) |
|
||||
+-+---------------------------------+--------+--------------------------------+
|
||||
| | ``ETHTOOL_A_STATS_GRP_HIST_TX`` | nested | histogram statistic (Tx) |
|
||||
+-+---------------------------------+--------+--------------------------------+
|
||||
|
||||
Users specify which groups of statistics they are requesting via
|
||||
the ``ETHTOOL_A_STATS_GROUPS`` bitset. Currently defined values are:
|
||||
|
||||
====================== ======== ===============================================
|
||||
ETHTOOL_STATS_ETH_MAC eth-mac Basic IEEE 802.3 MAC statistics (30.3.1.1.*)
|
||||
ETHTOOL_STATS_ETH_PHY eth-phy Basic IEEE 802.3 PHY statistics (30.3.2.1.*)
|
||||
ETHTOOL_STATS_ETH_CTRL eth-ctrl Basic IEEE 802.3 MAC Ctrl statistics (30.3.3.*)
|
||||
ETHTOOL_STATS_RMON rmon RMON (RFC 2819) statistics
|
||||
====================== ======== ===============================================
|
||||
|
||||
Each group should have a corresponding ``ETHTOOL_A_STATS_GRP`` in the reply.
|
||||
``ETHTOOL_A_STATS_GRP_ID`` identifies which group's statistics nest contains.
|
||||
``ETHTOOL_A_STATS_GRP_SS_ID`` identifies the string set ID for the names of
|
||||
the statistics in the group, if available.
|
||||
|
||||
Statistics are added to the ``ETHTOOL_A_STATS_GRP`` nest under
|
||||
``ETHTOOL_A_STATS_GRP_STAT``. ``ETHTOOL_A_STATS_GRP_STAT`` should contain
|
||||
single 8 byte (u64) attribute inside - the type of that attribute is
|
||||
the statistic ID and the value is the value of the statistic.
|
||||
Each group has its own interpretation of statistic IDs.
|
||||
Attribute IDs correspond to strings from the string set identified
|
||||
by ``ETHTOOL_A_STATS_GRP_SS_ID``. Complex statistics (such as RMON histogram
|
||||
entries) are also listed inside ``ETHTOOL_A_STATS_GRP`` and do not have
|
||||
a string defined in the string set.
|
||||
|
||||
RMON "histogram" counters count number of packets within given size range.
|
||||
Because RFC does not specify the ranges beyond the standard 1518 MTU devices
|
||||
differ in definition of buckets. For this reason the definition of packet ranges
|
||||
is left to each driver.
|
||||
|
||||
``ETHTOOL_A_STATS_GRP_HIST_RX`` and ``ETHTOOL_A_STATS_GRP_HIST_TX`` nests
|
||||
contain the following attributes:
|
||||
|
||||
================================= ====== ===================================
|
||||
ETHTOOL_A_STATS_RMON_HIST_BKT_LOW u32 low bound of the packet size bucket
|
||||
ETHTOOL_A_STATS_RMON_HIST_BKT_HI u32 high bound of the bucket
|
||||
ETHTOOL_A_STATS_RMON_HIST_VAL u64 packet counter
|
||||
================================= ====== ===================================
|
||||
|
||||
Low and high bounds are inclusive, for example:
|
||||
|
||||
============================= ==== ====
|
||||
RFC statistic low high
|
||||
============================= ==== ====
|
||||
etherStatsPkts64Octets 0 64
|
||||
etherStatsPkts512to1023Octets 512 1023
|
||||
============================= ==== ====
|
||||
|
||||
Request translation
|
||||
===================
|
||||
|
||||
|
||||
@ -44,8 +44,27 @@ If `-s` is specified once the detailed errors won't be shown.
|
||||
Protocol-specific statistics
|
||||
----------------------------
|
||||
|
||||
Some of the interfaces used for configuring devices are also able
|
||||
to report related statistics. For example ethtool interface used
|
||||
Protocol-specific statistics are exposed via relevant interfaces,
|
||||
the same interfaces as are used to configure them.
|
||||
|
||||
ethtool
|
||||
~~~~~~~
|
||||
|
||||
Ethtool exposes common low-level statistics.
|
||||
All the standard statistics are expected to be maintained
|
||||
by the device, not the driver (as opposed to driver-defined stats
|
||||
described in the next section which mix software and hardware stats).
|
||||
For devices which contain unmanaged
|
||||
switches (e.g. legacy SR-IOV or multi-host NICs) the events counted
|
||||
may not pertain exclusively to the packets destined to
|
||||
the local host interface. In other words the events may
|
||||
be counted at the network port (MAC/PHY blocks) without separation
|
||||
for different host side (PCIe) devices. Such ambiguity must not
|
||||
be present when internal switch is managed by Linux (so called
|
||||
switchdev mode for NICs).
|
||||
|
||||
Standard ethtool statistics can be accessed via the interfaces used
|
||||
for configuration. For example ethtool interface used
|
||||
to configure pause frames can report corresponding hardware counters::
|
||||
|
||||
$ ethtool --include-statistics -a eth0
|
||||
@ -57,6 +76,27 @@ to configure pause frames can report corresponding hardware counters::
|
||||
tx_pause_frames: 1
|
||||
rx_pause_frames: 1
|
||||
|
||||
General Ethernet statistics not associated with any particular
|
||||
functionality are exposed via ``ethtool -S $ifc`` by specifying
|
||||
the ``--groups`` parameter::
|
||||
|
||||
$ ethtool -S eth0 --groups eth-phy eth-mac eth-ctrl rmon
|
||||
Stats for eth0:
|
||||
eth-phy-SymbolErrorDuringCarrier: 0
|
||||
eth-mac-FramesTransmittedOK: 1
|
||||
eth-mac-FrameTooLongErrors: 1
|
||||
eth-ctrl-MACControlFramesTransmitted: 1
|
||||
eth-ctrl-MACControlFramesReceived: 0
|
||||
eth-ctrl-UnsupportedOpcodesReceived: 1
|
||||
rmon-etherStatsUndersizePkts: 1
|
||||
rmon-etherStatsJabbers: 0
|
||||
rmon-rx-etherStatsPkts64Octets: 1
|
||||
rmon-rx-etherStatsPkts65to127Octets: 0
|
||||
rmon-rx-etherStatsPkts128to255Octets: 0
|
||||
rmon-tx-etherStatsPkts64Octets: 2
|
||||
rmon-tx-etherStatsPkts65to127Octets: 3
|
||||
rmon-tx-etherStatsPkts128to255Octets: 0
|
||||
|
||||
Driver-defined statistics
|
||||
-------------------------
|
||||
|
||||
|
||||
@ -3990,6 +3990,127 @@ ethtool_init_exit:
|
||||
mutex_unlock(&bp->hwrm_cmd_lock);
|
||||
}
|
||||
|
||||
static void bnxt_get_eth_phy_stats(struct net_device *dev,
|
||||
struct ethtool_eth_phy_stats *phy_stats)
|
||||
{
|
||||
struct bnxt *bp = netdev_priv(dev);
|
||||
u64 *rx;
|
||||
|
||||
if (BNXT_VF(bp) || !(bp->flags & BNXT_FLAG_PORT_STATS_EXT))
|
||||
return;
|
||||
|
||||
rx = bp->rx_port_stats_ext.sw_stats;
|
||||
phy_stats->SymbolErrorDuringCarrier =
|
||||
*(rx + BNXT_RX_STATS_EXT_OFFSET(rx_pcs_symbol_err));
|
||||
}
|
||||
|
||||
static void bnxt_get_eth_mac_stats(struct net_device *dev,
|
||||
struct ethtool_eth_mac_stats *mac_stats)
|
||||
{
|
||||
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;
|
||||
|
||||
mac_stats->FramesReceivedOK =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_good_frames);
|
||||
mac_stats->FramesTransmittedOK =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_good_frames);
|
||||
}
|
||||
|
||||
static void bnxt_get_eth_ctrl_stats(struct net_device *dev,
|
||||
struct ethtool_eth_ctrl_stats *ctrl_stats)
|
||||
{
|
||||
struct bnxt *bp = netdev_priv(dev);
|
||||
u64 *rx;
|
||||
|
||||
if (BNXT_VF(bp) || !(bp->flags & BNXT_FLAG_PORT_STATS))
|
||||
return;
|
||||
|
||||
rx = bp->port_stats.sw_stats;
|
||||
ctrl_stats->MACControlFramesReceived =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_ctrl_frames);
|
||||
}
|
||||
|
||||
static const struct ethtool_rmon_hist_range bnxt_rmon_ranges[] = {
|
||||
{ 0, 64 },
|
||||
{ 65, 127 },
|
||||
{ 128, 255 },
|
||||
{ 256, 511 },
|
||||
{ 512, 1023 },
|
||||
{ 1024, 1518 },
|
||||
{ 1519, 2047 },
|
||||
{ 2048, 4095 },
|
||||
{ 4096, 9216 },
|
||||
{ 9217, 16383 },
|
||||
{}
|
||||
};
|
||||
|
||||
static void bnxt_get_rmon_stats(struct net_device *dev,
|
||||
struct ethtool_rmon_stats *rmon_stats,
|
||||
const struct ethtool_rmon_hist_range **ranges)
|
||||
{
|
||||
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;
|
||||
|
||||
rmon_stats->jabbers =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_jbr_frames);
|
||||
rmon_stats->oversize_pkts =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_ovrsz_frames);
|
||||
rmon_stats->undersize_pkts =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_undrsz_frames);
|
||||
|
||||
rmon_stats->hist[0] = BNXT_GET_RX_PORT_STATS64(rx, rx_64b_frames);
|
||||
rmon_stats->hist[1] = BNXT_GET_RX_PORT_STATS64(rx, rx_65b_127b_frames);
|
||||
rmon_stats->hist[2] = BNXT_GET_RX_PORT_STATS64(rx, rx_128b_255b_frames);
|
||||
rmon_stats->hist[3] = BNXT_GET_RX_PORT_STATS64(rx, rx_256b_511b_frames);
|
||||
rmon_stats->hist[4] =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_512b_1023b_frames);
|
||||
rmon_stats->hist[5] =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_1024b_1518b_frames);
|
||||
rmon_stats->hist[6] =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_1519b_2047b_frames);
|
||||
rmon_stats->hist[7] =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_2048b_4095b_frames);
|
||||
rmon_stats->hist[8] =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_4096b_9216b_frames);
|
||||
rmon_stats->hist[9] =
|
||||
BNXT_GET_RX_PORT_STATS64(rx, rx_9217b_16383b_frames);
|
||||
|
||||
rmon_stats->hist_tx[0] =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_64b_frames);
|
||||
rmon_stats->hist_tx[1] =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_65b_127b_frames);
|
||||
rmon_stats->hist_tx[2] =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_128b_255b_frames);
|
||||
rmon_stats->hist_tx[3] =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_256b_511b_frames);
|
||||
rmon_stats->hist_tx[4] =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_512b_1023b_frames);
|
||||
rmon_stats->hist_tx[5] =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_1024b_1518b_frames);
|
||||
rmon_stats->hist_tx[6] =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_1519b_2047b_frames);
|
||||
rmon_stats->hist_tx[7] =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_2048b_4095b_frames);
|
||||
rmon_stats->hist_tx[8] =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_4096b_9216b_frames);
|
||||
rmon_stats->hist_tx[9] =
|
||||
BNXT_GET_TX_PORT_STATS64(tx, tx_9217b_16383b_frames);
|
||||
|
||||
*ranges = bnxt_rmon_ranges;
|
||||
}
|
||||
|
||||
void bnxt_ethtool_free(struct bnxt *bp)
|
||||
{
|
||||
kfree(bp->test_info);
|
||||
@ -4049,4 +4170,8 @@ const struct ethtool_ops bnxt_ethtool_ops = {
|
||||
.set_dump = bnxt_set_dump,
|
||||
.get_dump_flag = bnxt_get_dump_flag,
|
||||
.get_dump_data = bnxt_get_dump_data,
|
||||
.get_eth_phy_stats = bnxt_get_eth_phy_stats,
|
||||
.get_eth_mac_stats = bnxt_get_eth_mac_stats,
|
||||
.get_eth_ctrl_stats = bnxt_get_eth_ctrl_stats,
|
||||
.get_rmon_stats = bnxt_get_rmon_stats,
|
||||
};
|
||||
|
||||
@ -2295,6 +2295,39 @@ mlx5e_get_link_ext_state(struct net_device *dev,
|
||||
return -ENODATA;
|
||||
}
|
||||
|
||||
static void mlx5e_get_eth_phy_stats(struct net_device *netdev,
|
||||
struct ethtool_eth_phy_stats *phy_stats)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
|
||||
mlx5e_stats_eth_phy_get(priv, phy_stats);
|
||||
}
|
||||
|
||||
static void mlx5e_get_eth_mac_stats(struct net_device *netdev,
|
||||
struct ethtool_eth_mac_stats *mac_stats)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
|
||||
mlx5e_stats_eth_mac_get(priv, mac_stats);
|
||||
}
|
||||
|
||||
static void mlx5e_get_eth_ctrl_stats(struct net_device *netdev,
|
||||
struct ethtool_eth_ctrl_stats *ctrl_stats)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
|
||||
mlx5e_stats_eth_ctrl_get(priv, ctrl_stats);
|
||||
}
|
||||
|
||||
static void mlx5e_get_rmon_stats(struct net_device *netdev,
|
||||
struct ethtool_rmon_stats *rmon_stats,
|
||||
const struct ethtool_rmon_hist_range **ranges)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
|
||||
mlx5e_stats_rmon_get(priv, rmon_stats, ranges);
|
||||
}
|
||||
|
||||
const struct ethtool_ops mlx5e_ethtool_ops = {
|
||||
.supported_coalesce_params = ETHTOOL_COALESCE_USECS |
|
||||
ETHTOOL_COALESCE_MAX_FRAMES |
|
||||
@ -2340,4 +2373,8 @@ const struct ethtool_ops mlx5e_ethtool_ops = {
|
||||
.get_fec_stats = mlx5e_get_fec_stats,
|
||||
.get_fecparam = mlx5e_get_fecparam,
|
||||
.set_fecparam = mlx5e_set_fecparam,
|
||||
.get_eth_phy_stats = mlx5e_get_eth_phy_stats,
|
||||
.get_eth_mac_stats = mlx5e_get_eth_mac_stats,
|
||||
.get_eth_ctrl_stats = mlx5e_get_eth_ctrl_stats,
|
||||
.get_rmon_stats = mlx5e_get_rmon_stats,
|
||||
};
|
||||
|
||||
@ -775,22 +775,30 @@ static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(802_3)
|
||||
MLX5_BYTE_OFF(ppcnt_reg, \
|
||||
counter_set.set.c##_high)))
|
||||
|
||||
static int mlx5e_stats_get_ieee(struct mlx5_core_dev *mdev,
|
||||
u32 *ppcnt_ieee_802_3)
|
||||
{
|
||||
u32 in[MLX5_ST_SZ_DW(ppcnt_reg)] = {};
|
||||
int sz = MLX5_ST_SZ_BYTES(ppcnt_reg);
|
||||
|
||||
if (!MLX5_BASIC_PPCNT_SUPPORTED(mdev))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
MLX5_SET(ppcnt_reg, in, local_port, 1);
|
||||
MLX5_SET(ppcnt_reg, in, grp, MLX5_IEEE_802_3_COUNTERS_GROUP);
|
||||
return mlx5_core_access_reg(mdev, in, sz, ppcnt_ieee_802_3,
|
||||
sz, MLX5_REG_PPCNT, 0, 0);
|
||||
}
|
||||
|
||||
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))
|
||||
if (mlx5e_stats_get_ieee(mdev, ppcnt_ieee_802_3))
|
||||
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,
|
||||
eth_802_3_cntrs_grp_data_layout,
|
||||
@ -801,6 +809,73 @@ void mlx5e_stats_pause_get(struct mlx5e_priv *priv,
|
||||
a_pause_mac_ctrl_frames_received);
|
||||
}
|
||||
|
||||
void mlx5e_stats_eth_phy_get(struct mlx5e_priv *priv,
|
||||
struct ethtool_eth_phy_stats *phy_stats)
|
||||
{
|
||||
u32 ppcnt_ieee_802_3[MLX5_ST_SZ_DW(ppcnt_reg)];
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
|
||||
if (mlx5e_stats_get_ieee(mdev, ppcnt_ieee_802_3))
|
||||
return;
|
||||
|
||||
phy_stats->SymbolErrorDuringCarrier =
|
||||
MLX5E_READ_CTR64_BE_F(ppcnt_ieee_802_3,
|
||||
eth_802_3_cntrs_grp_data_layout,
|
||||
a_symbol_error_during_carrier);
|
||||
}
|
||||
|
||||
void mlx5e_stats_eth_mac_get(struct mlx5e_priv *priv,
|
||||
struct ethtool_eth_mac_stats *mac_stats)
|
||||
{
|
||||
u32 ppcnt_ieee_802_3[MLX5_ST_SZ_DW(ppcnt_reg)];
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
|
||||
if (mlx5e_stats_get_ieee(mdev, ppcnt_ieee_802_3))
|
||||
return;
|
||||
|
||||
#define RD(name) \
|
||||
MLX5E_READ_CTR64_BE_F(ppcnt_ieee_802_3, \
|
||||
eth_802_3_cntrs_grp_data_layout, \
|
||||
name)
|
||||
|
||||
mac_stats->FramesTransmittedOK = RD(a_frames_transmitted_ok);
|
||||
mac_stats->FramesReceivedOK = RD(a_frames_received_ok);
|
||||
mac_stats->FrameCheckSequenceErrors = RD(a_frame_check_sequence_errors);
|
||||
mac_stats->OctetsTransmittedOK = RD(a_octets_transmitted_ok);
|
||||
mac_stats->OctetsReceivedOK = RD(a_octets_received_ok);
|
||||
mac_stats->MulticastFramesXmittedOK = RD(a_multicast_frames_xmitted_ok);
|
||||
mac_stats->BroadcastFramesXmittedOK = RD(a_broadcast_frames_xmitted_ok);
|
||||
mac_stats->MulticastFramesReceivedOK = RD(a_multicast_frames_received_ok);
|
||||
mac_stats->BroadcastFramesReceivedOK = RD(a_broadcast_frames_received_ok);
|
||||
mac_stats->InRangeLengthErrors = RD(a_in_range_length_errors);
|
||||
mac_stats->OutOfRangeLengthField = RD(a_out_of_range_length_field);
|
||||
mac_stats->FrameTooLongErrors = RD(a_frame_too_long_errors);
|
||||
#undef RD
|
||||
}
|
||||
|
||||
void mlx5e_stats_eth_ctrl_get(struct mlx5e_priv *priv,
|
||||
struct ethtool_eth_ctrl_stats *ctrl_stats)
|
||||
{
|
||||
u32 ppcnt_ieee_802_3[MLX5_ST_SZ_DW(ppcnt_reg)];
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
|
||||
if (mlx5e_stats_get_ieee(mdev, ppcnt_ieee_802_3))
|
||||
return;
|
||||
|
||||
ctrl_stats->MACControlFramesTransmitted =
|
||||
MLX5E_READ_CTR64_BE_F(ppcnt_ieee_802_3,
|
||||
eth_802_3_cntrs_grp_data_layout,
|
||||
a_mac_control_frames_transmitted);
|
||||
ctrl_stats->MACControlFramesReceived =
|
||||
MLX5E_READ_CTR64_BE_F(ppcnt_ieee_802_3,
|
||||
eth_802_3_cntrs_grp_data_layout,
|
||||
a_mac_control_frames_received);
|
||||
ctrl_stats->UnsupportedOpcodesReceived =
|
||||
MLX5E_READ_CTR64_BE_F(ppcnt_ieee_802_3,
|
||||
eth_802_3_cntrs_grp_data_layout,
|
||||
a_unsupported_opcodes_received);
|
||||
}
|
||||
|
||||
#define PPORT_2863_OFF(c) \
|
||||
MLX5_BYTE_OFF(ppcnt_reg, \
|
||||
counter_set.eth_2863_cntrs_grp_data_layout.c##_high)
|
||||
@ -912,6 +987,59 @@ static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(2819)
|
||||
mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_PPCNT, 0, 0);
|
||||
}
|
||||
|
||||
static const struct ethtool_rmon_hist_range mlx5e_rmon_ranges[] = {
|
||||
{ 0, 64 },
|
||||
{ 65, 127 },
|
||||
{ 128, 255 },
|
||||
{ 256, 511 },
|
||||
{ 512, 1023 },
|
||||
{ 1024, 1518 },
|
||||
{ 1519, 2047 },
|
||||
{ 2048, 4095 },
|
||||
{ 4096, 8191 },
|
||||
{ 8192, 10239 },
|
||||
{}
|
||||
};
|
||||
|
||||
void mlx5e_stats_rmon_get(struct mlx5e_priv *priv,
|
||||
struct ethtool_rmon_stats *rmon,
|
||||
const struct ethtool_rmon_hist_range **ranges)
|
||||
{
|
||||
u32 ppcnt_RFC_2819_counters[MLX5_ST_SZ_DW(ppcnt_reg)];
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
u32 in[MLX5_ST_SZ_DW(ppcnt_reg)] = {0};
|
||||
int sz = MLX5_ST_SZ_BYTES(ppcnt_reg);
|
||||
|
||||
MLX5_SET(ppcnt_reg, in, local_port, 1);
|
||||
MLX5_SET(ppcnt_reg, in, grp, MLX5_RFC_2819_COUNTERS_GROUP);
|
||||
if (mlx5_core_access_reg(mdev, in, sz, ppcnt_RFC_2819_counters,
|
||||
sz, MLX5_REG_PPCNT, 0, 0))
|
||||
return;
|
||||
|
||||
#define RD(name) \
|
||||
MLX5E_READ_CTR64_BE_F(ppcnt_RFC_2819_counters, \
|
||||
eth_2819_cntrs_grp_data_layout, \
|
||||
name)
|
||||
|
||||
rmon->undersize_pkts = RD(ether_stats_undersize_pkts);
|
||||
rmon->fragments = RD(ether_stats_fragments);
|
||||
rmon->jabbers = RD(ether_stats_jabbers);
|
||||
|
||||
rmon->hist[0] = RD(ether_stats_pkts64octets);
|
||||
rmon->hist[1] = RD(ether_stats_pkts65to127octets);
|
||||
rmon->hist[2] = RD(ether_stats_pkts128to255octets);
|
||||
rmon->hist[3] = RD(ether_stats_pkts256to511octets);
|
||||
rmon->hist[4] = RD(ether_stats_pkts512to1023octets);
|
||||
rmon->hist[5] = RD(ether_stats_pkts1024to1518octets);
|
||||
rmon->hist[6] = RD(ether_stats_pkts1519to2047octets);
|
||||
rmon->hist[7] = RD(ether_stats_pkts2048to4095octets);
|
||||
rmon->hist[8] = RD(ether_stats_pkts4096to8191octets);
|
||||
rmon->hist[9] = RD(ether_stats_pkts8192to10239octets);
|
||||
#undef RD
|
||||
|
||||
*ranges = mlx5e_rmon_ranges;
|
||||
}
|
||||
|
||||
#define PPORT_PHY_STATISTICAL_OFF(c) \
|
||||
MLX5_BYTE_OFF(ppcnt_reg, \
|
||||
counter_set.phys_layer_statistical_cntrs.c##_high)
|
||||
|
||||
@ -117,6 +117,16 @@ void mlx5e_stats_pause_get(struct mlx5e_priv *priv,
|
||||
void mlx5e_stats_fec_get(struct mlx5e_priv *priv,
|
||||
struct ethtool_fec_stats *fec_stats);
|
||||
|
||||
void mlx5e_stats_eth_phy_get(struct mlx5e_priv *priv,
|
||||
struct ethtool_eth_phy_stats *phy_stats);
|
||||
void mlx5e_stats_eth_mac_get(struct mlx5e_priv *priv,
|
||||
struct ethtool_eth_mac_stats *mac_stats);
|
||||
void mlx5e_stats_eth_ctrl_get(struct mlx5e_priv *priv,
|
||||
struct ethtool_eth_ctrl_stats *ctrl_stats);
|
||||
void mlx5e_stats_rmon_get(struct mlx5e_priv *priv,
|
||||
struct ethtool_rmon_stats *rmon,
|
||||
const struct ethtool_rmon_hist_range **ranges);
|
||||
|
||||
/* Concrete NIC Stats */
|
||||
|
||||
struct mlx5e_sw_stats {
|
||||
|
||||
@ -1059,6 +1059,131 @@ mlxsw_sp_get_ts_info(struct net_device *netdev, struct ethtool_ts_info *info)
|
||||
return mlxsw_sp->ptp_ops->get_ts_info(mlxsw_sp, info);
|
||||
}
|
||||
|
||||
static void
|
||||
mlxsw_sp_get_eth_phy_stats(struct net_device *dev,
|
||||
struct ethtool_eth_phy_stats *phy_stats)
|
||||
{
|
||||
char ppcnt_pl[MLXSW_REG_PPCNT_LEN];
|
||||
|
||||
if (mlxsw_sp_port_get_stats_raw(dev, MLXSW_REG_PPCNT_IEEE_8023_CNT,
|
||||
0, ppcnt_pl))
|
||||
return;
|
||||
|
||||
phy_stats->SymbolErrorDuringCarrier =
|
||||
mlxsw_reg_ppcnt_a_symbol_error_during_carrier_get(ppcnt_pl);
|
||||
}
|
||||
|
||||
static void
|
||||
mlxsw_sp_get_eth_mac_stats(struct net_device *dev,
|
||||
struct ethtool_eth_mac_stats *mac_stats)
|
||||
{
|
||||
char ppcnt_pl[MLXSW_REG_PPCNT_LEN];
|
||||
|
||||
if (mlxsw_sp_port_get_stats_raw(dev, MLXSW_REG_PPCNT_IEEE_8023_CNT,
|
||||
0, ppcnt_pl))
|
||||
return;
|
||||
|
||||
mac_stats->FramesTransmittedOK =
|
||||
mlxsw_reg_ppcnt_a_frames_transmitted_ok_get(ppcnt_pl);
|
||||
mac_stats->FramesReceivedOK =
|
||||
mlxsw_reg_ppcnt_a_frames_received_ok_get(ppcnt_pl);
|
||||
mac_stats->FrameCheckSequenceErrors =
|
||||
mlxsw_reg_ppcnt_a_frame_check_sequence_errors_get(ppcnt_pl);
|
||||
mac_stats->AlignmentErrors =
|
||||
mlxsw_reg_ppcnt_a_alignment_errors_get(ppcnt_pl);
|
||||
mac_stats->OctetsTransmittedOK =
|
||||
mlxsw_reg_ppcnt_a_octets_transmitted_ok_get(ppcnt_pl);
|
||||
mac_stats->OctetsReceivedOK =
|
||||
mlxsw_reg_ppcnt_a_octets_received_ok_get(ppcnt_pl);
|
||||
mac_stats->MulticastFramesXmittedOK =
|
||||
mlxsw_reg_ppcnt_a_multicast_frames_xmitted_ok_get(ppcnt_pl);
|
||||
mac_stats->BroadcastFramesXmittedOK =
|
||||
mlxsw_reg_ppcnt_a_broadcast_frames_xmitted_ok_get(ppcnt_pl);
|
||||
mac_stats->MulticastFramesReceivedOK =
|
||||
mlxsw_reg_ppcnt_a_multicast_frames_received_ok_get(ppcnt_pl);
|
||||
mac_stats->BroadcastFramesReceivedOK =
|
||||
mlxsw_reg_ppcnt_a_broadcast_frames_received_ok_get(ppcnt_pl);
|
||||
mac_stats->InRangeLengthErrors =
|
||||
mlxsw_reg_ppcnt_a_in_range_length_errors_get(ppcnt_pl);
|
||||
mac_stats->OutOfRangeLengthField =
|
||||
mlxsw_reg_ppcnt_a_out_of_range_length_field_get(ppcnt_pl);
|
||||
mac_stats->FrameTooLongErrors =
|
||||
mlxsw_reg_ppcnt_a_frame_too_long_errors_get(ppcnt_pl);
|
||||
}
|
||||
|
||||
static void
|
||||
mlxsw_sp_get_eth_ctrl_stats(struct net_device *dev,
|
||||
struct ethtool_eth_ctrl_stats *ctrl_stats)
|
||||
{
|
||||
char ppcnt_pl[MLXSW_REG_PPCNT_LEN];
|
||||
|
||||
if (mlxsw_sp_port_get_stats_raw(dev, MLXSW_REG_PPCNT_IEEE_8023_CNT,
|
||||
0, ppcnt_pl))
|
||||
return;
|
||||
|
||||
ctrl_stats->MACControlFramesTransmitted =
|
||||
mlxsw_reg_ppcnt_a_mac_control_frames_transmitted_get(ppcnt_pl);
|
||||
ctrl_stats->MACControlFramesReceived =
|
||||
mlxsw_reg_ppcnt_a_mac_control_frames_received_get(ppcnt_pl);
|
||||
ctrl_stats->UnsupportedOpcodesReceived =
|
||||
mlxsw_reg_ppcnt_a_unsupported_opcodes_received_get(ppcnt_pl);
|
||||
}
|
||||
|
||||
static const struct ethtool_rmon_hist_range mlxsw_rmon_ranges[] = {
|
||||
{ 0, 64 },
|
||||
{ 65, 127 },
|
||||
{ 128, 255 },
|
||||
{ 256, 511 },
|
||||
{ 512, 1023 },
|
||||
{ 1024, 1518 },
|
||||
{ 1519, 2047 },
|
||||
{ 2048, 4095 },
|
||||
{ 4096, 8191 },
|
||||
{ 8192, 10239 },
|
||||
{}
|
||||
};
|
||||
|
||||
static void
|
||||
mlxsw_sp_get_rmon_stats(struct net_device *dev,
|
||||
struct ethtool_rmon_stats *rmon,
|
||||
const struct ethtool_rmon_hist_range **ranges)
|
||||
{
|
||||
char ppcnt_pl[MLXSW_REG_PPCNT_LEN];
|
||||
|
||||
if (mlxsw_sp_port_get_stats_raw(dev, MLXSW_REG_PPCNT_RFC_2819_CNT,
|
||||
0, ppcnt_pl))
|
||||
return;
|
||||
|
||||
rmon->undersize_pkts =
|
||||
mlxsw_reg_ppcnt_ether_stats_undersize_pkts_get(ppcnt_pl);
|
||||
rmon->oversize_pkts =
|
||||
mlxsw_reg_ppcnt_ether_stats_oversize_pkts_get(ppcnt_pl);
|
||||
rmon->fragments =
|
||||
mlxsw_reg_ppcnt_ether_stats_fragments_get(ppcnt_pl);
|
||||
|
||||
rmon->hist[0] = mlxsw_reg_ppcnt_ether_stats_pkts64octets_get(ppcnt_pl);
|
||||
rmon->hist[1] =
|
||||
mlxsw_reg_ppcnt_ether_stats_pkts65to127octets_get(ppcnt_pl);
|
||||
rmon->hist[2] =
|
||||
mlxsw_reg_ppcnt_ether_stats_pkts128to255octets_get(ppcnt_pl);
|
||||
rmon->hist[3] =
|
||||
mlxsw_reg_ppcnt_ether_stats_pkts256to511octets_get(ppcnt_pl);
|
||||
rmon->hist[4] =
|
||||
mlxsw_reg_ppcnt_ether_stats_pkts512to1023octets_get(ppcnt_pl);
|
||||
rmon->hist[5] =
|
||||
mlxsw_reg_ppcnt_ether_stats_pkts1024to1518octets_get(ppcnt_pl);
|
||||
rmon->hist[6] =
|
||||
mlxsw_reg_ppcnt_ether_stats_pkts1519to2047octets_get(ppcnt_pl);
|
||||
rmon->hist[7] =
|
||||
mlxsw_reg_ppcnt_ether_stats_pkts2048to4095octets_get(ppcnt_pl);
|
||||
rmon->hist[8] =
|
||||
mlxsw_reg_ppcnt_ether_stats_pkts4096to8191octets_get(ppcnt_pl);
|
||||
rmon->hist[9] =
|
||||
mlxsw_reg_ppcnt_ether_stats_pkts8192to10239octets_get(ppcnt_pl);
|
||||
|
||||
*ranges = mlxsw_rmon_ranges;
|
||||
}
|
||||
|
||||
const struct ethtool_ops mlxsw_sp_port_ethtool_ops = {
|
||||
.cap_link_lanes_supported = true,
|
||||
.get_drvinfo = mlxsw_sp_port_get_drvinfo,
|
||||
@ -1075,6 +1200,10 @@ const struct ethtool_ops mlxsw_sp_port_ethtool_ops = {
|
||||
.get_module_info = mlxsw_sp_get_module_info,
|
||||
.get_module_eeprom = mlxsw_sp_get_module_eeprom,
|
||||
.get_ts_info = mlxsw_sp_get_ts_info,
|
||||
.get_eth_phy_stats = mlxsw_sp_get_eth_phy_stats,
|
||||
.get_eth_mac_stats = mlxsw_sp_get_eth_mac_stats,
|
||||
.get_eth_ctrl_stats = mlxsw_sp_get_eth_ctrl_stats,
|
||||
.get_rmon_stats = mlxsw_sp_get_rmon_stats,
|
||||
};
|
||||
|
||||
struct mlxsw_sp1_port_link_mode {
|
||||
|
||||
@ -250,6 +250,50 @@ static inline void ethtool_stats_init(u64 *stats, unsigned int n)
|
||||
stats[n] = ETHTOOL_STAT_NOT_SET;
|
||||
}
|
||||
|
||||
/* Basic IEEE 802.3 MAC statistics (30.3.1.1.*), not otherwise exposed
|
||||
* via a more targeted API.
|
||||
*/
|
||||
struct ethtool_eth_mac_stats {
|
||||
u64 FramesTransmittedOK;
|
||||
u64 SingleCollisionFrames;
|
||||
u64 MultipleCollisionFrames;
|
||||
u64 FramesReceivedOK;
|
||||
u64 FrameCheckSequenceErrors;
|
||||
u64 AlignmentErrors;
|
||||
u64 OctetsTransmittedOK;
|
||||
u64 FramesWithDeferredXmissions;
|
||||
u64 LateCollisions;
|
||||
u64 FramesAbortedDueToXSColls;
|
||||
u64 FramesLostDueToIntMACXmitError;
|
||||
u64 CarrierSenseErrors;
|
||||
u64 OctetsReceivedOK;
|
||||
u64 FramesLostDueToIntMACRcvError;
|
||||
u64 MulticastFramesXmittedOK;
|
||||
u64 BroadcastFramesXmittedOK;
|
||||
u64 FramesWithExcessiveDeferral;
|
||||
u64 MulticastFramesReceivedOK;
|
||||
u64 BroadcastFramesReceivedOK;
|
||||
u64 InRangeLengthErrors;
|
||||
u64 OutOfRangeLengthField;
|
||||
u64 FrameTooLongErrors;
|
||||
};
|
||||
|
||||
/* Basic IEEE 802.3 PHY statistics (30.3.2.1.*), not otherwise exposed
|
||||
* via a more targeted API.
|
||||
*/
|
||||
struct ethtool_eth_phy_stats {
|
||||
u64 SymbolErrorDuringCarrier;
|
||||
};
|
||||
|
||||
/* Basic IEEE 802.3 MAC Ctrl statistics (30.3.3.*), not otherwise exposed
|
||||
* via a more targeted API.
|
||||
*/
|
||||
struct ethtool_eth_ctrl_stats {
|
||||
u64 MACControlFramesTransmitted;
|
||||
u64 MACControlFramesReceived;
|
||||
u64 UnsupportedOpcodesReceived;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ethtool_pause_stats - statistics for IEEE 802.3x pause frames
|
||||
* @tx_pause_frames: transmitted pause frame count. Reported to user space
|
||||
@ -302,6 +346,44 @@ struct ethtool_fec_stats {
|
||||
} corrected_blocks, uncorrectable_blocks, corrected_bits;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ethtool_rmon_hist_range - byte range for histogram statistics
|
||||
* @low: low bound of the bucket (inclusive)
|
||||
* @high: high bound of the bucket (inclusive)
|
||||
*/
|
||||
struct ethtool_rmon_hist_range {
|
||||
u16 low;
|
||||
u16 high;
|
||||
};
|
||||
|
||||
#define ETHTOOL_RMON_HIST_MAX 10
|
||||
|
||||
/**
|
||||
* struct ethtool_rmon_stats - selected RMON (RFC 2819) statistics
|
||||
* @undersize_pkts: Equivalent to `etherStatsUndersizePkts` from the RFC.
|
||||
* @oversize_pkts: Equivalent to `etherStatsOversizePkts` from the RFC.
|
||||
* @fragments: Equivalent to `etherStatsFragments` from the RFC.
|
||||
* @jabbers: Equivalent to `etherStatsJabbers` from the RFC.
|
||||
* @hist: Packet counter for packet length buckets (e.g.
|
||||
* `etherStatsPkts128to255Octets` from the RFC).
|
||||
* @hist_tx: Tx counters in similar form to @hist, not defined in the RFC.
|
||||
*
|
||||
* Selection of RMON (RFC 2819) statistics which are not exposed via different
|
||||
* APIs, primarily the packet-length-based counters.
|
||||
* Unfortunately different designs choose different buckets beyond
|
||||
* the 1024B mark (jumbo frame teritory), so the definition of the bucket
|
||||
* ranges is left to the driver.
|
||||
*/
|
||||
struct ethtool_rmon_stats {
|
||||
u64 undersize_pkts;
|
||||
u64 oversize_pkts;
|
||||
u64 fragments;
|
||||
u64 jabbers;
|
||||
|
||||
u64 hist[ETHTOOL_RMON_HIST_MAX];
|
||||
u64 hist_tx[ETHTOOL_RMON_HIST_MAX];
|
||||
};
|
||||
|
||||
#define ETH_MODULE_EEPROM_PAGE_LEN 128
|
||||
#define ETH_MODULE_MAX_I2C_ADDRESS 0x7f
|
||||
|
||||
@ -487,6 +569,11 @@ struct ethtool_module_eeprom {
|
||||
* @get_module_eeprom_by_page: Get a region of plug-in module EEPROM data from
|
||||
* specified page. Returns a negative error code or the amount of bytes
|
||||
* read.
|
||||
* @get_eth_phy_stats: Query some of the IEEE 802.3 PHY statistics.
|
||||
* @get_eth_mac_stats: Query some of the IEEE 802.3 MAC statistics.
|
||||
* @get_eth_ctrl_stats: Query some of the IEEE 802.3 MAC Ctrl statistics.
|
||||
* @get_rmon_stats: Query some of the RMON (RFC 2819) statistics.
|
||||
* Set %ranges to a pointer to zero-terminated array of byte ranges.
|
||||
*
|
||||
* All operations are optional (i.e. the function pointer may be set
|
||||
* to %NULL) and callers must take this into account. Callers must
|
||||
@ -597,6 +684,15 @@ struct ethtool_ops {
|
||||
int (*get_module_eeprom_by_page)(struct net_device *dev,
|
||||
const struct ethtool_module_eeprom *page,
|
||||
struct netlink_ext_ack *extack);
|
||||
void (*get_eth_phy_stats)(struct net_device *dev,
|
||||
struct ethtool_eth_phy_stats *phy_stats);
|
||||
void (*get_eth_mac_stats)(struct net_device *dev,
|
||||
struct ethtool_eth_mac_stats *mac_stats);
|
||||
void (*get_eth_ctrl_stats)(struct net_device *dev,
|
||||
struct ethtool_eth_ctrl_stats *ctrl_stats);
|
||||
void (*get_rmon_stats)(struct net_device *dev,
|
||||
struct ethtool_rmon_stats *rmon_stats,
|
||||
const struct ethtool_rmon_hist_range **ranges);
|
||||
};
|
||||
|
||||
int ethtool_check_ops(const struct ethtool_ops *ops);
|
||||
|
||||
@ -669,6 +669,11 @@ enum ethtool_link_ext_substate_cable_issue {
|
||||
* @ETH_SS_TS_TX_TYPES: timestamping Tx types
|
||||
* @ETH_SS_TS_RX_FILTERS: timestamping Rx filters
|
||||
* @ETH_SS_UDP_TUNNEL_TYPES: UDP tunnel types
|
||||
* @ETH_SS_STATS_STD: standardized stats
|
||||
* @ETH_SS_STATS_ETH_PHY: names of IEEE 802.3 PHY statistics
|
||||
* @ETH_SS_STATS_ETH_MAC: names of IEEE 802.3 MAC statistics
|
||||
* @ETH_SS_STATS_ETH_CTRL: names of IEEE 802.3 MAC Control statistics
|
||||
* @ETH_SS_STATS_RMON: names of RMON statistics
|
||||
*
|
||||
* @ETH_SS_COUNT: number of defined string sets
|
||||
*/
|
||||
@ -689,6 +694,11 @@ enum ethtool_stringset {
|
||||
ETH_SS_TS_TX_TYPES,
|
||||
ETH_SS_TS_RX_FILTERS,
|
||||
ETH_SS_UDP_TUNNEL_TYPES,
|
||||
ETH_SS_STATS_STD,
|
||||
ETH_SS_STATS_ETH_PHY,
|
||||
ETH_SS_STATS_ETH_MAC,
|
||||
ETH_SS_STATS_ETH_CTRL,
|
||||
ETH_SS_STATS_RMON,
|
||||
|
||||
/* add new constants above here */
|
||||
ETH_SS_COUNT
|
||||
|
||||
@ -45,6 +45,7 @@ enum {
|
||||
ETHTOOL_MSG_FEC_GET,
|
||||
ETHTOOL_MSG_FEC_SET,
|
||||
ETHTOOL_MSG_MODULE_EEPROM_GET,
|
||||
ETHTOOL_MSG_STATS_GET,
|
||||
|
||||
/* add new constants above here */
|
||||
__ETHTOOL_MSG_USER_CNT,
|
||||
@ -86,6 +87,7 @@ enum {
|
||||
ETHTOOL_MSG_FEC_GET_REPLY,
|
||||
ETHTOOL_MSG_FEC_NTF,
|
||||
ETHTOOL_MSG_MODULE_EEPROM_GET_REPLY,
|
||||
ETHTOOL_MSG_STATS_GET_REPLY,
|
||||
|
||||
/* add new constants above here */
|
||||
__ETHTOOL_MSG_KERNEL_CNT,
|
||||
@ -679,6 +681,141 @@ enum {
|
||||
ETHTOOL_A_MODULE_EEPROM_MAX = (__ETHTOOL_A_MODULE_EEPROM_CNT - 1)
|
||||
};
|
||||
|
||||
/* STATS */
|
||||
|
||||
enum {
|
||||
ETHTOOL_A_STATS_UNSPEC,
|
||||
ETHTOOL_A_STATS_PAD,
|
||||
ETHTOOL_A_STATS_HEADER, /* nest - _A_HEADER_* */
|
||||
ETHTOOL_A_STATS_GROUPS, /* bitset */
|
||||
|
||||
ETHTOOL_A_STATS_GRP, /* nest - _A_STATS_GRP_* */
|
||||
|
||||
/* add new constants above here */
|
||||
__ETHTOOL_A_STATS_CNT,
|
||||
ETHTOOL_A_STATS_MAX = (__ETHTOOL_A_STATS_CNT - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
ETHTOOL_STATS_ETH_PHY,
|
||||
ETHTOOL_STATS_ETH_MAC,
|
||||
ETHTOOL_STATS_ETH_CTRL,
|
||||
ETHTOOL_STATS_RMON,
|
||||
|
||||
/* add new constants above here */
|
||||
__ETHTOOL_STATS_CNT
|
||||
};
|
||||
|
||||
enum {
|
||||
ETHTOOL_A_STATS_GRP_UNSPEC,
|
||||
ETHTOOL_A_STATS_GRP_PAD,
|
||||
|
||||
ETHTOOL_A_STATS_GRP_ID, /* u32 */
|
||||
ETHTOOL_A_STATS_GRP_SS_ID, /* u32 */
|
||||
|
||||
ETHTOOL_A_STATS_GRP_STAT, /* nest */
|
||||
|
||||
ETHTOOL_A_STATS_GRP_HIST_RX, /* nest */
|
||||
ETHTOOL_A_STATS_GRP_HIST_TX, /* nest */
|
||||
|
||||
ETHTOOL_A_STATS_GRP_HIST_BKT_LOW, /* u32 */
|
||||
ETHTOOL_A_STATS_GRP_HIST_BKT_HI, /* u32 */
|
||||
ETHTOOL_A_STATS_GRP_HIST_VAL, /* u64 */
|
||||
|
||||
/* add new constants above here */
|
||||
__ETHTOOL_A_STATS_GRP_CNT,
|
||||
ETHTOOL_A_STATS_GRP_MAX = (__ETHTOOL_A_STATS_CNT - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
/* 30.3.2.1.5 aSymbolErrorDuringCarrier */
|
||||
ETHTOOL_A_STATS_ETH_PHY_5_SYM_ERR,
|
||||
|
||||
/* add new constants above here */
|
||||
__ETHTOOL_A_STATS_ETH_PHY_CNT,
|
||||
ETHTOOL_A_STATS_ETH_PHY_MAX = (__ETHTOOL_A_STATS_ETH_PHY_CNT - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
/* 30.3.1.1.2 aFramesTransmittedOK */
|
||||
ETHTOOL_A_STATS_ETH_MAC_2_TX_PKT,
|
||||
/* 30.3.1.1.3 aSingleCollisionFrames */
|
||||
ETHTOOL_A_STATS_ETH_MAC_3_SINGLE_COL,
|
||||
/* 30.3.1.1.4 aMultipleCollisionFrames */
|
||||
ETHTOOL_A_STATS_ETH_MAC_4_MULTI_COL,
|
||||
/* 30.3.1.1.5 aFramesReceivedOK */
|
||||
ETHTOOL_A_STATS_ETH_MAC_5_RX_PKT,
|
||||
/* 30.3.1.1.6 aFrameCheckSequenceErrors */
|
||||
ETHTOOL_A_STATS_ETH_MAC_6_FCS_ERR,
|
||||
/* 30.3.1.1.7 aAlignmentErrors */
|
||||
ETHTOOL_A_STATS_ETH_MAC_7_ALIGN_ERR,
|
||||
/* 30.3.1.1.8 aOctetsTransmittedOK */
|
||||
ETHTOOL_A_STATS_ETH_MAC_8_TX_BYTES,
|
||||
/* 30.3.1.1.9 aFramesWithDeferredXmissions */
|
||||
ETHTOOL_A_STATS_ETH_MAC_9_TX_DEFER,
|
||||
/* 30.3.1.1.10 aLateCollisions */
|
||||
ETHTOOL_A_STATS_ETH_MAC_10_LATE_COL,
|
||||
/* 30.3.1.1.11 aFramesAbortedDueToXSColls */
|
||||
ETHTOOL_A_STATS_ETH_MAC_11_XS_COL,
|
||||
/* 30.3.1.1.12 aFramesLostDueToIntMACXmitError */
|
||||
ETHTOOL_A_STATS_ETH_MAC_12_TX_INT_ERR,
|
||||
/* 30.3.1.1.13 aCarrierSenseErrors */
|
||||
ETHTOOL_A_STATS_ETH_MAC_13_CS_ERR,
|
||||
/* 30.3.1.1.14 aOctetsReceivedOK */
|
||||
ETHTOOL_A_STATS_ETH_MAC_14_RX_BYTES,
|
||||
/* 30.3.1.1.15 aFramesLostDueToIntMACRcvError */
|
||||
ETHTOOL_A_STATS_ETH_MAC_15_RX_INT_ERR,
|
||||
|
||||
/* 30.3.1.1.18 aMulticastFramesXmittedOK */
|
||||
ETHTOOL_A_STATS_ETH_MAC_18_TX_MCAST,
|
||||
/* 30.3.1.1.19 aBroadcastFramesXmittedOK */
|
||||
ETHTOOL_A_STATS_ETH_MAC_19_TX_BCAST,
|
||||
/* 30.3.1.1.20 aFramesWithExcessiveDeferral */
|
||||
ETHTOOL_A_STATS_ETH_MAC_20_XS_DEFER,
|
||||
/* 30.3.1.1.21 aMulticastFramesReceivedOK */
|
||||
ETHTOOL_A_STATS_ETH_MAC_21_RX_MCAST,
|
||||
/* 30.3.1.1.22 aBroadcastFramesReceivedOK */
|
||||
ETHTOOL_A_STATS_ETH_MAC_22_RX_BCAST,
|
||||
/* 30.3.1.1.23 aInRangeLengthErrors */
|
||||
ETHTOOL_A_STATS_ETH_MAC_23_IR_LEN_ERR,
|
||||
/* 30.3.1.1.24 aOutOfRangeLengthField */
|
||||
ETHTOOL_A_STATS_ETH_MAC_24_OOR_LEN,
|
||||
/* 30.3.1.1.25 aFrameTooLongErrors */
|
||||
ETHTOOL_A_STATS_ETH_MAC_25_TOO_LONG_ERR,
|
||||
|
||||
/* add new constants above here */
|
||||
__ETHTOOL_A_STATS_ETH_MAC_CNT,
|
||||
ETHTOOL_A_STATS_ETH_MAC_MAX = (__ETHTOOL_A_STATS_ETH_MAC_CNT - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
/* 30.3.3.3 aMACControlFramesTransmitted */
|
||||
ETHTOOL_A_STATS_ETH_CTRL_3_TX,
|
||||
/* 30.3.3.4 aMACControlFramesReceived */
|
||||
ETHTOOL_A_STATS_ETH_CTRL_4_RX,
|
||||
/* 30.3.3.5 aUnsupportedOpcodesReceived */
|
||||
ETHTOOL_A_STATS_ETH_CTRL_5_RX_UNSUP,
|
||||
|
||||
/* add new constants above here */
|
||||
__ETHTOOL_A_STATS_ETH_CTRL_CNT,
|
||||
ETHTOOL_A_STATS_ETH_CTRL_MAX = (__ETHTOOL_A_STATS_ETH_CTRL_CNT - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
/* etherStatsUndersizePkts */
|
||||
ETHTOOL_A_STATS_RMON_UNDERSIZE,
|
||||
/* etherStatsOversizePkts */
|
||||
ETHTOOL_A_STATS_RMON_OVERSIZE,
|
||||
/* etherStatsFragments */
|
||||
ETHTOOL_A_STATS_RMON_FRAG,
|
||||
/* etherStatsJabbers */
|
||||
ETHTOOL_A_STATS_RMON_JABBER,
|
||||
|
||||
/* add new constants above here */
|
||||
__ETHTOOL_A_STATS_RMON_CNT,
|
||||
ETHTOOL_A_STATS_RMON_MAX = (__ETHTOOL_A_STATS_RMON_CNT - 1)
|
||||
};
|
||||
|
||||
/* generic netlink info */
|
||||
#define ETHTOOL_GENL_NAME "ethtool"
|
||||
#define ETHTOOL_GENL_VERSION 1
|
||||
|
||||
@ -7,4 +7,4 @@ obj-$(CONFIG_ETHTOOL_NETLINK) += ethtool_nl.o
|
||||
ethtool_nl-y := netlink.o bitset.o strset.o linkinfo.o linkmodes.o \
|
||||
linkstate.o debug.o wol.o features.o privflags.o rings.o \
|
||||
channels.o coalesce.o pause.o eee.o tsinfo.o cabletest.o \
|
||||
tunnels.o fec.o eeprom.o
|
||||
tunnels.o fec.o eeprom.o stats.o
|
||||
|
||||
@ -247,6 +247,7 @@ ethnl_default_requests[__ETHTOOL_MSG_USER_CNT] = {
|
||||
[ETHTOOL_MSG_FEC_GET] = ðnl_fec_request_ops,
|
||||
[ETHTOOL_MSG_TSINFO_GET] = ðnl_tsinfo_request_ops,
|
||||
[ETHTOOL_MSG_MODULE_EEPROM_GET] = ðnl_module_eeprom_request_ops,
|
||||
[ETHTOOL_MSG_STATS_GET] = ðnl_stats_request_ops,
|
||||
};
|
||||
|
||||
static struct ethnl_dump_ctx *ethnl_dump_context(struct netlink_callback *cb)
|
||||
@ -942,6 +943,15 @@ static const struct genl_ops ethtool_genl_ops[] = {
|
||||
.policy = ethnl_module_eeprom_get_policy,
|
||||
.maxattr = ARRAY_SIZE(ethnl_module_eeprom_get_policy) - 1,
|
||||
},
|
||||
{
|
||||
.cmd = ETHTOOL_MSG_STATS_GET,
|
||||
.doit = ethnl_default_doit,
|
||||
.start = ethnl_default_start,
|
||||
.dumpit = ethnl_default_dumpit,
|
||||
.done = ethnl_default_done,
|
||||
.policy = ethnl_stats_get_policy,
|
||||
.maxattr = ARRAY_SIZE(ethnl_stats_get_policy) - 1,
|
||||
},
|
||||
};
|
||||
|
||||
static const struct genl_multicast_group ethtool_nl_mcgrps[] = {
|
||||
|
||||
@ -346,6 +346,7 @@ extern const struct ethnl_request_ops ethnl_eee_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_tsinfo_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_fec_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_module_eeprom_request_ops;
|
||||
extern const struct ethnl_request_ops ethnl_stats_request_ops;
|
||||
|
||||
extern const struct nla_policy ethnl_header_policy[ETHTOOL_A_HEADER_FLAGS + 1];
|
||||
extern const struct nla_policy ethnl_header_policy_stats[ETHTOOL_A_HEADER_FLAGS + 1];
|
||||
@ -380,6 +381,7 @@ extern const struct nla_policy ethnl_tunnel_info_get_policy[ETHTOOL_A_TUNNEL_INF
|
||||
extern const struct nla_policy ethnl_fec_get_policy[ETHTOOL_A_FEC_HEADER + 1];
|
||||
extern const struct nla_policy ethnl_fec_set_policy[ETHTOOL_A_FEC_AUTO + 1];
|
||||
extern const struct nla_policy ethnl_module_eeprom_get_policy[ETHTOOL_A_MODULE_EEPROM_DATA + 1];
|
||||
extern const struct nla_policy ethnl_stats_get_policy[ETHTOOL_A_STATS_GROUPS + 1];
|
||||
|
||||
int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info);
|
||||
int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info);
|
||||
@ -399,4 +401,10 @@ int ethnl_tunnel_info_start(struct netlink_callback *cb);
|
||||
int ethnl_tunnel_info_dumpit(struct sk_buff *skb, struct netlink_callback *cb);
|
||||
int ethnl_set_fec(struct sk_buff *skb, struct genl_info *info);
|
||||
|
||||
extern const char stats_std_names[__ETHTOOL_STATS_CNT][ETH_GSTRING_LEN];
|
||||
extern const char stats_eth_phy_names[__ETHTOOL_A_STATS_ETH_PHY_CNT][ETH_GSTRING_LEN];
|
||||
extern const char stats_eth_mac_names[__ETHTOOL_A_STATS_ETH_MAC_CNT][ETH_GSTRING_LEN];
|
||||
extern const char stats_eth_ctrl_names[__ETHTOOL_A_STATS_ETH_CTRL_CNT][ETH_GSTRING_LEN];
|
||||
extern const char stats_rmon_names[__ETHTOOL_A_STATS_RMON_CNT][ETH_GSTRING_LEN];
|
||||
|
||||
#endif /* _NET_ETHTOOL_NETLINK_H */
|
||||
|
||||
410
net/ethtool/stats.c
Normal file
410
net/ethtool/stats.c
Normal file
@ -0,0 +1,410 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
#include "netlink.h"
|
||||
#include "common.h"
|
||||
#include "bitset.h"
|
||||
|
||||
struct stats_req_info {
|
||||
struct ethnl_req_info base;
|
||||
DECLARE_BITMAP(stat_mask, __ETHTOOL_STATS_CNT);
|
||||
};
|
||||
|
||||
#define STATS_REQINFO(__req_base) \
|
||||
container_of(__req_base, struct stats_req_info, base)
|
||||
|
||||
struct stats_reply_data {
|
||||
struct ethnl_reply_data base;
|
||||
struct ethtool_eth_phy_stats phy_stats;
|
||||
struct ethtool_eth_mac_stats mac_stats;
|
||||
struct ethtool_eth_ctrl_stats ctrl_stats;
|
||||
struct ethtool_rmon_stats rmon_stats;
|
||||
const struct ethtool_rmon_hist_range *rmon_ranges;
|
||||
};
|
||||
|
||||
#define STATS_REPDATA(__reply_base) \
|
||||
container_of(__reply_base, struct stats_reply_data, base)
|
||||
|
||||
const char stats_std_names[__ETHTOOL_STATS_CNT][ETH_GSTRING_LEN] = {
|
||||
[ETHTOOL_STATS_ETH_PHY] = "eth-phy",
|
||||
[ETHTOOL_STATS_ETH_MAC] = "eth-mac",
|
||||
[ETHTOOL_STATS_ETH_CTRL] = "eth-ctrl",
|
||||
[ETHTOOL_STATS_RMON] = "rmon",
|
||||
};
|
||||
|
||||
const char stats_eth_phy_names[__ETHTOOL_A_STATS_ETH_PHY_CNT][ETH_GSTRING_LEN] = {
|
||||
[ETHTOOL_A_STATS_ETH_PHY_5_SYM_ERR] = "SymbolErrorDuringCarrier",
|
||||
};
|
||||
|
||||
const char stats_eth_mac_names[__ETHTOOL_A_STATS_ETH_MAC_CNT][ETH_GSTRING_LEN] = {
|
||||
[ETHTOOL_A_STATS_ETH_MAC_2_TX_PKT] = "FramesTransmittedOK",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_3_SINGLE_COL] = "SingleCollisionFrames",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_4_MULTI_COL] = "MultipleCollisionFrames",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_5_RX_PKT] = "FramesReceivedOK",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_6_FCS_ERR] = "FrameCheckSequenceErrors",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_7_ALIGN_ERR] = "AlignmentErrors",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_8_TX_BYTES] = "OctetsTransmittedOK",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_9_TX_DEFER] = "FramesWithDeferredXmissions",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_10_LATE_COL] = "LateCollisions",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_11_XS_COL] = "FramesAbortedDueToXSColls",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_12_TX_INT_ERR] = "FramesLostDueToIntMACXmitError",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_13_CS_ERR] = "CarrierSenseErrors",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_14_RX_BYTES] = "OctetsReceivedOK",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_15_RX_INT_ERR] = "FramesLostDueToIntMACRcvError",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_18_TX_MCAST] = "MulticastFramesXmittedOK",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_19_TX_BCAST] = "BroadcastFramesXmittedOK",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_20_XS_DEFER] = "FramesWithExcessiveDeferral",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_21_RX_MCAST] = "MulticastFramesReceivedOK",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_22_RX_BCAST] = "BroadcastFramesReceivedOK",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_23_IR_LEN_ERR] = "InRangeLengthErrors",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_24_OOR_LEN] = "OutOfRangeLengthField",
|
||||
[ETHTOOL_A_STATS_ETH_MAC_25_TOO_LONG_ERR] = "FrameTooLongErrors",
|
||||
};
|
||||
|
||||
const char stats_eth_ctrl_names[__ETHTOOL_A_STATS_ETH_CTRL_CNT][ETH_GSTRING_LEN] = {
|
||||
[ETHTOOL_A_STATS_ETH_CTRL_3_TX] = "MACControlFramesTransmitted",
|
||||
[ETHTOOL_A_STATS_ETH_CTRL_4_RX] = "MACControlFramesReceived",
|
||||
[ETHTOOL_A_STATS_ETH_CTRL_5_RX_UNSUP] = "UnsupportedOpcodesReceived",
|
||||
};
|
||||
|
||||
const char stats_rmon_names[__ETHTOOL_A_STATS_RMON_CNT][ETH_GSTRING_LEN] = {
|
||||
[ETHTOOL_A_STATS_RMON_UNDERSIZE] = "etherStatsUndersizePkts",
|
||||
[ETHTOOL_A_STATS_RMON_OVERSIZE] = "etherStatsOversizePkts",
|
||||
[ETHTOOL_A_STATS_RMON_FRAG] = "etherStatsFragments",
|
||||
[ETHTOOL_A_STATS_RMON_JABBER] = "etherStatsJabbers",
|
||||
};
|
||||
|
||||
const struct nla_policy ethnl_stats_get_policy[ETHTOOL_A_STATS_GROUPS + 1] = {
|
||||
[ETHTOOL_A_STATS_HEADER] =
|
||||
NLA_POLICY_NESTED(ethnl_header_policy),
|
||||
[ETHTOOL_A_STATS_GROUPS] = { .type = NLA_NESTED },
|
||||
};
|
||||
|
||||
static int stats_parse_request(struct ethnl_req_info *req_base,
|
||||
struct nlattr **tb,
|
||||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
struct stats_req_info *req_info = STATS_REQINFO(req_base);
|
||||
bool mod = false;
|
||||
int err;
|
||||
|
||||
err = ethnl_update_bitset(req_info->stat_mask, __ETHTOOL_STATS_CNT,
|
||||
tb[ETHTOOL_A_STATS_GROUPS], stats_std_names,
|
||||
extack, &mod);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (!mod) {
|
||||
NL_SET_ERR_MSG(extack, "no stats requested");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stats_prepare_data(const struct ethnl_req_info *req_base,
|
||||
struct ethnl_reply_data *reply_base,
|
||||
struct genl_info *info)
|
||||
{
|
||||
const struct stats_req_info *req_info = STATS_REQINFO(req_base);
|
||||
struct stats_reply_data *data = STATS_REPDATA(reply_base);
|
||||
struct net_device *dev = reply_base->dev;
|
||||
int ret;
|
||||
|
||||
ret = ethnl_ops_begin(dev);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
memset(&data->phy_stats, 0xff, sizeof(data->phy_stats));
|
||||
memset(&data->mac_stats, 0xff, sizeof(data->mac_stats));
|
||||
memset(&data->ctrl_stats, 0xff, sizeof(data->mac_stats));
|
||||
memset(&data->rmon_stats, 0xff, sizeof(data->rmon_stats));
|
||||
|
||||
if (test_bit(ETHTOOL_STATS_ETH_PHY, req_info->stat_mask) &&
|
||||
dev->ethtool_ops->get_eth_phy_stats)
|
||||
dev->ethtool_ops->get_eth_phy_stats(dev, &data->phy_stats);
|
||||
if (test_bit(ETHTOOL_STATS_ETH_MAC, req_info->stat_mask) &&
|
||||
dev->ethtool_ops->get_eth_mac_stats)
|
||||
dev->ethtool_ops->get_eth_mac_stats(dev, &data->mac_stats);
|
||||
if (test_bit(ETHTOOL_STATS_ETH_CTRL, req_info->stat_mask) &&
|
||||
dev->ethtool_ops->get_eth_ctrl_stats)
|
||||
dev->ethtool_ops->get_eth_ctrl_stats(dev, &data->ctrl_stats);
|
||||
if (test_bit(ETHTOOL_STATS_RMON, req_info->stat_mask) &&
|
||||
dev->ethtool_ops->get_rmon_stats)
|
||||
dev->ethtool_ops->get_rmon_stats(dev, &data->rmon_stats,
|
||||
&data->rmon_ranges);
|
||||
|
||||
ethnl_ops_complete(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stats_reply_size(const struct ethnl_req_info *req_base,
|
||||
const struct ethnl_reply_data *reply_base)
|
||||
{
|
||||
const struct stats_req_info *req_info = STATS_REQINFO(req_base);
|
||||
unsigned int n_grps = 0, n_stats = 0;
|
||||
int len = 0;
|
||||
|
||||
if (test_bit(ETHTOOL_STATS_ETH_PHY, req_info->stat_mask)) {
|
||||
n_stats += sizeof(struct ethtool_eth_phy_stats) / sizeof(u64);
|
||||
n_grps++;
|
||||
}
|
||||
if (test_bit(ETHTOOL_STATS_ETH_MAC, req_info->stat_mask)) {
|
||||
n_stats += sizeof(struct ethtool_eth_mac_stats) / sizeof(u64);
|
||||
n_grps++;
|
||||
}
|
||||
if (test_bit(ETHTOOL_STATS_ETH_CTRL, req_info->stat_mask)) {
|
||||
n_stats += sizeof(struct ethtool_eth_ctrl_stats) / sizeof(u64);
|
||||
n_grps++;
|
||||
}
|
||||
if (test_bit(ETHTOOL_STATS_RMON, req_info->stat_mask)) {
|
||||
n_stats += sizeof(struct ethtool_rmon_stats) / sizeof(u64);
|
||||
n_grps++;
|
||||
/* Above includes the space for _A_STATS_GRP_HIST_VALs */
|
||||
|
||||
len += (nla_total_size(0) + /* _A_STATS_GRP_HIST */
|
||||
nla_total_size(4) + /* _A_STATS_GRP_HIST_BKT_LOW */
|
||||
nla_total_size(4)) * /* _A_STATS_GRP_HIST_BKT_HI */
|
||||
ETHTOOL_RMON_HIST_MAX * 2;
|
||||
}
|
||||
|
||||
len += n_grps * (nla_total_size(0) + /* _A_STATS_GRP */
|
||||
nla_total_size(4) + /* _A_STATS_GRP_ID */
|
||||
nla_total_size(4)); /* _A_STATS_GRP_SS_ID */
|
||||
len += n_stats * (nla_total_size(0) + /* _A_STATS_GRP_STAT */
|
||||
nla_total_size_64bit(sizeof(u64)));
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
static int stat_put(struct sk_buff *skb, u16 attrtype, u64 val)
|
||||
{
|
||||
struct nlattr *nest;
|
||||
int ret;
|
||||
|
||||
if (val == ETHTOOL_STAT_NOT_SET)
|
||||
return 0;
|
||||
|
||||
/* We want to start stats attr types from 0, so we don't have a type
|
||||
* for pad inside ETHTOOL_A_STATS_GRP_STAT. Pad things on the outside
|
||||
* of ETHTOOL_A_STATS_GRP_STAT. Since we're one nest away from the
|
||||
* actual attr we're 4B off - nla_need_padding_for_64bit() & co.
|
||||
* can't be used.
|
||||
*/
|
||||
#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
|
||||
if (!IS_ALIGNED((unsigned long)skb_tail_pointer(skb), 8))
|
||||
if (!nla_reserve(skb, ETHTOOL_A_STATS_GRP_PAD, 0))
|
||||
return -EMSGSIZE;
|
||||
#endif
|
||||
|
||||
nest = nla_nest_start(skb, ETHTOOL_A_STATS_GRP_STAT);
|
||||
if (!nest)
|
||||
return -EMSGSIZE;
|
||||
|
||||
ret = nla_put_u64_64bit(skb, attrtype, val, -1 /* not used */);
|
||||
if (ret) {
|
||||
nla_nest_cancel(skb, nest);
|
||||
return ret;
|
||||
}
|
||||
|
||||
nla_nest_end(skb, nest);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stats_put_phy_stats(struct sk_buff *skb,
|
||||
const struct stats_reply_data *data)
|
||||
{
|
||||
if (stat_put(skb, ETHTOOL_A_STATS_ETH_PHY_5_SYM_ERR,
|
||||
data->phy_stats.SymbolErrorDuringCarrier))
|
||||
return -EMSGSIZE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stats_put_mac_stats(struct sk_buff *skb,
|
||||
const struct stats_reply_data *data)
|
||||
{
|
||||
if (stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_2_TX_PKT,
|
||||
data->mac_stats.FramesTransmittedOK) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_3_SINGLE_COL,
|
||||
data->mac_stats.SingleCollisionFrames) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_4_MULTI_COL,
|
||||
data->mac_stats.MultipleCollisionFrames) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_5_RX_PKT,
|
||||
data->mac_stats.FramesReceivedOK) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_6_FCS_ERR,
|
||||
data->mac_stats.FrameCheckSequenceErrors) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_7_ALIGN_ERR,
|
||||
data->mac_stats.AlignmentErrors) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_8_TX_BYTES,
|
||||
data->mac_stats.OctetsTransmittedOK) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_9_TX_DEFER,
|
||||
data->mac_stats.FramesWithDeferredXmissions) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_10_LATE_COL,
|
||||
data->mac_stats.LateCollisions) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_11_XS_COL,
|
||||
data->mac_stats.FramesAbortedDueToXSColls) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_12_TX_INT_ERR,
|
||||
data->mac_stats.FramesLostDueToIntMACXmitError) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_13_CS_ERR,
|
||||
data->mac_stats.CarrierSenseErrors) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_14_RX_BYTES,
|
||||
data->mac_stats.OctetsReceivedOK) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_15_RX_INT_ERR,
|
||||
data->mac_stats.FramesLostDueToIntMACRcvError) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_18_TX_MCAST,
|
||||
data->mac_stats.MulticastFramesXmittedOK) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_19_TX_BCAST,
|
||||
data->mac_stats.BroadcastFramesXmittedOK) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_20_XS_DEFER,
|
||||
data->mac_stats.FramesWithExcessiveDeferral) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_21_RX_MCAST,
|
||||
data->mac_stats.MulticastFramesReceivedOK) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_22_RX_BCAST,
|
||||
data->mac_stats.BroadcastFramesReceivedOK) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_23_IR_LEN_ERR,
|
||||
data->mac_stats.InRangeLengthErrors) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_24_OOR_LEN,
|
||||
data->mac_stats.OutOfRangeLengthField) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_25_TOO_LONG_ERR,
|
||||
data->mac_stats.FrameTooLongErrors))
|
||||
return -EMSGSIZE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stats_put_ctrl_stats(struct sk_buff *skb,
|
||||
const struct stats_reply_data *data)
|
||||
{
|
||||
if (stat_put(skb, ETHTOOL_A_STATS_ETH_CTRL_3_TX,
|
||||
data->ctrl_stats.MACControlFramesTransmitted) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_CTRL_4_RX,
|
||||
data->ctrl_stats.MACControlFramesReceived) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_ETH_CTRL_5_RX_UNSUP,
|
||||
data->ctrl_stats.UnsupportedOpcodesReceived))
|
||||
return -EMSGSIZE;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stats_put_rmon_hist(struct sk_buff *skb, u32 attr, const u64 *hist,
|
||||
const struct ethtool_rmon_hist_range *ranges)
|
||||
{
|
||||
struct nlattr *nest;
|
||||
int i;
|
||||
|
||||
if (!ranges)
|
||||
return 0;
|
||||
|
||||
for (i = 0; i < ETHTOOL_RMON_HIST_MAX; i++) {
|
||||
if (!ranges[i].low && !ranges[i].high)
|
||||
break;
|
||||
if (hist[i] == ETHTOOL_STAT_NOT_SET)
|
||||
continue;
|
||||
|
||||
nest = nla_nest_start(skb, attr);
|
||||
if (!nest)
|
||||
return -EMSGSIZE;
|
||||
|
||||
if (nla_put_u32(skb, ETHTOOL_A_STATS_GRP_HIST_BKT_LOW,
|
||||
ranges[i].low) ||
|
||||
nla_put_u32(skb, ETHTOOL_A_STATS_GRP_HIST_BKT_HI,
|
||||
ranges[i].high) ||
|
||||
nla_put_u64_64bit(skb, ETHTOOL_A_STATS_GRP_HIST_VAL,
|
||||
hist[i], ETHTOOL_A_STATS_GRP_PAD))
|
||||
goto err_cancel_hist;
|
||||
|
||||
nla_nest_end(skb, nest);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_cancel_hist:
|
||||
nla_nest_cancel(skb, nest);
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
|
||||
static int stats_put_rmon_stats(struct sk_buff *skb,
|
||||
const struct stats_reply_data *data)
|
||||
{
|
||||
if (stats_put_rmon_hist(skb, ETHTOOL_A_STATS_GRP_HIST_RX,
|
||||
data->rmon_stats.hist, data->rmon_ranges) ||
|
||||
stats_put_rmon_hist(skb, ETHTOOL_A_STATS_GRP_HIST_TX,
|
||||
data->rmon_stats.hist_tx, data->rmon_ranges))
|
||||
return -EMSGSIZE;
|
||||
|
||||
if (stat_put(skb, ETHTOOL_A_STATS_RMON_UNDERSIZE,
|
||||
data->rmon_stats.undersize_pkts) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_RMON_OVERSIZE,
|
||||
data->rmon_stats.oversize_pkts) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_RMON_FRAG,
|
||||
data->rmon_stats.fragments) ||
|
||||
stat_put(skb, ETHTOOL_A_STATS_RMON_JABBER,
|
||||
data->rmon_stats.jabbers))
|
||||
return -EMSGSIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stats_put_stats(struct sk_buff *skb,
|
||||
const struct stats_reply_data *data,
|
||||
u32 id, u32 ss_id,
|
||||
int (*cb)(struct sk_buff *skb,
|
||||
const struct stats_reply_data *data))
|
||||
{
|
||||
struct nlattr *nest;
|
||||
|
||||
nest = nla_nest_start(skb, ETHTOOL_A_STATS_GRP);
|
||||
if (!nest)
|
||||
return -EMSGSIZE;
|
||||
|
||||
if (nla_put_u32(skb, ETHTOOL_A_STATS_GRP_ID, id) ||
|
||||
nla_put_u32(skb, ETHTOOL_A_STATS_GRP_SS_ID, ss_id))
|
||||
goto err_cancel;
|
||||
|
||||
if (cb(skb, data))
|
||||
goto err_cancel;
|
||||
|
||||
nla_nest_end(skb, nest);
|
||||
return 0;
|
||||
|
||||
err_cancel:
|
||||
nla_nest_cancel(skb, nest);
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
|
||||
static int stats_fill_reply(struct sk_buff *skb,
|
||||
const struct ethnl_req_info *req_base,
|
||||
const struct ethnl_reply_data *reply_base)
|
||||
{
|
||||
const struct stats_req_info *req_info = STATS_REQINFO(req_base);
|
||||
const struct stats_reply_data *data = STATS_REPDATA(reply_base);
|
||||
int ret = 0;
|
||||
|
||||
if (!ret && test_bit(ETHTOOL_STATS_ETH_PHY, req_info->stat_mask))
|
||||
ret = stats_put_stats(skb, data, ETHTOOL_STATS_ETH_PHY,
|
||||
ETH_SS_STATS_ETH_PHY,
|
||||
stats_put_phy_stats);
|
||||
if (!ret && test_bit(ETHTOOL_STATS_ETH_MAC, req_info->stat_mask))
|
||||
ret = stats_put_stats(skb, data, ETHTOOL_STATS_ETH_MAC,
|
||||
ETH_SS_STATS_ETH_MAC,
|
||||
stats_put_mac_stats);
|
||||
if (!ret && test_bit(ETHTOOL_STATS_ETH_CTRL, req_info->stat_mask))
|
||||
ret = stats_put_stats(skb, data, ETHTOOL_STATS_ETH_CTRL,
|
||||
ETH_SS_STATS_ETH_CTRL,
|
||||
stats_put_ctrl_stats);
|
||||
if (!ret && test_bit(ETHTOOL_STATS_RMON, req_info->stat_mask))
|
||||
ret = stats_put_stats(skb, data, ETHTOOL_STATS_RMON,
|
||||
ETH_SS_STATS_RMON, stats_put_rmon_stats);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
const struct ethnl_request_ops ethnl_stats_request_ops = {
|
||||
.request_cmd = ETHTOOL_MSG_STATS_GET,
|
||||
.reply_cmd = ETHTOOL_MSG_STATS_GET_REPLY,
|
||||
.hdr_attr = ETHTOOL_A_STATS_HEADER,
|
||||
.req_info_size = sizeof(struct stats_req_info),
|
||||
.reply_data_size = sizeof(struct stats_reply_data),
|
||||
|
||||
.parse_request = stats_parse_request,
|
||||
.prepare_data = stats_prepare_data,
|
||||
.reply_size = stats_reply_size,
|
||||
.fill_reply = stats_fill_reply,
|
||||
};
|
||||
@ -80,6 +80,31 @@ static const struct strset_info info_template[] = {
|
||||
.count = __ETHTOOL_UDP_TUNNEL_TYPE_CNT,
|
||||
.strings = udp_tunnel_type_names,
|
||||
},
|
||||
[ETH_SS_STATS_STD] = {
|
||||
.per_dev = false,
|
||||
.count = __ETHTOOL_STATS_CNT,
|
||||
.strings = stats_std_names,
|
||||
},
|
||||
[ETH_SS_STATS_ETH_PHY] = {
|
||||
.per_dev = false,
|
||||
.count = __ETHTOOL_A_STATS_ETH_PHY_CNT,
|
||||
.strings = stats_eth_phy_names,
|
||||
},
|
||||
[ETH_SS_STATS_ETH_MAC] = {
|
||||
.per_dev = false,
|
||||
.count = __ETHTOOL_A_STATS_ETH_MAC_CNT,
|
||||
.strings = stats_eth_mac_names,
|
||||
},
|
||||
[ETH_SS_STATS_ETH_CTRL] = {
|
||||
.per_dev = false,
|
||||
.count = __ETHTOOL_A_STATS_ETH_CTRL_CNT,
|
||||
.strings = stats_eth_ctrl_names,
|
||||
},
|
||||
[ETH_SS_STATS_RMON] = {
|
||||
.per_dev = false,
|
||||
.count = __ETHTOOL_A_STATS_RMON_CNT,
|
||||
.strings = stats_rmon_names,
|
||||
},
|
||||
};
|
||||
|
||||
struct strset_req_info {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user