net: sched: run ingress qdisc without locks

TC classifiers/actions were converted to RCU by John in the series:
http://thread.gmane.org/gmane.linux.network/329739/focus=329739
and many follow on patches.
This is the last patch from that series that finally drops
ingress spin_lock.

Single cpu ingress+u32 performance goes from 22.9 Mpps to 24.5 Mpps.

In two cpu case when both cores are receiving traffic on the same
device and go into the same ingress+u32 the performance jumps
from 4.5 + 4.5 Mpps to 23.5 + 23.5 Mpps

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/dev.c b/net/core/dev.c
index c7ba0388f1be8e37e780f27e0b3bd95f45dd0ade..74a5b62f756853d102ae8f2ad17f577c05a843e6 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3547,10 +3547,8 @@ static int ing_filter(struct sk_buff *skb, struct netdev_queue *rxq)
 
        q = rcu_dereference(rxq->qdisc);
        if (q != &noop_qdisc) {
-               spin_lock(qdisc_lock(q));
                if (likely(!test_bit(__QDISC_STATE_DEACTIVATED, &q->state)))
                        result = qdisc_enqueue_root(skb, q);
-               spin_unlock(qdisc_lock(q));
        }
 
        return result;

diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 4cdbfb85686a7ee55d71d0a7c1ea5cdd7e789a22..a89cc3278bfb4b045955c71a2a98d97c647a0725 100644 (file)
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -65,11 +65,11 @@ static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 
        result = tc_classify(skb, fl, &res);
 
-       qdisc_bstats_update(sch, skb);
+       qdisc_bstats_update_cpu(sch, skb);
        switch (result) {
        case TC_ACT_SHOT:
                result = TC_ACT_SHOT;
-               qdisc_qstats_drop(sch);
+               qdisc_qstats_drop_cpu(sch);
                break;
        case TC_ACT_STOLEN:
        case TC_ACT_QUEUED:
@@ -91,6 +91,7 @@ static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 static int ingress_init(struct Qdisc *sch, struct nlattr *opt)
 {
        net_inc_ingress_queue();
+       sch->flags |= TCQ_F_CPUSTATS;
 
        return 0;
 }