luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: sched: extract qstats update code into functions

Browse Source 
Extract common code that increments cpu_qstats counters into standalone act
API functions. Change hardware offloaded actions that use percpu counter
allocation to use the new functions instead of accessing cpu_qstats
directly.

This commit doesn't change functionality.

Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vlad Buslov 2019-10-30 16:09:02 +02:00 committed by David S. Miller
parent 5e1ad95b63
commit 26b537a88c
6 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/net/act_api.h
View File

@ -193,6 +193,22 @@ static inline void tcf_action_update_bstats(struct tc_action *a,
bstats_cpu_update(this_cpu_ptr(a->cpu_bstats), skb);
}
static inline struct gnet_stats_queue *
tcf_action_get_qstats(struct tc_action *a)
{
return this_cpu_ptr(a->cpu_qstats);
}
static inline void tcf_action_inc_drop_qstats(struct tc_action *a)
{
qstats_drop_inc(this_cpu_ptr(a->cpu_qstats));
}
static inline void tcf_action_inc_overlimit_qstats(struct tc_action *a)
{
qstats_overlimit_inc(this_cpu_ptr(a->cpu_qstats));
}
void tcf_action_update_stats(struct tc_action *a, u64 bytes, u32 packets,
bool drop, bool hw);
int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int);

2
net/sched/act_csum.c
View File

@ -624,7 +624,7 @@ static int tcf_csum_act(struct sk_buff *skb, const struct tc_action *a,
return action;
drop:
qstats_drop_inc(this_cpu_ptr(p->common.cpu_qstats));
tcf_action_inc_drop_qstats(&p->common);
action = TC_ACT_SHOT;
goto out;
}

2
net/sched/act_ct.c
View File

@ -469,7 +469,7 @@ static int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,
return retval;
drop:
qstats_drop_inc(this_cpu_ptr(a->cpu_qstats));
tcf_action_inc_drop_qstats(&c->common);
return TC_ACT_SHOT;
}

2
net/sched/act_gact.c
View File

@ -163,7 +163,7 @@ static int tcf_gact_act(struct sk_buff *skb, const struct tc_action *a,
#endif
tcf_action_update_bstats(&gact->common, skb);
if (action == TC_ACT_SHOT)
qstats_drop_inc(this_cpu_ptr(gact->common.cpu_qstats));
tcf_action_inc_drop_qstats(&gact->common);
tcf_lastuse_update(&gact->tcf_tm);

2
net/sched/act_mirred.c
View File

@ -303,7 +303,7 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
if (err) {
out:
qstats_overlimit_inc(this_cpu_ptr(m->common.cpu_qstats));
tcf_action_inc_overlimit_qstats(&m->common);
if (tcf_mirred_is_act_redirect(m_eaction))
retval = TC_ACT_SHOT;
}

2
net/sched/act_vlan.c
View File

@ -88,7 +88,7 @@ static int tcf_vlan_act(struct sk_buff *skb, const struct tc_action *a,
return action;
drop:
qstats_drop_inc(this_cpu_ptr(v->common.cpu_qstats));
tcf_action_inc_drop_qstats(&v->common);
return TC_ACT_SHOT;
}