diff mbox series

[net-next] net: cadence: macb: Synchronize standard stats

Message ID 20250303231832.1648274-1-sean.anderson@linux.dev (mailing list archive)
State New
Delegated to: Netdev Maintainers
Headers show
Series [net-next] net: cadence: macb: Synchronize standard stats | expand

Checks

Context Check Description
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 8 of 8 maintainers
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 22 this patch: 22
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 96 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest fail net-next-2025-03-04--03-00 (tests: 893)

Commit Message

Sean Anderson March 3, 2025, 11:18 p.m. UTC 
The new stats calculations add several additional calls to
macb/gem_update_stats() and accesses to bp->hw_stats. These are
protected by a spinlock since commit fa52f15c745c ("net: cadence: macb:
Synchronize stats calculations"), which was applied in parallel. Add
some locking now that the net has been merged into net-next.

Fixes: f6af690a295a ("net: cadence: macb: Report standard stats")
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
---

 drivers/net/ethernet/cadence/macb_main.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
diff mbox series

Patch

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 6c462de81f20..b5797c1ac0a4 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3253,9 +3253,11 @@  static void macb_get_pause_stats(struct net_device *dev,
 	struct macb *bp = netdev_priv(dev);
 	struct macb_stats *hwstat = &bp->hw_stats.macb;
 
+	spin_lock_irq(&bp->stats_lock);
 	macb_update_stats(bp);
 	pause_stats->tx_pause_frames = hwstat->tx_pause_frames;
 	pause_stats->rx_pause_frames = hwstat->rx_pause_frames;
+	spin_unlock_irq(&bp->stats_lock);
 }
 
 static void gem_get_pause_stats(struct net_device *dev,
@@ -3264,9 +3266,11 @@  static void gem_get_pause_stats(struct net_device *dev,
 	struct macb *bp = netdev_priv(dev);
 	struct gem_stats *hwstat = &bp->hw_stats.gem;
 
+	spin_lock_irq(&bp->stats_lock);
 	gem_update_stats(bp);
 	pause_stats->tx_pause_frames = hwstat->tx_pause_frames;
 	pause_stats->rx_pause_frames = hwstat->rx_pause_frames;
+	spin_unlock_irq(&bp->stats_lock);
 }
 
 static void macb_get_eth_mac_stats(struct net_device *dev,
@@ -3275,6 +3279,7 @@  static void macb_get_eth_mac_stats(struct net_device *dev,
 	struct macb *bp = netdev_priv(dev);
 	struct macb_stats *hwstat = &bp->hw_stats.macb;
 
+	spin_lock_irq(&bp->stats_lock);
 	macb_update_stats(bp);
 	mac_stats->FramesTransmittedOK = hwstat->tx_ok;
 	mac_stats->SingleCollisionFrames = hwstat->tx_single_cols;
@@ -3290,6 +3295,7 @@  static void macb_get_eth_mac_stats(struct net_device *dev,
 	mac_stats->FramesLostDueToIntMACRcvError = hwstat->rx_overruns;
 	mac_stats->InRangeLengthErrors = hwstat->rx_length_mismatch;
 	mac_stats->FrameTooLongErrors = hwstat->rx_oversize_pkts;
+	spin_unlock_irq(&bp->stats_lock);
 }
 
 static void gem_get_eth_mac_stats(struct net_device *dev,
@@ -3298,6 +3304,7 @@  static void gem_get_eth_mac_stats(struct net_device *dev,
 	struct macb *bp = netdev_priv(dev);
 	struct gem_stats *hwstat = &bp->hw_stats.gem;
 
+	spin_lock_irq(&bp->stats_lock);
 	gem_update_stats(bp);
 	mac_stats->FramesTransmittedOK = hwstat->tx_frames;
 	mac_stats->SingleCollisionFrames = hwstat->tx_single_collision_frames;
@@ -3320,6 +3327,7 @@  static void gem_get_eth_mac_stats(struct net_device *dev,
 	mac_stats->BroadcastFramesReceivedOK = hwstat->rx_broadcast_frames;
 	mac_stats->InRangeLengthErrors = hwstat->rx_length_field_frame_errors;
 	mac_stats->FrameTooLongErrors = hwstat->rx_oversize_frames;
+	spin_unlock_irq(&bp->stats_lock);
 }
 
 /* TODO: Report SQE test errors when added to phy_stats */
@@ -3329,8 +3337,10 @@  static void macb_get_eth_phy_stats(struct net_device *dev,
 	struct macb *bp = netdev_priv(dev);
 	struct macb_stats *hwstat = &bp->hw_stats.macb;
 
+	spin_lock_irq(&bp->stats_lock);
 	macb_update_stats(bp);
 	phy_stats->SymbolErrorDuringCarrier = hwstat->rx_symbol_errors;
+	spin_unlock_irq(&bp->stats_lock);
 }
 
 static void gem_get_eth_phy_stats(struct net_device *dev,
@@ -3339,8 +3349,10 @@  static void gem_get_eth_phy_stats(struct net_device *dev,
 	struct macb *bp = netdev_priv(dev);
 	struct gem_stats *hwstat = &bp->hw_stats.gem;
 
+	spin_lock_irq(&bp->stats_lock);
 	gem_update_stats(bp);
 	phy_stats->SymbolErrorDuringCarrier = hwstat->rx_symbol_errors;
+	spin_unlock_irq(&bp->stats_lock);
 }
 
 static void macb_get_rmon_stats(struct net_device *dev,
@@ -3350,10 +3362,12 @@  static void macb_get_rmon_stats(struct net_device *dev,
 	struct macb *bp = netdev_priv(dev);
 	struct macb_stats *hwstat = &bp->hw_stats.macb;
 
+	spin_lock_irq(&bp->stats_lock);
 	macb_update_stats(bp);
 	rmon_stats->undersize_pkts = hwstat->rx_undersize_pkts;
 	rmon_stats->oversize_pkts = hwstat->rx_oversize_pkts;
 	rmon_stats->jabbers = hwstat->rx_jabbers;
+	spin_unlock_irq(&bp->stats_lock);
 }
 
 static const struct ethtool_rmon_hist_range gem_rmon_ranges[] = {
@@ -3374,6 +3388,7 @@  static void gem_get_rmon_stats(struct net_device *dev,
 	struct macb *bp = netdev_priv(dev);
 	struct gem_stats *hwstat = &bp->hw_stats.gem;
 
+	spin_lock_irq(&bp->stats_lock);
 	gem_update_stats(bp);
 	rmon_stats->undersize_pkts = hwstat->rx_undersized_frames;
 	rmon_stats->oversize_pkts = hwstat->rx_oversize_frames;
@@ -3392,6 +3407,7 @@  static void gem_get_rmon_stats(struct net_device *dev,
 	rmon_stats->hist_tx[4] = hwstat->tx_512_1023_byte_frames;
 	rmon_stats->hist_tx[5] = hwstat->tx_1024_1518_byte_frames;
 	rmon_stats->hist_tx[6] = hwstat->tx_greater_than_1518_byte_frames;
+	spin_unlock_irq(&bp->stats_lock);
 	*ranges = gem_rmon_ranges;
 }