diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
index 06d8f78b7368..3aea3ff5785f 100644
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
@@ -42,7 +42,7 @@ TC_INDIRECT_SCOPE int tcf_bpf_act(struct sk_buff *skb,
int action, filter_res;
tcf_lastuse_update(&prog->tcf_tm);
- bstats_update(this_cpu_ptr(prog->common.cpu_bstats), skb);
+ tcf_action_update_bstats(&prog->common, skb);
filter = rcu_dereference_bh(prog->filter);
if (at_ingress) {@@ -76,7 +76,7 @@ TC_INDIRECT_SCOPE int tcf_bpf_act(struct sk_buff *skb,
break;
case TC_ACT_SHOT:
action = filter_res;
- qstats_cpu_drop_inc(prog->common.cpu_qstats);
+ tcf_action_inc_drop_qstats(&prog->common);
break;
case TC_ACT_UNSPEC:
action = prog->tcf_action;
@@ -305,8 +305,8 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla,
index = parm->index;
ret = tcf_idr_check_alloc(tn, &index, act, bind);
if (!ret) {
- ret = tcf_idr_create(tn, index, est, act,
- &act_bpf_ops, bind, true, flags);
+ ret = tcf_idr_create_from_flags(tn, index, est, act,
+ &act_bpf_ops, bind, flags);
if (ret < 0) {
tcf_idr_cleanup(tn, index);
return ret;diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index 3946a9589bb8..a931f0d353d2 100644
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -551,8 +551,8 @@ static int tcf_ife_init(struct net *net, struct nlattr *nla,
}
if (!exists) {
- ret = tcf_idr_create(tn, index, est, a, &act_ife_ops,
- bind, true, flags);
+ ret = tcf_idr_create_from_flags(tn, index, est, a,
+ &act_ife_ops, bind, flags);
if (ret) {
tcf_idr_cleanup(tn, index);
kfree(p);@@ -720,7 +720,7 @@ static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a,
p = rcu_dereference_bh(ife->params);
- bstats_update(this_cpu_ptr(ife->common.cpu_bstats), skb);
+ tcf_action_update_bstats(&ife->common, skb);
tcf_lastuse_update(&ife->tcf_tm);
if (skb_at_tc_ingress(skb))
@@ -728,7 +728,7 @@ static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a,
tlv_data = ife_decode(skb, &metalen);
if (unlikely(!tlv_data)) {
- qstats_cpu_drop_inc(ife->common.cpu_qstats);
+ tcf_action_inc_drop_qstats(&ife->common);
return TC_ACT_SHOT;
}
@@ -742,7 +742,7 @@ static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a,
curr_data = ife_tlv_meta_decode(tlv_data, ifehdr_end, &mtype,
&dlen, NULL);
if (!curr_data) {
- qstats_cpu_drop_inc(ife->common.cpu_qstats);
+ tcf_action_inc_drop_qstats(&ife->common);
return TC_ACT_SHOT;
}
@@ -751,7 +751,7 @@ static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a,
/* abuse overlimits to count metadata we cannot
* decode: no ops for it, or the decoder rejected it
*/
- qstats_cpu_overlimit_inc(ife->common.cpu_qstats);
+ tcf_action_inc_overlimit_qstats(&ife->common);
if (ret == -ENOENT)
pr_info_ratelimited("Unknown metaid %d dlen %d\n",@@ -763,7 +763,7 @@ static int tcf_ife_decode(struct sk_buff *skb, const struct tc_action *a,
}
if (WARN_ON(tlv_data != ifehdr_end)) {
- qstats_cpu_drop_inc(ife->common.cpu_qstats);
+ tcf_action_inc_drop_qstats(&ife->common);
return TC_ACT_SHOT;
}
@@ -819,21 +819,21 @@ static int tcf_ife_encode(struct sk_buff *skb, const struct tc_action *a,
exceed_mtu = true;
}
- bstats_update(this_cpu_ptr(ife->common.cpu_bstats), skb);
+ tcf_action_update_bstats(&ife->common, skb);
tcf_lastuse_update(&ife->tcf_tm);
if (!metalen) { /* no metadata to send */
/* abuse overlimits to count when we allow packet
* with no metadata
*/
- qstats_cpu_overlimit_inc(ife->common.cpu_qstats);
+ tcf_action_inc_overlimit_qstats(&ife->common);
return action;
}
/* could be stupid policy setup or mtu config
* so lets be conservative.. */
if ((action == TC_ACT_SHOT) || exceed_mtu) {
drop:
- qstats_cpu_drop_inc(ife->common.cpu_qstats);
+ tcf_action_inc_drop_qstats(&ife->common);
return TC_ACT_SHOT;
}
@@ -898,9 +898,9 @@ TC_INDIRECT_SCOPE int tcf_ife_act(struct sk_buff *skb,
int ret;
if (unlikely(!tcf_ife_is_eth_skb(skb))) {
- bstats_update(this_cpu_ptr(ife->common.cpu_bstats), skb);
+ tcf_action_update_bstats(&ife->common, skb);
tcf_lastuse_update(&ife->tcf_tm);
- qstats_cpu_drop_inc(ife->common.cpu_qstats);
+ tcf_action_inc_drop_qstats(&ife->common);
return TC_ACT_SHOT;
}
diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c
index 09e9dcf58253..72dedb9b19a6 100644
--- a/net/sched/act_skbmod.c
+++ b/net/sched/act_skbmod.c
@@ -32,7 +32,7 @@ TC_INDIRECT_SCOPE int tcf_skbmod_act(struct sk_buff *skb,
u64 flags;
tcf_lastuse_update(&d->tcf_tm);
- bstats_update(this_cpu_ptr(d->common.cpu_bstats), skb);
+ tcf_action_update_bstats(&d->common, skb);
p = rcu_dereference_bh(d->skbmod_p);
if (unlikely(p->action == TC_ACT_SHOT))
@@ -91,7 +91,7 @@ TC_INDIRECT_SCOPE int tcf_skbmod_act(struct sk_buff *skb,
return p->action;
drop:
- qstats_cpu_overlimit_inc(d->common.cpu_qstats);
+ tcf_action_inc_overlimit_qstats(&d->common);
return TC_ACT_SHOT;
}
@@ -171,8 +171,8 @@ static int tcf_skbmod_init(struct net *net, struct nlattr *nla,
}
if (!exists) {
- ret = tcf_idr_create(tn, index, est, a,
- &act_skbmod_ops, bind, true, flags);
+ ret = tcf_idr_create_from_flags(tn, index, est, a,
+ &act_skbmod_ops, bind, flags);
if (ret) {
tcf_idr_cleanup(tn, index);
return ret;--
2.43.0