leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/sched: Add hardware specific counters to TC actions

Browse Source 
Add additional counters that will store the bytes/packets processed by
hardware. These will be exported through the netlink interface for
displaying by the iproute2 tc tool

Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eelco Chaudron 2018-09-21 07:14:02 -04:00 committed by David S. Miller
parent 5e111210a4
commit 28169abadb
5 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/net/act_api.h
View File

@ -31,10 +31,12 @@ struct tc_action {
int tcfa_action; int tcfa_action;
struct tcf_t tcfa_tm; struct tcf_t tcfa_tm;
struct gnet_stats_basic_packed tcfa_bstats; struct gnet_stats_basic_packed tcfa_bstats;
struct gnet_stats_basic_packed tcfa_bstats_hw;
struct gnet_stats_queue tcfa_qstats; struct gnet_stats_queue tcfa_qstats;
struct net_rate_estimator __rcu *tcfa_rate_est; struct net_rate_estimator __rcu *tcfa_rate_est;
spinlock_t tcfa_lock; spinlock_t tcfa_lock;
struct gnet_stats_basic_cpu __percpu *cpu_bstats; struct gnet_stats_basic_cpu __percpu *cpu_bstats;
struct gnet_stats_basic_cpu __percpu *cpu_bstats_hw;
struct gnet_stats_queue __percpu *cpu_qstats; struct gnet_stats_queue __percpu *cpu_qstats;
struct tc_cookie __rcu *act_cookie; struct tc_cookie __rcu *act_cookie;
struct tcf_chain *goto_chain; struct tcf_chain *goto_chain;
@ -94,7 +96,7 @@ struct tc_action_ops {
struct netlink_callback *, int, struct netlink_callback *, int,
const struct tc_action_ops *, const struct tc_action_ops *,
struct netlink_ext_ack *); struct netlink_ext_ack *);
void (*stats_update)(struct tc_action *, u64, u32, u64); void (*stats_update)(struct tc_action *, u64, u32, u64, bool);
size_t (*get_fill_size)(const struct tc_action *act); size_t (*get_fill_size)(const struct tc_action *act);
struct net_device *(*get_dev)(const struct tc_action *a); struct net_device *(*get_dev)(const struct tc_action *a);
void (*put_dev)(struct net_device *dev); void (*put_dev)(struct net_device *dev);
@ -182,13 +184,13 @@ int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int);
#endif /* CONFIG_NET_CLS_ACT */ #endif /* CONFIG_NET_CLS_ACT */
static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes, static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes,
u64 packets, u64 lastuse) u64 packets, u64 lastuse, bool hw)
{ {
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
if (!a->ops->stats_update) if (!a->ops->stats_update)
return; return;
a->ops->stats_update(a, bytes, packets, lastuse); a->ops->stats_update(a, bytes, packets, lastuse, hw);
#endif #endif
} }

2
include/net/pkt_cls.h
View File

