Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38040702 authored by Amir Vadai's avatar Amir Vadai Committed by David S. Miller
Browse files

net/sched: Enable netdev drivers to update statistics of offloaded actions 



Introduce stats_update callback. netdev driver could call it for offloaded
actions to update the basic statistics (packets, bytes and last use).
Since bstats_update() and bstats_cpu_update() use skb as an argument to
get the counters, _bstats_update() and _bstats_cpu_update(), that get
bytes and packets as arguments, were added.

Signed-off-by: default avatarAmir Vadai <amirva@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 388665a9

include/net/act_api.h

+12 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ struct tc_action_ops { 
			int bind);

	int     (*walk)(struct net *, struct sk_buff *,

			struct netlink_callback *, int, struct tc_action *);

	void	(*stats_update)(struct tc_action *, u64, u32, u64);

};



struct tc_action_net {
@@ -178,10 +179,21 @@ int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int); 


#define tc_for_each_action(_a, _exts) \

	list_for_each_entry(a, &(_exts)->actions, list)



static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes,

					   u64 packets, u64 lastuse)

{

	if (!a->ops->stats_update)

		return;



	a->ops->stats_update(a, bytes, packets, lastuse);

}



#else /* CONFIG_NET_CLS_ACT */



#define tc_no_actions(_exts) true

#define tc_for_each_action(_a, _exts) while (0)

#define tcf_action_stats_update(a, bytes, packets, lastuse)



#endif /* CONFIG_NET_CLS_ACT */

#endif

include/net/sch_generic.h

+18 −2
Original line number Diff line number Diff line
@@ -527,11 +527,27 @@ static inline bool qdisc_is_percpu_stats(const struct Qdisc *q) 
	return q->flags & TCQ_F_CPUSTATS;

}



static inline void _bstats_update(struct gnet_stats_basic_packed *bstats,

				  __u64 bytes, __u32 packets)

{

	bstats->bytes += bytes;

	bstats->packets += packets;

}



static inline void bstats_update(struct gnet_stats_basic_packed *bstats,

				 const struct sk_buff *skb)

{

	bstats->bytes += qdisc_pkt_len(skb);

	bstats->packets += skb_is_gso(skb) ? skb_shinfo(skb)->gso_segs : 1;

	_bstats_update(bstats,

		       qdisc_pkt_len(skb),

		       skb_is_gso(skb) ? skb_shinfo(skb)->gso_segs : 1);

}



static inline void _bstats_cpu_update(struct gnet_stats_basic_cpu *bstats,

				      __u64 bytes, __u32 packets)

{

	u64_stats_update_begin(&bstats->syncp);

	_bstats_update(&bstats->bstats, bytes, packets);

	u64_stats_update_end(&bstats->syncp);

}



static inline void bstats_cpu_update(struct gnet_stats_basic_cpu *bstats,