diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-07-07 14:58:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-07 14:58:56 -0700 |
| commit | 28172739f0a276eb8d6ca917b3974c2edb036da3 (patch) | |
| tree | b1dc00cfa20c209992e247c6f73601f609f9ca3b /net/core/net-sysfs.c | |
| parent | 217d32dc5f299c483ca0d3c8cc6811c72c0339c4 (diff) | |
| download | lwn-28172739f0a276eb8d6ca917b3974c2edb036da3.tar.gz lwn-28172739f0a276eb8d6ca917b3974c2edb036da3.zip | |
net: fix 64 bit counters on 32 bit arches
There is a small possibility that a reader gets incorrect values on 32
bit arches. SNMP applications could catch incorrect counters when a
32bit high part is changed by another stats consumer/provider.
One way to solve this is to add a rtnl_link_stats64 param to all
ndo_get_stats64() methods, and also add such a parameter to
dev_get_stats().
Rule is that we are not allowed to use dev->stats64 as a temporary
storage for 64bit stats, but a caller provided area (usually on stack)
Old drivers (only providing get_stats() method) need no changes.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/net-sysfs.c')
| -rw-r--r-- | net/core/net-sysfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index ea3bb4c3b87d..914f42b0f039 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -330,7 +330,9 @@ static ssize_t netstat_show(const struct device *d, read_lock(&dev_base_lock); if (dev_isalive(dev)) { - const struct rtnl_link_stats64 *stats = dev_get_stats(dev); + struct rtnl_link_stats64 temp; + const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp); + ret = sprintf(buf, fmt_u64, *(u64 *)(((u8 *) stats) + offset)); } read_unlock(&dev_base_lock); |