nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net_sched: extend packet counter to 64bit

Browse source 
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>
This commit is contained in:
Eric Dumazet 2019-11-04 19:13:14 -08:00 committed by David S. Miller
parent 4d390c287b
commit d0083d98f6
3 changed files with 4 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
include/net/gen_stats.h
View file

@ -10,8 +10,8 @@
/* Note: this used to be in include/uapi/linux/gen_stats.h */ /* Note: this used to be in include/uapi/linux/gen_stats.h */
struct gnet_stats_basic_packed { struct gnet_stats_basic_packed {
__u64 bytes; __u64 bytes;
__u32 packets; __u64 packets;
} __attribute__ ((packed)); };
struct gnet_stats_basic_cpu { struct gnet_stats_basic_cpu {
struct gnet_stats_basic_packed bstats; struct gnet_stats_basic_packed bstats;

3
net/core/gen_stats.c
View file

@ -123,8 +123,7 @@ __gnet_stats_copy_basic_cpu(struct gnet_stats_basic_packed *bstats,
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct gnet_stats_basic_cpu *bcpu = per_cpu_ptr(cpu, i); struct gnet_stats_basic_cpu *bcpu = per_cpu_ptr(cpu, i);
unsigned int start; unsigned int start;
u64 bytes; u64 bytes, packets;
u32 packets;
do { do {
start = u64_stats_fetch_begin_irq(&bcpu->syncp); start = u64_stats_fetch_begin_irq(&bcpu->syncp);

2
net/sched/act_simple.c
View file

@ -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" * Example if this was the 3rd packet and the string was "hello"
* then it would look like "hello_3" (without quotes) * 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); (char *)d->tcfd_defdata, d->tcf_bstats.packets);
spin_unlock(&d->tcf_lock); spin_unlock(&d->tcf_lock);
return d->tcf_action; return d->tcf_action;