From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo Neira Ayuso Subject: [PATCH RFC,net-next 07/10] cls_flower: don't expose TC actions to drivers anymore Date: Tue, 25 Sep 2018 21:19:58 +0200 Message-ID: <20180925192001.2482-8-pablo@netfilter.org> References: <20180925192001.2482-1-pablo@netfilter.org> Cc: 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, ganeshgr@chelsio.com, jakub.kicinski@netronome.com, linux-net-drivers@solarflare.com, peppe.cavallaro@st.com, alexandre.torgue@st.com, joabreu@synopsys.com, grygorii.strashko@ti.com, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com To: netdev@vger.kernel.org Return-path: Received: from mail.us.es ([193.147.175.20]:49642 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727944AbeIZB3e (ORCPT ); Tue, 25 Sep 2018 21:29:34 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 1AF9118FCFF for ; Tue, 25 Sep 2018 21:20:31 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id DEEE0DA846 for ; Tue, 25 Sep 2018 21:20:30 +0200 (CEST) In-Reply-To: <20180925192001.2482-1-pablo@netfilter.org> Sender: netdev-owner@vger.kernel.org List-ID: Now that drivers have been converted to use the flow action infrastructure, remove this field from the tc_cls_flower_offload structure. Signed-off-by: Pablo Neira Ayuso --- include/net/pkt_cls.h | 1 - net/sched/cls_flower.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index c8e61e8b0257..a6317baff462 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -742,7 +742,6 @@ struct tc_cls_flower_offload { enum tc_fl_command command; unsigned long cookie; struct flow_rule rule; - struct tcf_exts *exts; u32 classid; struct tc_cls_flower_stats stats; }; diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index a89f3370718f..e7fcd5e9ba1e 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -419,7 +419,6 @@ static int fl_hw_replace_filter(struct tcf_proto *tp, cls_flower.rule.match.dissector = &f->mask->dissector; cls_flower.rule.match.mask = &f->mask->key; cls_flower.rule.match.key = &f->mkey; - cls_flower.exts = &f->exts; cls_flower.classid = f->res.classid; if (fl_hw_setup_action(&f->action, &f->exts) < 0) @@ -455,7 +454,6 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f) tc_cls_common_offload_init(&cls_flower.common, tp, f->flags, NULL); cls_flower.command = TC_CLSFLOWER_STATS; cls_flower.cookie = (unsigned long) f; - cls_flower.exts = &f->exts; cls_flower.classid = f->res.classid; tc_setup_cb_call(block, &f->exts, TC_SETUP_CLSFLOWER, @@ -1464,7 +1462,6 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, tc_setup_cb_t *cb, cls_flower.rule.match.dissector = &mask->dissector; cls_flower.rule.match.mask = &mask->key; cls_flower.rule.match.key = &f->mkey; - cls_flower.exts = &f->exts; cls_flower.rule.action.num_keys = f->action.num_keys; cls_flower.rule.action.keys = f->action.keys; cls_flower.classid = f->res.classid; @@ -1489,7 +1486,6 @@ static void fl_hw_create_tmplt(struct tcf_chain *chain, { struct tc_cls_flower_offload cls_flower = {}; struct tcf_block *block = chain->block; - struct tcf_exts dummy_exts = { 0, }; cls_flower.common.chain_index = chain->index; cls_flower.command = TC_CLSFLOWER_TMPLT_CREATE; @@ -1497,7 +1493,6 @@ static void fl_hw_create_tmplt(struct tcf_chain *chain, cls_flower.rule.match.dissector = &tmplt->dissector; cls_flower.rule.match.mask = &tmplt->mask; cls_flower.rule.match.key = &tmplt->dummy_key; - cls_flower.exts = &dummy_exts; /* We don't care if driver (any of them) fails to handle this * call. It serves just as a hint for it. -- 2.11.0