@ -318,7 +318,7 @@ tcf_exts_stats_update(const struct tcf_exts *exts,
for (i = 0; i < exts->nr_actions; i++) { for (i = 0; i < exts->nr_actions; i++) {
struct tc_action *a = exts->actions[i]; struct tc_action *a = exts->actions[i];
tcf_action_stats_update(a, bytes, packets, lastuse); tcf_action_stats_update(a, bytes, packets, lastuse, true);
} }
preempt_enable(); preempt_enable();

14
net/sched/act_api.c
View File

@ -81,6 +81,7 @@ static void tcf_set_action_cookie(struct tc_cookie __rcu **old_cookie,
static void free_tcf(struct tc_action *p) static void free_tcf(struct tc_action *p)
{ {
free_percpu(p->cpu_bstats); free_percpu(p->cpu_bstats);
free_percpu(p->cpu_bstats_hw);
free_percpu(p->cpu_qstats); free_percpu(p->cpu_qstats);
tcf_set_action_cookie(&p->act_cookie, NULL); tcf_set_action_cookie(&p->act_cookie, NULL);
@ -390,9 +391,12 @@ int tcf_idr_create(struct tc_action_net *tn, u32 index, struct nlattr *est,
p->cpu_bstats = netdev_alloc_pcpu_stats(struct gnet_stats_basic_cpu); p->cpu_bstats = netdev_alloc_pcpu_stats(struct gnet_stats_basic_cpu);
if (!p->cpu_bstats) if (!p->cpu_bstats)
goto err1; goto err1;
p->cpu_bstats_hw = netdev_alloc_pcpu_stats(struct gnet_stats_basic_cpu);
if (!p->cpu_bstats_hw)
goto err2;
p->cpu_qstats = alloc_percpu(struct gnet_stats_queue); p->cpu_qstats = alloc_percpu(struct gnet_stats_queue);
if (!p->cpu_qstats) if (!p->cpu_qstats)
goto err2; goto err3;
} }
spin_lock_init(&p->tcfa_lock); spin_lock_init(&p->tcfa_lock);
p->tcfa_index = index; p->tcfa_index = index;
@ -404,15 +408,17 @@ int tcf_idr_create(struct tc_action_net *tn, u32 index, struct nlattr *est,
&p->tcfa_rate_est, &p->tcfa_rate_est,
&p->tcfa_lock, NULL, est); &p->tcfa_lock, NULL, est);
if (err) if (err)
goto err3; goto err4;
} }
p->idrinfo = idrinfo; p->idrinfo = idrinfo;
p->ops = ops; p->ops = ops;
*a = p; *a = p;
return 0; return 0;
err3: err4:
free_percpu(p->cpu_qstats); free_percpu(p->cpu_qstats);
err3:
free_percpu(p->cpu_bstats_hw);
err2: err2:
free_percpu(p->cpu_bstats); free_percpu(p->cpu_bstats);
err1: err1:
@ -997,6 +1003,8 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *p,
goto errout; goto errout;
if (gnet_stats_copy_basic(NULL, &d, p->cpu_bstats, &p->tcfa_bstats) < 0 || if (gnet_stats_copy_basic(NULL, &d, p->cpu_bstats, &p->tcfa_bstats) < 0 ||
gnet_stats_copy_basic_hw(NULL, &d, p->cpu_bstats_hw,
&p->tcfa_bstats_hw) < 0 ||
gnet_stats_copy_rate_est(&d, &p->tcfa_rate_est) < 0 || gnet_stats_copy_rate_est(&d, &p->tcfa_rate_est) < 0 ||
gnet_stats_copy_queue(&d, p->cpu_qstats, gnet_stats_copy_queue(&d, p->cpu_qstats,
&p->tcfa_qstats, &p->tcfa_qstats,

6
net/sched/act_gact.c
View File

@ -157,7 +157,7 @@ static int tcf_gact_act(struct sk_buff *skb, const struct tc_action *a,
} }
static void tcf_gact_stats_update(struct tc_action *a, u64 bytes, u32 packets, static void tcf_gact_stats_update(struct tc_action *a, u64 bytes, u32 packets,
u64 lastuse) u64 lastuse, bool hw)
{ {
struct tcf_gact *gact = to_gact(a); struct tcf_gact *gact = to_gact(a);
int action = READ_ONCE(gact->tcf_action); int action = READ_ONCE(gact->tcf_action);
@ -168,6 +168,10 @@ static void tcf_gact_stats_update(struct tc_action *a, u64 bytes, u32 packets,
if (action == TC_ACT_SHOT) if (action == TC_ACT_SHOT)
this_cpu_ptr(gact->common.cpu_qstats)->drops += packets; this_cpu_ptr(gact->common.cpu_qstats)->drops += packets;
if (hw)
_bstats_cpu_update(this_cpu_ptr(gact->common.cpu_bstats_hw),
bytes, packets);
tm->lastuse = max_t(u64, tm->lastuse, lastuse); tm->lastuse = max_t(u64, tm->lastuse, lastuse);
} }

5
net/sched/act_mirred.c
View File

@ -283,12 +283,15 @@ out:
} }
static void tcf_stats_update(struct tc_action *a, u64 bytes, u32 packets, static void tcf_stats_update(struct tc_action *a, u64 bytes, u32 packets,
u64 lastuse) u64 lastuse, bool hw)
{ {
struct tcf_mirred *m = to_mirred(a); struct tcf_mirred *m = to_mirred(a);
struct tcf_t *tm = &m->tcf_tm; struct tcf_t *tm = &m->tcf_tm;
_bstats_cpu_update(this_cpu_ptr(a->cpu_bstats), bytes, packets); _bstats_cpu_update(this_cpu_ptr(a->cpu_bstats), bytes, packets);
if (hw)
_bstats_cpu_update(this_cpu_ptr(a->cpu_bstats_hw),
bytes, packets);
tm->lastuse = max_t(u64, tm->lastuse, lastuse); tm->lastuse = max_t(u64, tm->lastuse, lastuse);
} }