diff options
| author |   Eric Dumazet <edumazet@google.com> | 2019-11-04 19:13:14 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-11-05 18:20:55 -0800 |
| commit | d0083d98f685b9f4fe810570f93cef0b0bb6b354 (patch) | |
| tree | 41cfd67342c054de0ecb8782b21d99151e21a755 | |
| parent | net_sched: do not export gnet_stats_basic_packed to uapi (diff) | |
| download | linux-dev-d0083d98f685b9f4fe810570f93cef0b0bb6b354.tar.xz linux-dev-d0083d98f685b9f4fe810570f93cef0b0bb6b354.zip | |
net_sched: extend packet counter to 64bit
After this change, qdisc packet counter is no longer
a 32bit quantity. We still export 32bit values to user.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/gen_stats.h | 4 | ||||
| -rw-r--r-- | net/core/gen_stats.c | 3 | ||||
| -rw-r--r-- | net/sched/act_simple.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h index 5f3889e7ec1b..1424e02cef90 100644 --- a/include/net/gen_stats.h +++ b/include/net/gen_stats.h @@ -10,8 +10,8 @@ /* Note: this used to be in include/uapi/linux/gen_stats.h */ struct gnet_stats_basic_packed { __u64 bytes; - __u32 packets; -} __attribute__ ((packed)); + __u64 packets; +}; struct gnet_stats_basic_cpu { struct gnet_stats_basic_packed bstats; diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c index 36888f5e09eb..fe33e2a9841e 100644 --- a/net/core/gen_stats.c +++ b/net/core/gen_stats.c @@ -123,8 +123,7 @@ __gnet_stats_copy_basic_cpu(struct gnet_stats_basic_packed *bstats, for_each_possible_cpu(i) { struct gnet_stats_basic_cpu *bcpu = per_cpu_ptr(cpu, i); unsigned int start; - u64 bytes; - u32 packets; + u64 bytes, packets; do { start = u64_stats_fetch_begin_irq(&bcpu->syncp); diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c index 97639b259cd7..9813ca4006dd 100644 --- a/net/sched/act_simple.c +++ b/net/sched/act_simple.c @@ -35,7 +35,7 @@ static int tcf_simp_act(struct sk_buff *skb, const struct tc_action *a, * Example if this was the 3rd packet and the string was "hello" * then it would look like "hello_3" (without quotes) */ - pr_info("simple: %s_%d\n", + pr_info("simple: %s_%llu\n", (char *)d->tcfd_defdata, d->tcf_bstats.packets); spin_unlock(&d->tcf_lock); return d->tcf_action; |