Commit d0083d98 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d390c28

include/net/gen_stats.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/core/gen_stats.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

net/sched/act_simple.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE