Commit 505a467b authored by david decotigny's avatar david decotigny Committed by David S. Miller

net-forcedeth: fix possible stats inaccuracies on 32b hosts

The software stats are updated from BH, this change ensures that 32b
UP hosts use appropriate protection.

Tested:
  - HW/SW stats consistent with pktgen (in particular tx=rx)
  - HW/SW stats consistent when tx/rx offloads disabled
  - no problem with+without lockdep (SMP 16-way)
Signed-off-by: default avatarDavid Decotigny <david.decotigny@google.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd2bc8e9
...@@ -1756,19 +1756,19 @@ nv_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *storage) ...@@ -1756,19 +1756,19 @@ nv_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *storage)
/* software stats */ /* software stats */
do { do {
syncp_start = u64_stats_fetch_begin(&np->swstats_rx_syncp); syncp_start = u64_stats_fetch_begin_bh(&np->swstats_rx_syncp);
storage->rx_packets = np->stat_rx_packets; storage->rx_packets = np->stat_rx_packets;
storage->rx_bytes = np->stat_rx_bytes; storage->rx_bytes = np->stat_rx_bytes;
storage->rx_dropped = np->stat_rx_dropped; storage->rx_dropped = np->stat_rx_dropped;
storage->rx_missed_errors = np->stat_rx_missed_errors; storage->rx_missed_errors = np->stat_rx_missed_errors;
} while (u64_stats_fetch_retry(&np->swstats_rx_syncp, syncp_start)); } while (u64_stats_fetch_retry_bh(&np->swstats_rx_syncp, syncp_start));
do { do {
syncp_start = u64_stats_fetch_begin(&np->swstats_tx_syncp); syncp_start = u64_stats_fetch_begin_bh(&np->swstats_tx_syncp);
storage->tx_packets = np->stat_tx_packets; storage->tx_packets = np->stat_tx_packets;
storage->tx_bytes = np->stat_tx_bytes; storage->tx_bytes = np->stat_tx_bytes;
storage->tx_dropped = np->stat_tx_dropped; storage->tx_dropped = np->stat_tx_dropped;
} while (u64_stats_fetch_retry(&np->swstats_tx_syncp, syncp_start)); } while (u64_stats_fetch_retry_bh(&np->swstats_tx_syncp, syncp_start));
/* If the nic supports hw counters then retrieve latest values */ /* If the nic supports hw counters then retrieve latest values */
if (np->driver_data & DEV_HAS_STATISTICS_V123) { if (np->driver_data & DEV_HAS_STATISTICS_V123) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment