net: ethernet: ti: icssg: guard PA stat lookups
PATCH v2 1/1 net: ethernet: ti: icssg: guard PA stat lookups
From: Philippe Schenker <[email protected]>
icssg_ndo_get_stats64() unconditionally calls emac_get_stat_by_name() with FW PA stat names regardless of whether the PA stats block is present on the hardware. emac_get_stat_by_name() already guards the PA stats lookup with if (emac->prueth->pa_stats); when that pointer is NULL the lookup falls through to netdev_err() and returns -EINVAL. Because ndo_get_stats64 is polled regularly by the networking stack this produces thousands of log entries of the form:
icssg-prueth icssg1-eth end0: Invalid stats FW_RX_ERROR
A secondary consequence is that the int(-EINVAL) return value is implicitly widened to a near-ULLONG_MAX unsigned value when accumulated into the __u64 fields of rtnl_link_stats64, silently corrupting the rx_errors, rx_dropped and tx_dropped counters reported by ip -s link.
Every other PA-aware code path in the driver is already guarded with the same if (emac->prueth->pa_stats) check. Apply the same guard here.
---
Changes in v2:
- Removed newline between Fixes tag and Signed-off-by
- Use return in if statement to guard so we get rid of the 80 char warnings.
- Added Simon's Reviewed-by. Thanks!
drivers/net/ethernet/ti/icssg/icssg_common.c | 49 +++++++++++--------- 1 file changed, 28 insertions(+), 21 deletions(-)
drivers/net/ethernet/ti/icssg/icssg_common.c +28 -21
@@ -1628,28 +1628,35 @@ void icssg_ndo_get_stats64(struct net_device *ndev, stats->rx_over_errors =emac_get_stat_by_name (emac,"rx_over_errors" ); stats->multicast =emac_get_stat_by_name (emac,"rx_multicast_frames" ); - stats->rx_errors = ndev->stats.rx_errors + -emac_get_stat_by_name (emac,"FW_RX_ERROR" ) + -emac_get_stat_by_name (emac,"FW_RX_EOF_SHORT_FRMERR" ) + -emac_get_stat_by_name (emac,"FW_RX_B0_DROP_EARLY_EOF" ) + -emac_get_stat_by_name (emac,"FW_RX_EXP_FRAG_Q_DROP" ) + -emac_get_stat_by_name (emac,"FW_RX_FIFO_OVERRUN" ); - stats->rx_dropped = ndev->stats.rx_dropped + -emac_get_stat_by_name (emac,"FW_DROPPED_PKT" ) + -emac_get_stat_by_name (emac,"FW_INF_PORT_DISABLED" ) + -emac_get_stat_by_name (emac,"FW_INF_SAV" ) + -emac_get_stat_by_name (emac,"FW_INF_SA_DL" ) + -emac_get_stat_by_name (emac,"FW_INF_PORT_BLOCKED" ) + -emac_get_stat_by_name (emac,"FW_INF_DROP_TAGGED" ) + -emac_get_stat_by_name (emac,"FW_INF_DROP_PRIOTAGGED" ) + -emac_get_stat_by_name (emac,"FW_INF_DROP_NOTAG" ) + -emac_get_stat_by_name (emac,"FW_INF_DROP_NOTMEMBER" ); + stats->rx_errors = ndev->stats.rx_errors; + stats->rx_dropped = ndev->stats.rx_dropped; stats->tx_errors = ndev->stats.tx_errors; - stats->tx_dropped = ndev->stats.tx_dropped + -emac_get_stat_by_name (emac,"FW_RTU_PKT_DROP" ) + -emac_get_stat_by_name (emac,"FW_TX_DROPPED_PACKET" ) + -emac_get_stat_by_name (emac,"FW_TX_TS_DROPPED_PACKET" ) + -emac_get_stat_by_name (emac,"FW_TX_JUMBO_FRM_CUTOFF" ); + stats->tx_dropped = ndev->stats.tx_dropped; + +if (!emac->prueth->pa_stats) +return ; + + stats->rx_errors += +emac_get_stat_by_name (emac,"FW_RX_ERROR" ) + +emac_get_stat_by_name (emac,"FW_RX_EOF_SHORT_FRMERR" ) + +emac_get_stat_by_name (emac,"FW_RX_B0_DROP_EARLY_EOF" ) + +emac_get_stat_by_name (emac,"FW_RX_EXP_FRAG_Q_DROP" ) + +emac_get_stat_by_name (emac,"FW_RX_FIFO_OVERRUN" ); + stats->rx_dropped += +emac_get_stat_by_name (emac,"FW_DROPPED_PKT" ) + +emac_get_stat_by_name (emac,"FW_INF_PORT_DISABLED" ) + +emac_get_stat_by_name (emac,"FW_INF_SAV" ) + +emac_get_stat_by_name (emac,"FW_INF_SA_DL" ) + +emac_get_stat_by_name (emac,"FW_INF_PORT_BLOCKED" ) + +emac_get_stat_by_name (emac,"FW_INF_DROP_TAGGED" ) + +emac_get_stat_by_name (emac,"FW_INF_DROP_PRIOTAGGED" ) + +emac_get_stat_by_name (emac,"FW_INF_DROP_NOTAG" ) + +emac_get_stat_by_name (emac,"FW_INF_DROP_NOTMEMBER" ); + stats->tx_dropped += +emac_get_stat_by_name (emac,"FW_RTU_PKT_DROP" ) + +emac_get_stat_by_name (emac,"FW_TX_DROPPED_PACKET" ) + +emac_get_stat_by_name (emac,"FW_TX_TS_DROPPED_PACKET" ) + +emac_get_stat_by_name (emac,"FW_TX_JUMBO_FRM_CUTOFF" ); }EXPORT_SYMBOL_GPL (icssg_ndo_get_stats64);
Signature · 4 lines
2.54.0 base-commit: 8cd9520d35a6c38db6567e97dd93b1f11f185dc6 branch: fix-icssg_common-pa-stats-errors__master-7-1
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Thu, 18 Jun 2026 11:30:24 +0200 you wrote:
From: Philippe Schenker <[email protected]>
icssg_ndo_get_stats64()unconditionally callsemac_get_stat_by_name()with FW PA stat names regardless of whether the PA stats block is present on the hardware.emac_get_stat_by_name()already guards the PA stats lookup withif (emac->prueth->pa_stats); when that pointer is NULL the lookup falls through tonetdev_err()and returns-EINVAL. Becausendo_get_stats64is polled regularly by the networking stack this produces thousands of log entries of the form:[...]
Here is the summary with links:
- [net,v2] net: ethernet: ti: icssg: guard PA stat lookups
https://git.kernel.org/netdev/net/c/27b9daba5060
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html