Mon, Nov 19, 2018 at 01:15:11AM CET, pa...@netfilter.org wrote: >This patch implements a new function to translate from native TC action >to the new flow_action representation. Moreover, this patch also updates >cls_flower to use this new function. > >Signed-off-by: Pablo Neira Ayuso <pa...@netfilter.org> >--- >v2: no changes. > > include/net/pkt_cls.h | 3 ++ > net/sched/cls_api.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++ > net/sched/cls_flower.c | 15 ++++++- > 3 files changed, 130 insertions(+), 1 deletion(-) > >diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h >index 8b79a1a3a5c7..7d7aefa5fcd2 100644 >--- a/include/net/pkt_cls.h >+++ b/include/net/pkt_cls.h >@@ -619,6 +619,9 @@ tcf_match_indev(struct sk_buff *skb, int ifindex) > } > #endif /* CONFIG_NET_CLS_IND */ > >+int tc_setup_flow_action(struct flow_action *flow_action, >+ const struct tcf_exts *exts); >+ > int tc_setup_cb_call(struct tcf_block *block, struct tcf_exts *exts, > enum tc_setup_type type, void *type_data, bool err_stop); > >diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c >index d92f44ac4c39..6ab44e650f43 100644 >--- a/net/sched/cls_api.c >+++ b/net/sched/cls_api.c >@@ -31,6 +31,14 @@ > #include <net/netlink.h> > #include <net/pkt_sched.h> > #include <net/pkt_cls.h> >+#include <net/tc_act/tc_mirred.h> >+#include <net/tc_act/tc_vlan.h> >+#include <net/tc_act/tc_tunnel_key.h> >+#include <net/tc_act/tc_pedit.h> >+#include <net/tc_act/tc_csum.h> >+#include <net/tc_act/tc_gact.h> >+#include <net/tc_act/tc_skbedit.h> >+#include <net/tc_act/tc_mirred.h> > > extern const struct nla_policy rtm_tca_policy[TCA_MAX + 1]; > >@@ -2567,6 +2575,111 @@ int tc_setup_cb_call(struct tcf_block *block, struct >tcf_exts *exts, > } > EXPORT_SYMBOL(tc_setup_cb_call); > >+int tc_setup_flow_action(struct flow_action *flow_action, >+ const struct tcf_exts *exts) >+{ >+ const struct tc_action *act; >+ int num_acts = 0, i, j, k; >+ >+ if (!exts) >+ return 0; >+ >+ tcf_exts_for_each_action(i, act, exts) { >+ if (is_tcf_pedit(act)) >+ num_acts += tcf_pedit_nkeys(act); >+ else >+ num_acts++; >+ } >+ if (!num_acts) >+ return 0; >+ >+ if (flow_action_init(flow_action, num_acts) < 0)
This is actually a "alloc" function. And the counterpart is "free". How about to allocate the container struct which would have the [0] trick for the array of action? [...]