--- v5
+++ v4
@@ -1,560 +1,116 @@
From: Baowen Zheng <baowen.zheng@corigine.com>
-Use flow_indr_dev_register/flow_indr_dev_setup_offload to
-offload tc action.
+When collecting stats for actions update them using both
+hardware and software counters.
-We need to call tc_cleanup_flow_action to clean up tc action entry since
-in tc_setup_action, some actions may hold dev refcnt, especially the mirror
-action.
+Stats update process should not run in context of preempt_disable.
Signed-off-by: Baowen Zheng <baowen.zheng@corigine.com>
Signed-off-by: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
---
- include/linux/netdevice.h | 1 +
- include/net/flow_offload.h | 17 +++++++
- include/net/pkt_cls.h | 6 +++
- net/core/flow_offload.c | 42 +++++++++++++----
- net/sched/act_api.c | 92 ++++++++++++++++++++++++++++++++++++++
- net/sched/act_csum.c | 4 +-
- net/sched/act_ct.c | 4 +-
- net/sched/act_gact.c | 13 +++++-
- net/sched/act_gate.c | 4 +-
- net/sched/act_mirred.c | 13 +++++-
- net/sched/act_mpls.c | 16 ++++++-
- net/sched/act_police.c | 4 +-
- net/sched/act_sample.c | 4 +-
- net/sched/act_skbedit.c | 11 ++++-
- net/sched/act_tunnel_key.c | 9 +++-
- net/sched/act_vlan.c | 16 ++++++-
- net/sched/cls_api.c | 21 +++++++--
- 17 files changed, 254 insertions(+), 23 deletions(-)
+ include/net/act_api.h | 1 +
+ include/net/pkt_cls.h | 18 ++++++++++--------
+ net/sched/act_api.c | 34 ++++++++++++++++++++++++++++++++++
+ 3 files changed, 45 insertions(+), 8 deletions(-)
-diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 65117f01d5f2..037577cbe3f0 100644
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -916,6 +916,7 @@ enum tc_setup_type {
- TC_SETUP_QDISC_TBF,
- TC_SETUP_QDISC_FIFO,
- TC_SETUP_QDISC_HTB,
-+ TC_SETUP_ACT,
- };
+diff --git a/include/net/act_api.h b/include/net/act_api.h
+index 68d6f245f7e9..7900598d2dd3 100644
+--- a/include/net/act_api.h
++++ b/include/net/act_api.h
+@@ -247,6 +247,7 @@ void tcf_action_update_stats(struct tc_action *a, u64 bytes, u64 packets,
+ u64 drops, bool hw);
+ int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int);
- /* These structures hold the attributes of bpf state that are being passed
-diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
-index f6970213497a..15662cad5bca 100644
---- a/include/net/flow_offload.h
-+++ b/include/net/flow_offload.h
-@@ -551,6 +551,23 @@ struct flow_cls_offload {
- u32 classid;
- };
-
-+enum flow_act_command {
-+ FLOW_ACT_REPLACE,
-+ FLOW_ACT_DESTROY,
-+ FLOW_ACT_STATS,
-+};
-+
-+struct flow_offload_action {
-+ struct netlink_ext_ack *extack; /* NULL in FLOW_ACT_STATS process*/
-+ enum flow_act_command command;
-+ enum flow_action_id id;
-+ u32 index;
-+ struct flow_stats stats;
-+ struct flow_action action;
-+};
-+
-+struct flow_offload_action *flow_action_alloc(unsigned int num_actions);
-+
- static inline struct flow_rule *
- flow_cls_offload_flow_rule(struct flow_cls_offload *flow_cmd)
- {
++int tcf_action_update_hw_stats(struct tc_action *action);
+ int tcf_action_check_ctrlact(int action, struct tcf_proto *tp,
+ struct tcf_chain **handle,
+ struct netlink_ext_ack *newchain);
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
-index 193f88ebf629..13f0e4a3a136 100644
+index b00fd421e7c0..c8e1aac82752 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
-@@ -258,6 +258,9 @@ static inline void tcf_exts_put_net(struct tcf_exts *exts)
- for (; 0; (void)(i), (void)(a), (void)(exts))
+@@ -297,18 +297,20 @@ tcf_exts_stats_update(const struct tcf_exts *exts,
+ #ifdef CONFIG_NET_CLS_ACT
+ int i;
+
+- preempt_disable();
+-
+ for (i = 0; i < exts->nr_actions; i++) {
+ struct tc_action *a = exts->actions[i];
+
+- tcf_action_stats_update(a, bytes, packets, drops,
+- lastuse, true);
+- a->used_hw_stats = used_hw_stats;
+- a->used_hw_stats_valid = used_hw_stats_valid;
+- }
++ /* if stats from hw, just skip */
++ if (tcf_action_update_hw_stats(a)) {
++ preempt_disable();
++ tcf_action_stats_update(a, bytes, packets, drops,
++ lastuse, true);
++ preempt_enable();
+
+- preempt_enable();
++ a->used_hw_stats = used_hw_stats;
++ a->used_hw_stats_valid = used_hw_stats_valid;
++ }
++ }
#endif
+ }
-+#define tcf_act_for_each_action(i, a, actions) \
-+ for (i = 0; i < TCA_ACT_MAX_PRIO && ((a) = actions[i]); i++)
-+
- static inline void
- tcf_exts_stats_update(const struct tcf_exts *exts,
- u64 bytes, u64 packets, u64 drops, u64 lastuse,
-@@ -534,6 +537,9 @@ tcf_match_indev(struct sk_buff *skb, int ifindex)
-
- int tc_setup_flow_action(struct flow_action *flow_action,
- const struct tcf_exts *exts);
-+
-+int tc_setup_action(struct flow_action *flow_action,
-+ struct tc_action *actions[]);
- void tc_cleanup_flow_action(struct flow_action *flow_action);
-
- int tc_setup_cb_call(struct tcf_block *block, enum tc_setup_type type,
-diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c
-index 6beaea13564a..31273a10086e 100644
---- a/net/core/flow_offload.c
-+++ b/net/core/flow_offload.c
-@@ -27,6 +27,26 @@ struct flow_rule *flow_rule_alloc(unsigned int num_actions)
- }
- EXPORT_SYMBOL(flow_rule_alloc);
-
-+struct flow_offload_action *flow_action_alloc(unsigned int num_actions)
-+{
-+ struct flow_offload_action *fl_action;
-+ int i;
-+
-+ fl_action = kzalloc(struct_size(fl_action, action.entries, num_actions),
-+ GFP_KERNEL);
-+ if (!fl_action)
-+ return NULL;
-+
-+ fl_action->action.num_entries = num_actions;
-+ /* Pre-fill each action hw_stats with DONT_CARE.
-+ * Caller can override this if it wants stats for a given action.
-+ */
-+ for (i = 0; i < num_actions; i++)
-+ fl_action->action.entries[i].hw_stats = FLOW_ACTION_HW_STATS_DONT_CARE;
-+
-+ return fl_action;
-+}
-+
- #define FLOW_DISSECTOR_MATCH(__rule, __type, __out) \
- const struct flow_match *__m = &(__rule)->match; \
- struct flow_dissector *__d = (__m)->dissector; \
-@@ -549,19 +569,25 @@ int flow_indr_dev_setup_offload(struct net_device *dev, struct Qdisc *sch,
- void (*cleanup)(struct flow_block_cb *block_cb))
- {
- struct flow_indr_dev *this;
-+ u32 count = 0;
-+ int err;
-
- mutex_lock(&flow_indr_block_lock);
-+ if (bo) {
-+ if (bo->command == FLOW_BLOCK_BIND)
-+ indir_dev_add(data, dev, sch, type, cleanup, bo);
-+ else if (bo->command == FLOW_BLOCK_UNBIND)
-+ indir_dev_remove(data);
-+ }
-
-- if (bo->command == FLOW_BLOCK_BIND)
-- indir_dev_add(data, dev, sch, type, cleanup, bo);
-- else if (bo->command == FLOW_BLOCK_UNBIND)
-- indir_dev_remove(data);
--
-- list_for_each_entry(this, &flow_block_indr_dev_list, list)
-- this->cb(dev, sch, this->cb_priv, type, bo, data, cleanup);
-+ list_for_each_entry(this, &flow_block_indr_dev_list, list) {
-+ err = this->cb(dev, sch, this->cb_priv, type, bo, data, cleanup);
-+ if (!err)
-+ count++;
-+ }
-
- mutex_unlock(&flow_indr_block_lock);
-
-- return list_empty(&bo->cb_list) ? -EOPNOTSUPP : 0;
-+ return (bo && list_empty(&bo->cb_list)) ? -EOPNOTSUPP : count;
- }
- EXPORT_SYMBOL(flow_indr_dev_setup_offload);
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
-index 3258da3d5bed..120e72d8502c 100644
+index 29fba4fa1616..01f0bed9c399 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
-@@ -19,8 +19,10 @@
- #include <net/sock.h>
- #include <net/sch_generic.h>
- #include <net/pkt_cls.h>
-+#include <net/tc_act/tc_pedit.h>
- #include <net/act_api.h>
- #include <net/netlink.h>
-+#include <net/flow_offload.h>
-
- #ifdef CONFIG_INET
- DEFINE_STATIC_KEY_FALSE(tcf_frag_xmit_count);
-@@ -129,8 +131,91 @@ static void free_tcf(struct tc_action *p)
- kfree(p);
+@@ -290,6 +290,37 @@ static int tcf_action_offload_add(struct tc_action *action,
+ return err;
}
-+static unsigned int tcf_act_num_actions_single(struct tc_action *act)
++int tcf_action_update_hw_stats(struct tc_action *action)
+{
-+ if (is_tcf_pedit(act))
-+ return tcf_pedit_nkeys(act);
-+ else
-+ return 1;
-+}
-+
-+static int flow_action_init(struct flow_offload_action *fl_action,
-+ struct tc_action *act,
-+ enum flow_act_command cmd,
-+ struct netlink_ext_ack *extack)
-+{
-+ fl_action->extack = extack;
-+ fl_action->command = cmd;
-+ fl_action->index = act->tcfa_index;
-+
-+ if (act->ops->flow_act_setup)
-+ return act->ops->flow_act_setup(act, fl_action, NULL, false);
-+
-+ return -EOPNOTSUPP;
-+}
-+
-+static int tcf_action_offload_cmd(struct flow_offload_action *fl_act,
-+ struct netlink_ext_ack *extack)
-+{
++ struct flow_offload_action fl_act = {};
+ int err;
+
-+ err = flow_indr_dev_setup_offload(NULL, NULL, TC_SETUP_ACT,
-+ fl_act, NULL, NULL);
-+ if (err < 0)
++ if (!tc_act_in_hw(action))
++ return -EOPNOTSUPP;
++
++ err = flow_action_init(&fl_act, action, FLOW_ACT_STATS, NULL);
++ if (err)
+ return err;
++
++ err = tcf_action_offload_cmd(&fl_act, NULL, NULL);
++ if (!err) {
++ preempt_disable();
++ tcf_action_stats_update(action, fl_act.stats.bytes,
++ fl_act.stats.pkts,
++ fl_act.stats.drops,
++ fl_act.stats.lastused,
++ true);
++ preempt_enable();
++ action->used_hw_stats = fl_act.stats.used_hw_stats;
++ action->used_hw_stats_valid = true;
++ } else {
++ return -EOPNOTSUPP;
++ }
+
+ return 0;
+}
++EXPORT_SYMBOL(tcf_action_update_hw_stats);
+
-+/* offload the tc command after inserted */
-+static int tcf_action_offload_add(struct tc_action *action,
-+ struct netlink_ext_ack *extack)
-+{
-+ struct tc_action *actions[TCA_ACT_MAX_PRIO] = {
-+ [0] = action,
-+ };
-+ struct flow_offload_action *fl_action;
-+ int err = 0;
+ static int tcf_action_offload_del(struct tc_action *action)
+ {
+ struct flow_offload_action fl_act;
+@@ -1360,6 +1391,9 @@ int tcf_action_copy_stats(struct sk_buff *skb, struct tc_action *p,
+ if (p == NULL)
+ goto errout;
+
++ /* update hw stats for this action */
++ tcf_action_update_hw_stats(p);
+
-+ fl_action = flow_action_alloc(tcf_act_num_actions_single(action));
-+ if (!fl_action)
-+ return -ENOMEM;
-+
-+ err = flow_action_init(fl_action, action, FLOW_ACT_REPLACE, extack);
-+ if (err)
-+ goto fl_err;
-+
-+ err = tc_setup_action(&fl_action->action, actions);
-+ if (err) {
-+ NL_SET_ERR_MSG_MOD(extack,
-+ "Failed to setup tc actions for offload\n");
-+ goto fl_err;
-+ }
-+
-+ err = tcf_action_offload_cmd(fl_action, extack);
-+ tc_cleanup_flow_action(&fl_action->action);
-+
-+fl_err:
-+ kfree(fl_action);
-+
-+ return err;
-+}
-+
-+static int tcf_action_offload_del(struct tc_action *action)
-+{
-+ struct flow_offload_action fl_act = {};
-+ int err = 0;
-+
-+ err = flow_action_init(&fl_act, action, FLOW_ACT_DESTROY, NULL);
-+ if (err)
-+ return err;
-+
-+ return tcf_action_offload_cmd(&fl_act, NULL);
-+}
-+
- static void tcf_action_cleanup(struct tc_action *p)
- {
-+ tcf_action_offload_del(p);
- if (p->ops->cleanup)
- p->ops->cleanup(p);
-
-@@ -1061,6 +1146,11 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
- return ERR_PTR(err);
- }
-
-+static bool tc_act_bind(u32 flags)
-+{
-+ return !!(flags & TCA_ACT_FLAGS_BIND);
-+}
-+
- /* Returns numbers of initialized actions or negative error. */
-
- int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
-@@ -1103,6 +1193,8 @@ int tcf_action_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
- sz += tcf_action_fill_size(act);
- /* Start from index 0 */
- actions[i - 1] = act;
-+ if (!tc_act_bind(flags))
-+ tcf_action_offload_add(act, extack);
- }
-
- /* We have to commit them all together, because if any error happened in
-diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
-index b55d687e3adc..26e9036240d9 100644
---- a/net/sched/act_csum.c
-+++ b/net/sched/act_csum.c
-@@ -705,7 +705,9 @@ static int tcf_csum_flow_act_setup(struct tc_action *act, void *entry_data,
- entry->csum_flags = tcf_csum_update_flags(act);
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ fl_action->id = FLOW_ACTION_CSUM;
- }
-
- return 0;
-diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
-index 9edfed3b0f4b..485e4c7a086d 100644
---- a/net/sched/act_ct.c
-+++ b/net/sched/act_ct.c
-@@ -1505,7 +1505,9 @@ static int tcf_ct_flow_act_setup(struct tc_action *act, void *entry_data,
- entry->ct.flow_table = tcf_ct_ft(act);
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ fl_action->id = FLOW_ACTION_CT;
- }
-
- return 0;
-diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
-index 2342aa5d8284..7d2f0c9587c8 100644
---- a/net/sched/act_gact.c
-+++ b/net/sched/act_gact.c
-@@ -272,7 +272,18 @@ static int tcf_gact_flow_act_setup(struct tc_action *act, void *entry_data,
- }
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ if (is_tcf_gact_ok(act))
-+ fl_action->id = FLOW_ACTION_ACCEPT;
-+ else if (is_tcf_gact_shot(act))
-+ fl_action->id = FLOW_ACTION_DROP;
-+ else if (is_tcf_gact_trap(act))
-+ fl_action->id = FLOW_ACTION_TRAP;
-+ else if (is_tcf_gact_goto_chain(act))
-+ fl_action->id = FLOW_ACTION_GOTO;
-+ else
-+ return -EOPNOTSUPP;
- }
-
- return 0;
-diff --git a/net/sched/act_gate.c b/net/sched/act_gate.c
-index cbdcbe4376bb..f149135c2e10 100644
---- a/net/sched/act_gate.c
-+++ b/net/sched/act_gate.c
-@@ -637,7 +637,9 @@ static int tcf_gate_flow_act_setup(struct tc_action *act, void *entry_data,
- return err;
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ fl_action->id = FLOW_ACTION_GATE;
- }
-
- return 0;
-diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
-index 8c953b2dc2d5..7104dca72469 100644
---- a/net/sched/act_mirred.c
-+++ b/net/sched/act_mirred.c
-@@ -480,7 +480,18 @@ static int tcf_mirred_flow_act_setup(struct tc_action *act, void *entry_data,
- }
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ if (is_tcf_mirred_egress_redirect(act))
-+ fl_action->id = FLOW_ACTION_REDIRECT;
-+ else if (is_tcf_mirred_egress_mirror(act))
-+ fl_action->id = FLOW_ACTION_MIRRED;
-+ else if (is_tcf_mirred_ingress_redirect(act))
-+ fl_action->id = FLOW_ACTION_REDIRECT_INGRESS;
-+ else if (is_tcf_mirred_ingress_mirror(act))
-+ fl_action->id = FLOW_ACTION_MIRRED_INGRESS;
-+ else
-+ return -EOPNOTSUPP;
- }
-
- return 0;
-diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c
-index 69bc9e10ee3e..720f57ec9a48 100644
---- a/net/sched/act_mpls.c
-+++ b/net/sched/act_mpls.c
-@@ -415,7 +415,21 @@ static int tcf_mpls_flow_act_setup(struct tc_action *act, void *entry_data,
- }
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ switch (tcf_mpls_action(act)) {
-+ case TCA_MPLS_ACT_PUSH:
-+ fl_action->id = FLOW_ACTION_MPLS_PUSH;
-+ break;
-+ case TCA_MPLS_ACT_POP:
-+ fl_action->id = FLOW_ACTION_MPLS_POP;
-+ break;
-+ case TCA_MPLS_ACT_MODIFY:
-+ fl_action->id = FLOW_ACTION_MPLS_MANGLE;
-+ break;
-+ default:
-+ return -EOPNOTSUPP;
-+ }
- }
-
- return 0;
-diff --git a/net/sched/act_police.c b/net/sched/act_police.c
-index f48e9765b70e..b8b64c72d686 100644
---- a/net/sched/act_police.c
-+++ b/net/sched/act_police.c
-@@ -421,7 +421,9 @@ static int tcf_police_flow_act_setup(struct tc_action *act, void *entry_data,
- entry->police.mtu = tcf_police_tcfp_mtu(act);
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ fl_action->id = FLOW_ACTION_POLICE;
- }
-
- return 0;
-diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c
-index 1b0bb501218e..df7bfa688372 100644
---- a/net/sched/act_sample.c
-+++ b/net/sched/act_sample.c
-@@ -303,7 +303,9 @@ static int tcf_sample_flow_act_setup(struct tc_action *act, void *entry_data,
- tcf_flow_sample_get_group(entry, act);
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ fl_action->id = FLOW_ACTION_SAMPLE;
- }
-
- return 0;
-diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
-index b0d791560aa6..c4fd5dc21bbc 100644
---- a/net/sched/act_skbedit.c
-+++ b/net/sched/act_skbedit.c
-@@ -347,7 +347,16 @@ static int tcf_skbedit_flow_act_setup(struct tc_action *act, void *entry_data,
- }
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ if (is_tcf_skbedit_mark(act))
-+ fl_action->id = FLOW_ACTION_MARK;
-+ else if (is_tcf_skbedit_ptype(act))
-+ fl_action->id = FLOW_ACTION_PTYPE;
-+ else if (is_tcf_skbedit_priority(act))
-+ fl_action->id = FLOW_ACTION_PRIORITY;
-+ else
-+ return -EOPNOTSUPP;
- }
-
- return 0;
-diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
-index 14d8307c31a5..2ebc797c047a 100644
---- a/net/sched/act_tunnel_key.c
-+++ b/net/sched/act_tunnel_key.c
-@@ -827,7 +827,14 @@ static int tcf_tunnel_key_flow_act_setup(struct tc_action *act,
- }
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ if (is_tcf_tunnel_set(act))
-+ fl_action->id = FLOW_ACTION_TUNNEL_ENCAP;
-+ else if (is_tcf_tunnel_release(act))
-+ fl_action->id = FLOW_ACTION_TUNNEL_DECAP;
-+ else
-+ return -EOPNOTSUPP;
- }
-
- return 0;
-diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
-index 5de24a995020..5f0ed3b5a5ac 100644
---- a/net/sched/act_vlan.c
-+++ b/net/sched/act_vlan.c
-@@ -395,7 +395,21 @@ static int tcf_vlan_flow_act_setup(struct tc_action *act, void *entry_data,
- }
- *index_inc = 1;
- } else {
-- return -EOPNOTSUPP;
-+ struct flow_offload_action *fl_action = entry_data;
-+
-+ switch (tcf_vlan_action(act)) {
-+ case TCA_VLAN_ACT_PUSH:
-+ fl_action->id = FLOW_ACTION_VLAN_PUSH;
-+ break;
-+ case TCA_VLAN_ACT_POP:
-+ fl_action->id = FLOW_ACTION_VLAN_POP;
-+ break;
-+ case TCA_VLAN_ACT_MODIFY:
-+ fl_action->id = FLOW_ACTION_VLAN_MANGLE;
-+ break;
-+ default:
-+ return -EOPNOTSUPP;
-+ }
- }
-
- return 0;
-diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
-index 33b81c867ac0..2a1cc7fe2dd9 100644
---- a/net/sched/cls_api.c
-+++ b/net/sched/cls_api.c
-@@ -3488,8 +3488,8 @@ static int tc_setup_flow_act(struct tc_action *act,
- #endif
- }
-
--int tc_setup_flow_action(struct flow_action *flow_action,
-- const struct tcf_exts *exts)
-+int tc_setup_action(struct flow_action *flow_action,
-+ struct tc_action *actions[])
- {
- int i, j, index, err = 0;
- struct tc_action *act;
-@@ -3498,11 +3498,11 @@ int tc_setup_flow_action(struct flow_action *flow_action,
- BUILD_BUG_ON(TCA_ACT_HW_STATS_IMMEDIATE != FLOW_ACTION_HW_STATS_IMMEDIATE);
- BUILD_BUG_ON(TCA_ACT_HW_STATS_DELAYED != FLOW_ACTION_HW_STATS_DELAYED);
-
-- if (!exts)
-+ if (!actions)
- return 0;
-
- j = 0;
-- tcf_exts_for_each_action(i, act, exts) {
-+ tcf_act_for_each_action(i, act, actions) {
- struct flow_action_entry *entry;
-
- entry = &flow_action->entries[j];
-@@ -3531,6 +3531,19 @@ int tc_setup_flow_action(struct flow_action *flow_action,
- spin_unlock_bh(&act->tcfa_lock);
- goto err_out;
- }
-+
-+int tc_setup_flow_action(struct flow_action *flow_action,
-+ const struct tcf_exts *exts)
-+{
-+#ifdef CONFIG_NET_CLS_ACT
-+ if (!exts)
-+ return 0;
-+
-+ return tc_setup_action(flow_action, exts->actions);
-+#else
-+ return 0;
-+#endif
-+}
- EXPORT_SYMBOL(tc_setup_flow_action);
-
- unsigned int tcf_exts_num_actions(struct tcf_exts *exts)
+ /* compat_mode being true specifies a call that is supposed
+ * to add additional backward compatibility statistic TLVs.
+ */
--
2.20.1