net: sched: consolidate tc_classify{,_compat}

For classifiers getting invoked via tc_classify(), we always need an
extra function call into tc_classify_compat(), as both are being
exported as symbols and tc_classify() itself doesn't do much except
handling of reclassifications when tp->classify() returned with
TC_ACT_RECLASSIFY.

CBQ and ATM are the only qdiscs that directly call into tc_classify_compat(),
all others use tc_classify(). When tc actions are being configured
out in the kernel, tc_classify() effectively does nothing besides
delegating.

We could spare this layer and consolidate both functions. pktgen on
single CPU constantly pushing skbs directly into the netif_receive_skb()
path with a dummy classifier on ingress qdisc attached, improves
slightly from 22.3Mpps to 23.1Mpps.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 2342bf1..401038d 100644 (file)
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -110,10 +110,8 @@ static inline void qdisc_run(struct Qdisc *q)
                __qdisc_run(q);
 }
 
-int tc_classify_compat(struct sk_buff *skb, const struct tcf_proto *tp,
-                      struct tcf_result *res);
 int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,
-               struct tcf_result *res);
+               struct tcf_result *res, bool compat_mode);
 
 static inline __be16 tc_skb_protocol(const struct sk_buff *skb)
 {

diff --cc net/core/dev.c
Simple merge

diff --cc net/sched/sch_api.c
Simple merge

diff --cc net/sched/sch_atm.c
Simple merge

diff --cc net/sched/sch_cbq.c
Simple merge

diff --cc net/sched/sch_choke.c
Simple merge

diff --cc net/sched/sch_drr.c
Simple merge

diff --cc net/sched/sch_dsmark.c
Simple merge

diff --cc net/sched/sch_fq_codel.c
Simple merge

diff --cc net/sched/sch_hfsc.c
Simple merge

diff --cc net/sched/sch_htb.c
Simple merge

diff --cc net/sched/sch_multiq.c
Simple merge

diff --cc net/sched/sch_prio.c
Simple merge

diff --cc net/sched/sch_qfq.c
Simple merge

diff --cc net/sched/sch_sfb.c
Simple merge

diff --cc net/sched/sch_sfq.c
Simple merge