From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Pirko Subject: Re: [PATCH net-next,v2 04/12] cls_api: add translator to flow_action representation Date: Mon, 19 Nov 2018 13:12:51 +0100 Message-ID: <20181119121251.GC2223@nanopsycho.orion> References: <20181119001519.12124-1-pablo@netfilter.org> <20181119001519.12124-5-pablo@netfilter.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, davem@davemloft.net, thomas.lendacky@amd.com, f.fainelli@gmail.com, ariel.elior@cavium.com, michael.chan@broadcom.com, santosh@chelsio.com, madalin.bucur@nxp.com, yisen.zhuang@huawei.com, salil.mehta@huawei.com, jeffrey.t.kirsher@intel.com, tariqt@mellanox.com, saeedm@mellanox.com, jiri@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, peppe.cavallaro@st.com, grygorii.strashko@ti.com, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, alexandre.torgue@st.com, joabreu@synopsys.com, linux-net-drivers@solarflare.com, ganeshgr@chelsio.com, ogerlitz@mellanox.com To: Pablo Neira Ayuso Return-path: Received: from mail-wm1-f65.google.com ([209.85.128.65]:35191 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728679AbeKSWnA (ORCPT ); Mon, 19 Nov 2018 17:43:00 -0500 Received: by mail-wm1-f65.google.com with SMTP id t15-v6so5045540wmt.0 for ; Mon, 19 Nov 2018 04:19:31 -0800 (PST) Content-Disposition: inline In-Reply-To: <20181119001519.12124-5-pablo@netfilter.org> Sender: netdev-owner@vger.kernel.org List-ID: Mon, Nov 19, 2018 at 01:15:11AM CET, pablo@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 >--- >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 > #include > #include >+#include >+#include >+#include >+#include >+#include >+#include >+#include >+#include > > 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? [...]