When running "ethtool -S eno0 --groups rmon" without an explicit "--src
emac|pmac" argument, the kernel will not report
rx-rmon-etherStatsPkts64to64Octets, rx-rmon-etherStatsPkts65to127Octets,
etc. This is because on ETHTOOL_MAC_STATS_SRC_AGGREGATE, we do not
populate the "ranges" argument.
ocelot_port_get_rmon_stats() does things differently and things work
there. I had forgotten to make sure that the code is structured the same
way in both drivers, so do that now.
Fixes: cf52bd238b75 ("net: enetc: add support for MAC Merge statistics counters")
Signed-off-by: Vladimir Oltean <[email protected]>
---
drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
index bca68edfbe9c..da9d4b310fcd 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
@@ -370,8 +370,7 @@ static const struct ethtool_rmon_hist_range enetc_rmon_ranges[] = {
};
static void enetc_rmon_stats(struct enetc_hw *hw, int mac,
- struct ethtool_rmon_stats *s,
- const struct ethtool_rmon_hist_range **ranges)
+ struct ethtool_rmon_stats *s)
{
s->undersize_pkts = enetc_port_rd(hw, ENETC_PM_RUND(mac));
s->oversize_pkts = enetc_port_rd(hw, ENETC_PM_ROVR(mac));
@@ -393,8 +392,6 @@ static void enetc_rmon_stats(struct enetc_hw *hw, int mac,
s->hist_tx[4] = enetc_port_rd(hw, ENETC_PM_T1023(mac));
s->hist_tx[5] = enetc_port_rd(hw, ENETC_PM_T1522(mac));
s->hist_tx[6] = enetc_port_rd(hw, ENETC_PM_T1523X(mac));
-
- *ranges = enetc_rmon_ranges;
}
static void enetc_get_eth_mac_stats(struct net_device *ndev,
@@ -447,13 +444,15 @@ static void enetc_get_rmon_stats(struct net_device *ndev,
struct enetc_hw *hw = &priv->si->hw;
struct enetc_si *si = priv->si;
+ *ranges = enetc_rmon_ranges;
+
switch (rmon_stats->src) {
case ETHTOOL_MAC_STATS_SRC_EMAC:
- enetc_rmon_stats(hw, 0, rmon_stats, ranges);
+ enetc_rmon_stats(hw, 0, rmon_stats);
break;
case ETHTOOL_MAC_STATS_SRC_PMAC:
if (si->hw_features & ENETC_SI_F_QBU)
- enetc_rmon_stats(hw, 1, rmon_stats, ranges);
+ enetc_rmon_stats(hw, 1, rmon_stats);
break;
case ETHTOOL_MAC_STATS_SRC_AGGREGATE:
ethtool_aggregate_rmon_stats(ndev, rmon_stats);
--
2.34.1
On Wed, Mar 22, 2023 at 01:28:31AM +0200, Vladimir Oltean wrote:
> When running "ethtool -S eno0 --groups rmon" without an explicit "--src
> emac|pmac" argument, the kernel will not report
> rx-rmon-etherStatsPkts64to64Octets, rx-rmon-etherStatsPkts65to127Octets,
> etc. This is because on ETHTOOL_MAC_STATS_SRC_AGGREGATE, we do not
> populate the "ranges" argument.
>
> ocelot_port_get_rmon_stats() does things differently and things work
> there. I had forgotten to make sure that the code is structured the same
> way in both drivers, so do that now.
>
> Fixes: cf52bd238b75 ("net: enetc: add support for MAC Merge statistics counters")
> Signed-off-by: Vladimir Oltean <[email protected]>
This feels a bit more like an enhancement than a fix to me,
but I don't feel strongly about it.
Reviewed-by: Simon Horman <[email protected]>
On Wed, Mar 22, 2023 at 05:46:53PM +0100, Simon Horman wrote:
> This feels a bit more like an enhancement than a fix to me,
> but I don't feel strongly about it.
How so?
Since commit 38b922c91227 ("net: enetc: expose some standardized ethtool
counters") - merged in kernel v6.1 - the user could run this command and
see this output:
$ ethtool -S eno0 --groups rmon
Standard stats for eno0:
rmon-etherStatsUndersizePkts: 0
rmon-etherStatsOversizePkts: 0
rmon-etherStatsFragments: 0
rmon-etherStatsJabbers: 0
rx-rmon-etherStatsPkts64to64Octets: 0
rx-rmon-etherStatsPkts65to127Octets: 0
rx-rmon-etherStatsPkts128to255Octets: 0
rx-rmon-etherStatsPkts256to511Octets: 0
rx-rmon-etherStatsPkts512to1023Octets: 0
rx-rmon-etherStatsPkts1024to1522Octets: 0
rx-rmon-etherStatsPkts1523to9600Octets: 0
tx-rmon-etherStatsPkts64to64Octets: 0
tx-rmon-etherStatsPkts65to127Octets: 0
tx-rmon-etherStatsPkts128to255Octets: 0
tx-rmon-etherStatsPkts256to511Octets: 0
tx-rmon-etherStatsPkts512to1023Octets: 0
tx-rmon-etherStatsPkts1024to1522Octets: 0
tx-rmon-etherStatsPkts1523to9600Octets: 0
After the blamed commit - merged in the v6.3 release candidates - the
same command produces the following output:
$ ethtool -S eno0 --groups rmon
Standard stats for eno0:
rmon-etherStatsUndersizePkts: 0
rmon-etherStatsOversizePkts: 0
rmon-etherStatsFragments: 0
rmon-etherStatsJabbers: 0
So why is this an enhancement?
On Wed, Mar 22, 2023 at 06:51:26PM +0200, Vladimir Oltean wrote:
> On Wed, Mar 22, 2023 at 05:46:53PM +0100, Simon Horman wrote:
> > This feels a bit more like an enhancement than a fix to me,
> > but I don't feel strongly about it.
>
> How so?
>
> Since commit 38b922c91227 ("net: enetc: expose some standardized ethtool
> counters") - merged in kernel v6.1 - the user could run this command and
> see this output:
>
> $ ethtool -S eno0 --groups rmon
> Standard stats for eno0:
> rmon-etherStatsUndersizePkts: 0
> rmon-etherStatsOversizePkts: 0
> rmon-etherStatsFragments: 0
> rmon-etherStatsJabbers: 0
> rx-rmon-etherStatsPkts64to64Octets: 0
> rx-rmon-etherStatsPkts65to127Octets: 0
> rx-rmon-etherStatsPkts128to255Octets: 0
> rx-rmon-etherStatsPkts256to511Octets: 0
> rx-rmon-etherStatsPkts512to1023Octets: 0
> rx-rmon-etherStatsPkts1024to1522Octets: 0
> rx-rmon-etherStatsPkts1523to9600Octets: 0
> tx-rmon-etherStatsPkts64to64Octets: 0
> tx-rmon-etherStatsPkts65to127Octets: 0
> tx-rmon-etherStatsPkts128to255Octets: 0
> tx-rmon-etherStatsPkts256to511Octets: 0
> tx-rmon-etherStatsPkts512to1023Octets: 0
> tx-rmon-etherStatsPkts1024to1522Octets: 0
> tx-rmon-etherStatsPkts1523to9600Octets: 0
>
> After the blamed commit - merged in the v6.3 release candidates - the
> same command produces the following output:
>
> $ ethtool -S eno0 --groups rmon
> Standard stats for eno0:
> rmon-etherStatsUndersizePkts: 0
> rmon-etherStatsOversizePkts: 0
> rmon-etherStatsFragments: 0
> rmon-etherStatsJabbers: 0
>
> So why is this an enhancement?
My understanding was incorrect.
I now agree it is a fix.
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
On Wed, 22 Mar 2023 01:28:31 +0200 you wrote:
> When running "ethtool -S eno0 --groups rmon" without an explicit "--src
> emac|pmac" argument, the kernel will not report
> rx-rmon-etherStatsPkts64to64Octets, rx-rmon-etherStatsPkts65to127Octets,
> etc. This is because on ETHTOOL_MAC_STATS_SRC_AGGREGATE, we do not
> populate the "ranges" argument.
>
> ocelot_port_get_rmon_stats() does things differently and things work
> there. I had forgotten to make sure that the code is structured the same
> way in both drivers, so do that now.
>
> [...]
Here is the summary with links:
- [net] net: enetc: fix aggregate RMON counters not showing the ranges
https://git.kernel.org/netdev/net/c/c79493c3ccf0
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html