ip: fix mc_loop checks for tunnels with multicast outer addresses
[linux-2.6.git] / net / sched / sch_prio.c
index 39157f7..93285ce 100644 (file)
 struct prio_sched_data
 {
        int bands;
-       int curband; /* for round-robin */
        struct tcf_proto *filter_list;
        u8  prio2band[TC_PRIO_MAX+1];
        struct Qdisc *queues[TCQ_PRIO_BANDS];
-       int mq;
 };
 
 
@@ -40,14 +38,14 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
        struct tcf_result res;
        int err;
 
-       *qerr = NET_XMIT_BYPASS;
+       *qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
        if (TC_H_MAJ(skb->priority) != sch->handle) {
                err = tc_classify(skb, q->filter_list, &res);
 #ifdef CONFIG_NET_CLS_ACT
                switch (err) {
                case TC_ACT_STOLEN:
                case TC_ACT_QUEUED:
-                       *qerr = NET_XMIT_SUCCESS;
+                       *qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN;
                case TC_ACT_SHOT:
                        return NULL;
                }
@@ -55,17 +53,14 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
                if (!q->filter_list || err < 0) {
                        if (TC_H_MAJ(band))
                                band = 0;
-                       band = q->prio2band[band&TC_PRIO_MAX];
-                       goto out;
+                       return q->queues[q->prio2band[band&TC_PRIO_MAX]];
                }
                band = res.classid;
        }
        band = TC_H_MIN(band) - 1;
        if (band >= q->bands)
-               band = q->prio2band[0];
-out:
-       if (q->mq)
-               skb_set_queue_mapping(skb, band);
+               return q->queues[q->prio2band[0]];
+
        return q->queues[band];
 }
 
@@ -79,110 +74,54 @@ prio_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 #ifdef CONFIG_NET_CLS_ACT
        if (qdisc == NULL) {
 
-               if (ret == NET_XMIT_BYPASS)
+               if (ret & __NET_XMIT_BYPASS)
                        sch->qstats.drops++;
                kfree_skb(skb);
                return ret;
        }
 #endif
 
-       if ((ret = qdisc->enqueue(skb, qdisc)) == NET_XMIT_SUCCESS) {
-               sch->bstats.bytes += skb->len;
+       ret = qdisc_enqueue(skb, qdisc);
+       if (ret == NET_XMIT_SUCCESS) {
+               sch->bstats.bytes += qdisc_pkt_len(skb);
                sch->bstats.packets++;
                sch->q.qlen++;
                return NET_XMIT_SUCCESS;
        }
-       sch->qstats.drops++;
+       if (net_xmit_drop_count(ret))
+               sch->qstats.drops++;
        return ret;
 }
 
-
-static int
-prio_requeue(struct sk_buff *skb, struct Qdisc* sch)
-{
-       struct Qdisc *qdisc;
-       int ret;
-
-       qdisc = prio_classify(skb, sch, &ret);
-#ifdef CONFIG_NET_CLS_ACT
-       if (qdisc == NULL) {
-               if (ret == NET_XMIT_BYPASS)
-                       sch->qstats.drops++;
-               kfree_skb(skb);
-               return ret;
-       }
-#endif
-
-       if ((ret = qdisc->ops->requeue(skb, qdisc)) == NET_XMIT_SUCCESS) {
-               sch->q.qlen++;
-               sch->qstats.requeues++;
-               return 0;
-       }
-       sch->qstats.drops++;
-       return NET_XMIT_DROP;
-}
-
-
-static struct sk_buff *
-prio_dequeue(struct Qdisc* sch)
+static struct sk_buff *prio_peek(struct Qdisc *sch)
 {
-       struct sk_buff *skb;
        struct prio_sched_data *q = qdisc_priv(sch);
        int prio;
-       struct Qdisc *qdisc;
 
        for (prio = 0; prio < q->bands; prio++) {
-               /* Check if the target subqueue is available before
-                * pulling an skb.  This way we avoid excessive requeues
-                * for slower queues.
-                */
-               if (!__netif_subqueue_stopped(qdisc_dev(sch),
-                                             (q->mq ? prio : 0))) {
-                       qdisc = q->queues[prio];
-                       skb = qdisc->dequeue(qdisc);
-                       if (skb) {
-                               sch->q.qlen--;
-                               return skb;
-                       }
-               }
+               struct Qdisc *qdisc = q->queues[prio];
+               struct sk_buff *skb = qdisc->ops->peek(qdisc);
+               if (skb)
+                       return skb;
        }
        return NULL;
-
 }
 
