diff options
| author | Kevin Groeneveld <kgroeneveld@gmail.com> | 2012-07-21 06:30:50 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-22 12:12:32 -0700 |
| commit | e3906486f616da7cc086a3ba06c0df4e5a48b4ab (patch) | |
| tree | 573b6a99cf6f1e2958c59223d2e77ebe36e71ffa /drivers/net/virtio_net.c | |
| parent | 0980e56e506b1e45022fad00bca8c8a974fda4e6 (diff) | |
| download | talos-obmc-linux-e3906486f616da7cc086a3ba06c0df4e5a48b4ab.tar.gz talos-obmc-linux-e3906486f616da7cc086a3ba06c0df4e5a48b4ab.zip | |
net: fix race condition in several drivers when reading stats
Fix race condition in several network drivers when reading stats on 32bit
UP architectures. These drivers update their stats in a BH context and
therefore should use u64_stats_fetch_begin_bh/u64_stats_fetch_retry_bh
instead of u64_stats_fetch_begin/u64_stats_fetch_retry when reading the
stats.
Signed-off-by: Kevin Groeneveld <kgroeneveld@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 1db445b2ecc7..83d2b0c34c5e 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -704,16 +704,16 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev, u64 tpackets, tbytes, rpackets, rbytes; do { - start = u64_stats_fetch_begin(&stats->tx_syncp); + start = u64_stats_fetch_begin_bh(&stats->tx_syncp); tpackets = stats->tx_packets; tbytes = stats->tx_bytes; - } while (u64_stats_fetch_retry(&stats->tx_syncp, start)); + } while (u64_stats_fetch_retry_bh(&stats->tx_syncp, start)); do { - start = u64_stats_fetch_begin(&stats->rx_syncp); + start = u64_stats_fetch_begin_bh(&stats->rx_syncp); rpackets = stats->rx_packets; rbytes = stats->rx_bytes; - } while (u64_stats_fetch_retry(&stats->rx_syncp, start)); + } while (u64_stats_fetch_retry_bh(&stats->rx_syncp, start)); tot->rx_packets += rpackets; tot->tx_packets += tpackets; |
