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 /net | |
| parent | ipv4: tcp: set unicast_sock uc_ttl to -1 (diff) | |
| download | linux-dev-e3906486f616da7cc086a3ba06c0df4e5a48b4ab.tar.xz linux-dev-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 'net')
| -rw-r--r-- | net/bridge/br_device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index f4be1bbfef26..333484537600 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -127,9 +127,9 @@ static struct rtnl_link_stats64 *br_get_stats64(struct net_device *dev, const struct br_cpu_netstats *bstats = per_cpu_ptr(br->stats, cpu); do { - start = u64_stats_fetch_begin(&bstats->syncp); + start = u64_stats_fetch_begin_bh(&bstats->syncp); memcpy(&tmp, bstats, sizeof(tmp)); - } while (u64_stats_fetch_retry(&bstats->syncp, start)); + } while (u64_stats_fetch_retry_bh(&bstats->syncp, start)); sum.tx_bytes += tmp.tx_bytes; sum.tx_packets += tmp.tx_packets; sum.rx_bytes += tmp.rx_bytes; |