-static struct sk_buff *rr_dequeue(struct Qdisc* sch)
+static struct sk_buff *prio_dequeue(struct Qdisc* sch)
 {
-       struct sk_buff *skb;
        struct prio_sched_data *q = qdisc_priv(sch);
-       struct Qdisc *qdisc;
-       int bandcount;
-
-       /* Only take one pass through the queues.  If nothing is available,
-        * return nothing.
-        */
-       for (bandcount = 0; bandcount < q->bands; bandcount++) {
-               /* Check if the target subqueue is available before
-                * pulling an skb.  This way we avoid excessive requeues
-                * for slower queues.  If the queue is stopped, try the
-                * next queue.
-                */
-               if (!__netif_subqueue_stopped(qdisc_dev(sch),
-                                             (q->mq ? q->curband : 0))) {
-                       qdisc = q->queues[q->curband];
-                       skb = qdisc->dequeue(qdisc);
-                       if (skb) {
-                               sch->q.qlen--;
-                               q->curband++;
-                               if (q->curband >= q->bands)
-                                       q->curband = 0;
-                               return skb;
-                       }
+       int prio;
+
+       for (prio = 0; prio < q->bands; prio++) {
+               struct Qdisc *qdisc = q->queues[prio];
+               struct sk_buff *skb = qdisc->dequeue(qdisc);
+               if (skb) {
+                       sch->q.qlen--;
+                       return skb;
                }
-               q->curband++;
-               if (q->curband >= q->bands)
-                       q->curband = 0;
        }
        return NULL;
+
 }
 
 static unsigned int prio_drop(struct Qdisc* sch)
@@ -229,49 +168,27 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt)
 {
        struct prio_sched_data *q = qdisc_priv(sch);
        struct tc_prio_qopt *qopt;
-       struct nlattr *tb[TCA_PRIO_MAX + 1];
-       int err;
        int i;
 
-       err = nla_parse_nested_compat(tb, TCA_PRIO_MAX, opt, NULL, qopt,
-                                     sizeof(*qopt));
-       if (err < 0)
-               return err;
-
-       q->bands = qopt->bands;
-       /* If we're multiqueue, make sure the number of incoming bands
-        * matches the number of queues on the device we're associating with.
-        * If the number of bands requested is zero, then set q->bands to
-        * dev->egress_subqueue_count.  Also, the root qdisc must be the
-        * only one that is enabled for multiqueue, since it's the only one
-        * that interacts with the underlying device.
-        */
-       q->mq = nla_get_flag(tb[TCA_PRIO_MQ]);
-       if (q->mq) {
-               if (sch->parent != TC_H_ROOT)
-                       return -EINVAL;
-               if (netif_is_multiqueue(qdisc_dev(sch))) {
-                       if (q->bands == 0)
-                               q->bands = qdisc_dev(sch)->egress_subqueue_count;
-                       else if (q->bands != qdisc_dev(sch)->egress_subqueue_count)
-                               return -EINVAL;
-               } else
-                       return -EOPNOTSUPP;
-       }
+       if (nla_len(opt) < sizeof(*qopt))
+               return -EINVAL;
+       qopt = nla_data(opt);
 
-       if (q->bands > TCQ_PRIO_BANDS || q->bands < 2)
+       if (qopt->bands > TCQ_PRIO_BANDS || qopt->bands < 2)
                return -EINVAL;
 
        for (i=0; i<=TC_PRIO_MAX; i++) {
-               if (qopt->priomap[i] >= q->bands)
+               if (qopt->priomap[i] >= qopt->bands)
                        return -EINVAL;
        }
 
        sch_tree_lock(sch);
+       q->bands = qopt->bands;
        memcpy(q->prio2band, qopt->priomap, TC_PRIO_MAX+1);
 
        for (i=q->bands; i<TCQ_PRIO_BANDS; i++) {
-               struct Qdisc *child = xchg(&q->queues[i], &noop_qdisc);
+               struct Qdisc *child = q->queues[i];
+               q->queues[i] = &noop_qdisc;
                if (child != &noop_qdisc) {
                        qdisc_tree_decrease_qlen(child, child->q.qlen);
                        qdisc_destroy(child);
@@ -281,18 +198,19 @@ static int prio_tune(struct Qdisc *sch, struct nlattr *opt)
 
        for (i=0; i<q->bands; i++) {
                if (q->queues[i] == &noop_qdisc) {
-                       struct Qdisc *child;
+                       struct Qdisc *child, *old;
                        child = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
                                                  &pfifo_qdisc_ops,
                                                  TC_H_MAKE(sch->handle, i + 1));
                        if (child) {
                                sch_tree_lock(sch);
-                               child = xchg(&q->queues[i], child);
+                               old = q->queues[i];
+                               q->queues[i] = child;
 
-                               if (child != &noop_qdisc) {
-                                       qdisc_tree_decrease_qlen(child,
-                                                                child->q.qlen);
-                                       qdisc_destroy(child);
+                               if (old != &noop_qdisc) {
+                                       qdisc_tree_decrease_qlen(old,
+                                                                old->q.qlen);
+                                       qdisc_destroy(old);
                                }
                                sch_tree_unlock(sch);
                        }
@@ -324,20 +242,12 @@ static int prio_dump(struct Qdisc *sch, struct sk_buff *skb)
 {
        struct prio_sched_data *q = qdisc_priv(sch);
        unsigned char *b = skb_tail_pointer(skb);
-       struct nlattr *nest;
        struct tc_prio_qopt opt;
 
        opt.bands = q->bands;
        memcpy(&opt.priomap, q->prio2band, TC_PRIO_MAX+1);
 
-       nest = nla_nest_compat_start(skb, TCA_OPTIONS, sizeof(opt), &opt);
-       if (nest == NULL)
-               goto nla_put_failure;
-       if (q->mq) {
-               if (nla_put_flag(skb, TCA_PRIO_MQ) < 0)
-                       goto nla_put_failure;
-       }
-       nla_nest_compat_end(skb, nest);
+       NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
 
        return skb->len;
 
@@ -352,9 +262,6 @@ static int prio_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
        struct prio_sched_data *q = qdisc_priv(sch);
        unsigned long band = arg - 1;
 
-       if (band >= q->bands)
-               return -EINVAL;
-
        if (new == NULL)
                new = &noop_qdisc;
 
@@ -374,9 +281,6 @@ prio_leaf(struct Qdisc *sch, unsigned long arg)
        struct prio_sched_data *q = qdisc_priv(sch);
        unsigned long band = arg - 1;
 
-       if (band >= q->bands)
-               return NULL;
-
        return q->queues[band];
 }
 
@@ -401,35 +305,13 @@ static void prio_put(struct Qdisc *q, unsigned long cl)
        return;
 }
 
-static int prio_change(struct Qdisc *sch, u32 handle, u32 parent, struct nlattr **tca, unsigned long *arg)
-{
-       unsigned long cl = *arg;
-       struct prio_sched_data *q = qdisc_priv(sch);
-
-       if (cl - 1 > q->bands)
-               return -ENOENT;
-       return 0;
-}
-
-static int prio_delete(struct Qdisc *sch, unsigned long cl)
-{
-       struct prio_sched_data *q = qdisc_priv(sch);
-       if (cl - 1 > q->bands)
-               return -ENOENT;
-       return 0;
-}
-
-
 static int prio_dump_class(struct Qdisc *sch, unsigned long cl, struct sk_buff *skb,
                           struct tcmsg *tcm)
 {
        struct prio_sched_data *q = qdisc_priv(sch);
 
-       if (cl - 1 > q->bands)
-               return -ENOENT;
        tcm->tcm_handle |= TC_H_MIN(cl);
-       if (q->queues[cl-1])
-               tcm->tcm_info = q->queues[cl-1]->handle;
+       tcm->tcm_info = q->queues[cl-1]->handle;
        return 0;
 }
 
@@ -440,6 +322,7 @@ static int prio_dump_class_stats(struct Qdisc *sch, unsigned long cl,
        struct Qdisc *cl_q;
 
        cl_q = q->queues[cl - 1];
+       cl_q->qstats.qlen = cl_q->q.qlen;
        if (gnet_stats_copy_basic(d, &cl_q->bstats) < 0 ||
            gnet_stats_copy_queue(d, &cl_q->qstats) < 0)
                return -1;
@@ -482,8 +365,6 @@ static const struct Qdisc_class_ops prio_class_ops = {
        .leaf           =       prio_leaf,
        .get            =       prio_get,
        .put            =       prio_put,
-       .change         =       prio_change,
-       .delete         =       prio_delete,
        .walk           =       prio_walk,
        .tcf_chain      =       prio_find_tcf,
        .bind_tcf       =       prio_bind,
@@ -499,24 +380,7 @@ static struct Qdisc_ops prio_qdisc_ops __read_mostly = {
        .priv_size      =       sizeof(struct prio_sched_data),
        .enqueue        =       prio_enqueue,
        .dequeue        =       prio_dequeue,
-       .requeue        =       prio_requeue,
-       .drop           =       prio_drop,
-       .init           =       prio_init,
-       .reset          =       prio_reset,
-       .destroy        =       prio_destroy,
-       .change         =       prio_tune,
-       .dump           =       prio_dump,
-       .owner          =       THIS_MODULE,
-};
-
-static struct Qdisc_ops rr_qdisc_ops __read_mostly = {
-       .next           =       NULL,
-       .cl_ops         =       &prio_class_ops,
-       .id             =       "rr",
-       .priv_size      =       sizeof(struct prio_sched_data),
-       .enqueue        =       prio_enqueue,
-       .dequeue        =       rr_dequeue,
-       .requeue        =       prio_requeue,
+       .peek           =       prio_peek,
        .drop           =       prio_drop,
        .init           =       prio_init,
        .reset          =       prio_reset,
@@ -528,25 +392,15 @@ static struct Qdisc_ops rr_qdisc_ops __read_mostly = {
 
 static int __init prio_module_init(void)
 {
-       int err;
-
-       err = register_qdisc(&prio_qdisc_ops);
-       if (err < 0)
-               return err;
-       err = register_qdisc(&rr_qdisc_ops);
-       if (err < 0)
-               unregister_qdisc(&prio_qdisc_ops);
-       return err;
+       return register_qdisc(&prio_qdisc_ops);
 }
 
 static void __exit prio_module_exit(void)
 {
        unregister_qdisc(&prio_qdisc_ops);
-       unregister_qdisc(&rr_qdisc_ops);
 }
 
 module_init(prio_module_init)
 module_exit(prio_module_exit)
 
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("sch_rr");