Skip to content

Commit 8c710f7

Browse files
jhsmtPaolo Abeni
authored andcommitted
net/sched: Retire tcindex classifier
The tcindex classifier has served us well for about a quarter of a century but has not been getting much TLC due to lack of known users. Most recently it has become easy prey to syzkaller. For this reason, we are retiring it. Signed-off-by: Jamal Hadi Salim <[email protected]> Acked-by: Jiri Pirko <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent bbe77c1 commit 8c710f7

File tree

5 files changed

+0
-960
lines changed

5 files changed

+0
-960
lines changed

include/net/tc_wrapper.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ TC_INDIRECT_FILTER_DECLARE(mall_classify);
154154
TC_INDIRECT_FILTER_DECLARE(route4_classify);
155155
TC_INDIRECT_FILTER_DECLARE(rsvp_classify);
156156
TC_INDIRECT_FILTER_DECLARE(rsvp6_classify);
157-
TC_INDIRECT_FILTER_DECLARE(tcindex_classify);
158157
TC_INDIRECT_FILTER_DECLARE(u32_classify);
159158

160159
static inline int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,
@@ -207,10 +206,6 @@ static inline int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,
207206
if (tp->classify == rsvp6_classify)
208207
return rsvp6_classify(skb, tp, res);
209208
#endif
210-
#if IS_BUILTIN(CONFIG_NET_CLS_TCINDEX)
211-
if (tp->classify == tcindex_classify)
212-
return tcindex_classify(skb, tp, res);
213-
#endif
214209

215210
skip:
216211
return tp->classify(skb, tp, res);

net/sched/Kconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -468,17 +468,6 @@ config NET_CLS_BASIC
468468
To compile this code as a module, choose M here: the
469469
module will be called cls_basic.
470470

471-
config NET_CLS_TCINDEX
472-
tristate "Traffic-Control Index (TCINDEX)"
473-
select NET_CLS
474-
help
475-
Say Y here if you want to be able to classify packets based on
476-
traffic control indices. You will want this feature if you want
477-
to implement Differentiated Services together with DSMARK.
478-
479-
To compile this code as a module, choose M here: the
480-
module will be called cls_tcindex.
481-
482471
config NET_CLS_ROUTE4
483472
tristate "Routing decision (ROUTE)"
484473
depends on INET

net/sched/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ obj-$(CONFIG_NET_CLS_U32) += cls_u32.o
6868
obj-$(CONFIG_NET_CLS_ROUTE4) += cls_route.o
6969
obj-$(CONFIG_NET_CLS_FW) += cls_fw.o
7070
obj-$(CONFIG_NET_CLS_RSVP) += cls_rsvp.o
71-
obj-$(CONFIG_NET_CLS_TCINDEX) += cls_tcindex.o
7271
obj-$(CONFIG_NET_CLS_RSVP6) += cls_rsvp6.o
7372
obj-$(CONFIG_NET_CLS_BASIC) += cls_basic.o
7473
obj-$(CONFIG_NET_CLS_FLOW) += cls_flow.o

0 commit comments

Comments
 (0)