nfsd4: simplify lease/grace interaction

[safe/jmp/linux-2.6] / net / sched / sch_netem.c

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 7228d30..d8b10e0 100644 (file)
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -4,25 +4,23 @@
  *             This program is free software; you can redistribute it and/or
  *             modify it under the terms of the GNU General Public License
  *             as published by the Free Software Foundation; either version
  *             This program is free software; you can redistribute it and/or
  *             modify it under the terms of the GNU General Public License
  *             as published by the Free Software Foundation; either version

- *             2 of the License, or (at your option) any later version.
+ *             2 of the License.

  *
  *             Many of the algorithms and ideas for this came from
  *
  *             Many of the algorithms and ideas for this came from

- *             NIST Net which is not copyrighted. 
+ *             NIST Net which is not copyrighted.

  *
  * Authors:    Stephen Hemminger <shemminger@osdl.org>
  *             Catalin(ux aka Dino) BOIE <catab at umbrella dot ro>
  */
 
  *
  * Authors:    Stephen Hemminger <shemminger@osdl.org>
  *             Catalin(ux aka Dino) BOIE <catab at umbrella dot ro>
  */
 

-#include <linux/config.h>

 #include <linux/module.h>
 #include <linux/module.h>

-#include <linux/bitops.h>

 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>

-#include <linux/netdevice.h>

 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
 
 #include <linux/skbuff.h>
 #include <linux/rtnetlink.h>
 

+#include <net/netlink.h>

 #include <net/pkt_sched.h>
 
 #define VERSION "1.2"
 #include <net/pkt_sched.h>
 
 #define VERSION "1.2"


@@ -48,28 +46,26 @@
         layering other disciplines.  It does not need to do bandwidth
         control either since that can be handled by using token
         bucket or other rate control.
         layering other disciplines.  It does not need to do bandwidth
         control either since that can be handled by using token
         bucket or other rate control.

-
-        The simulator is limited by the Linux timer resolution
-        and will create packet bursts on the HZ boundary (1ms).

 */
 
 struct netem_sched_data {
        struct Qdisc    *qdisc;
 */
 
 struct netem_sched_data {
        struct Qdisc    *qdisc;

-       struct timer_list timer;
+       struct qdisc_watchdog watchdog;
+
+       psched_tdiff_t latency;
+       psched_tdiff_t jitter;

 
 

-       u32 latency;

        u32 loss;
        u32 limit;
        u32 counter;
        u32 gap;
        u32 loss;
        u32 limit;
        u32 counter;
        u32 gap;

-       u32 jitter;

        u32 duplicate;
        u32 reorder;
        u32 corrupt;
 
        struct crndstate {
        u32 duplicate;
        u32 reorder;
        u32 corrupt;
 
        struct crndstate {

-               unsigned long last;
-               unsigned long rho;
+               u32 last;
+               u32 rho;

        } delay_cor, loss_cor, dup_cor, reorder_cor, corrupt_cor;
 
        struct disttable {
        } delay_cor, loss_cor, dup_cor, reorder_cor, corrupt_cor;
 
        struct disttable {


@@ -83,6 +79,13 @@ struct netem_skb_cb {
        psched_time_t   time_to_send;
 };
 
        psched_time_t   time_to_send;
 };
 

+static inline struct netem_skb_cb *netem_skb_cb(struct sk_buff *skb)
+{
+       BUILD_BUG_ON(sizeof(skb->cb) <
+               sizeof(struct qdisc_skb_cb) + sizeof(struct netem_skb_cb));
+       return (struct netem_skb_cb *)qdisc_skb_cb(skb)->data;
+}
+

 /* init_crandom - initialize correlated random number generator
  * Use entropy source for initial seed.
  */
 /* init_crandom - initialize correlated random number generator
  * Use entropy source for initial seed.
  */


@@ -96,12 +99,12 @@ static void init_crandom(struct crndstate *state, unsigned long rho)
  * Next number depends on last value.
  * rho is scaled to avoid floating point.
  */
  * Next number depends on last value.
  * rho is scaled to avoid floating point.
  */

-static unsigned long get_crandom(struct crndstate *state)
+static u32 get_crandom(struct crndstate *state)

 {
        u64 value, rho;
        unsigned long answer;
 
 {
        u64 value, rho;
        unsigned long answer;
 

-       if (state->rho == 0)    /* no correllation */
+       if (state->rho == 0)    /* no correlation */

                return net_random();
 
        value = net_random();
                return net_random();
 
        value = net_random();


@@ -115,11 +118,13 @@ static unsigned long get_crandom(struct crndstate *state)
  * std deviation sigma.  Uses table lookup to approximate the desired
  * distribution, and a uniformly-distributed pseudo-random source.
  */
  * std deviation sigma.  Uses table lookup to approximate the desired
  * distribution, and a uniformly-distributed pseudo-random source.
  */

-static long tabledist(unsigned long mu, long sigma, 
-                     struct crndstate *state, const struct disttable *dist)
+static psched_tdiff_t tabledist(psched_tdiff_t mu, psched_tdiff_t sigma,
+                               struct crndstate *state,
+                               const struct disttable *dist)

 {
 {

-       long t, x;
-       unsigned long rnd;
+       psched_tdiff_t x;
+       long t;
+       u32 rnd;

 
        if (sigma == 0)
                return mu;
 
        if (sigma == 0)
                return mu;


@@ -127,7 +132,7 @@ static long tabledist(unsigned long mu, long sigma,
        rnd = get_crandom(state);
 
        /* default uniform distribution */
        rnd = get_crandom(state);
 
        /* default uniform distribution */

-       if (dist == NULL) 
+       if (dist == NULL)

                return (rnd % (2*sigma)) - sigma + mu;
 
        t = dist->table[rnd % dist->size];
                return (rnd % (2*sigma)) - sigma + mu;
 
        t = dist->table[rnd % dist->size];


@@ -149,7 +154,8 @@ static long tabledist(unsigned long mu, long sigma,
 static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 {
        struct netem_sched_data *q = qdisc_priv(sch);
 static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 {
        struct netem_sched_data *q = qdisc_priv(sch);

-       struct netem_skb_cb *cb = (struct netem_skb_cb *)skb->cb;
+       /* We don't fill cb now as skb_unshare() may invalidate it */
+       struct netem_skb_cb *cb;

        struct sk_buff *skb2;
        int ret;
        int count = 1;
        struct sk_buff *skb2;
        int ret;
        int count = 1;


@@ -167,20 +173,22 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
        if (count == 0) {
                sch->qstats.drops++;
                kfree_skb(skb);
        if (count == 0) {
                sch->qstats.drops++;
                kfree_skb(skb);

-               return NET_XMIT_DROP;
+               return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;

        }
 
        }
 

+       skb_orphan(skb);
+

        /*
         * If we need to duplicate packet, then re-insert at top of the
         * qdisc tree, since parent queuer expects that only one
         * skb will be queued.
         */
        if (count > 1 && (skb2 = skb_clone(skb, GFP_ATOMIC)) != NULL) {
        /*
         * If we need to duplicate packet, then re-insert at top of the
         * qdisc tree, since parent queuer expects that only one
         * skb will be queued.
         */
        if (count > 1 && (skb2 = skb_clone(skb, GFP_ATOMIC)) != NULL) {

-               struct Qdisc *rootq = sch->dev->qdisc;
+               struct Qdisc *rootq = qdisc_root(sch);

                u32 dupsave = q->duplicate; /* prevent duplicating a dup... */
                q->duplicate = 0;
 
                u32 dupsave = q->duplicate; /* prevent duplicating a dup... */
                q->duplicate = 0;
 

-               rootq->enqueue(skb2, rootq);
+               qdisc_enqueue_root(skb2, rootq);

                q->duplicate = dupsave;
        }
 
                q->duplicate = dupsave;
        }
 


@@ -191,9 +199,9 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         * do it now in software before we mangle it.
         */
        if (q->corrupt && q->corrupt >= get_crandom(&q->corrupt_cor)) {
         * do it now in software before we mangle it.
         */
        if (q->corrupt && q->corrupt >= get_crandom(&q->corrupt_cor)) {

-               if (!(skb = skb_unshare(skb, GFP_ATOMIC))
-                   || (skb->ip_summed == CHECKSUM_HW
-                       && skb_checksum_help(skb, 0))) {
+               if (!(skb = skb_unshare(skb, GFP_ATOMIC)) ||
+                   (skb->ip_summed == CHECKSUM_PARTIAL &&
+                    skb_checksum_help(skb))) {

                        sch->qstats.drops++;
                        return NET_XMIT_DROP;
                }
                        sch->qstats.drops++;
                        return NET_XMIT_DROP;
                }


@@ -201,51 +209,43 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                skb->data[net_random() % skb_headlen(skb)] ^= 1<<(net_random() % 8);
        }
 
                skb->data[net_random() % skb_headlen(skb)] ^= 1<<(net_random() % 8);
        }
 

-       if (q->gap == 0                 /* not doing reordering */
-           || q->counter < q->gap      /* inside last reordering gap */
-           || q->reorder < get_crandom(&q->reorder_cor)) {
+       cb = netem_skb_cb(skb);
+       if (q->gap == 0 ||              /* not doing reordering */
+           q->counter < q->gap ||      /* inside last reordering gap */
+           q->reorder < get_crandom(&q->reorder_cor)) {

                psched_time_t now;
                psched_tdiff_t delay;
 
                delay = tabledist(q->latency, q->jitter,
                                  &q->delay_cor, q->delay_dist);
 
                psched_time_t now;
                psched_tdiff_t delay;
 
                delay = tabledist(q->latency, q->jitter,
                                  &q->delay_cor, q->delay_dist);
 

-               PSCHED_GET_TIME(now);
-               PSCHED_TADD2(now, delay, cb->time_to_send);
+               now = psched_get_time();
+               cb->time_to_send = now + delay;

                ++q->counter;
                ++q->counter;

-               ret = q->qdisc->enqueue(skb, q->qdisc);
+               ret = qdisc_enqueue(skb, q->qdisc);

        } else {
        } else {

-               /* 
+               /*

                 * Do re-ordering by putting one out of N packets at the front
                 * of the queue.
                 */
                 * Do re-ordering by putting one out of N packets at the front
                 * of the queue.
                 */

-               PSCHED_GET_TIME(cb->time_to_send);
+               cb->time_to_send = psched_get_time();

                q->counter = 0;
                q->counter = 0;

-               ret = q->qdisc->ops->requeue(skb, q->qdisc);
+
+               __skb_queue_head(&q->qdisc->q, skb);
+               q->qdisc->qstats.backlog += qdisc_pkt_len(skb);
+               q->qdisc->qstats.requeues++;
+               ret = NET_XMIT_SUCCESS;

        }
 
        if (likely(ret == NET_XMIT_SUCCESS)) {
                sch->q.qlen++;
        }
 
        if (likely(ret == NET_XMIT_SUCCESS)) {
                sch->q.qlen++;

-               sch->bstats.bytes += skb->len;
+               sch->bstats.bytes += qdisc_pkt_len(skb);

                sch->bstats.packets++;
                sch->bstats.packets++;

-       } else
+       } else if (net_xmit_drop_count(ret)) {

                sch->qstats.drops++;
                sch->qstats.drops++;

-
-       pr_debug("netem: enqueue ret %d\n", ret);
-       return ret;
-}
-
-/* Requeue packets but don't change time stamp */
-static int netem_requeue(struct sk_buff *skb, struct Qdisc *sch)
-{
-       struct netem_sched_data *q = qdisc_priv(sch);
-       int ret;
-
-       if ((ret = q->qdisc->ops->requeue(skb, q->qdisc)) == 0) {
-               sch->q.qlen++;
-               sch->qstats.requeues++;

        }
 
        }
 

+       pr_debug("netem: enqueue ret %d\n", ret);

        return ret;
 }
 
        return ret;
 }
 


@@ -266,91 +266,58 @@ static struct sk_buff *netem_dequeue(struct Qdisc *sch)
        struct netem_sched_data *q = qdisc_priv(sch);
        struct sk_buff *skb;
 
        struct netem_sched_data *q = qdisc_priv(sch);
        struct sk_buff *skb;
 

-       skb = q->qdisc->dequeue(q->qdisc);
+       if (sch->flags & TCQ_F_THROTTLED)
+               return NULL;
+
+       skb = q->qdisc->ops->peek(q->qdisc);

        if (skb) {
        if (skb) {

-               const struct netem_skb_cb *cb
-                       = (const struct netem_skb_cb *)skb->cb;
-               psched_time_t now;
+               const struct netem_skb_cb *cb = netem_skb_cb(skb);
+               psched_time_t now = psched_get_time();

 
                /* if more time remaining? */
 
                /* if more time remaining? */

-               PSCHED_GET_TIME(now);
-
-               if (PSCHED_TLESS(cb->time_to_send, now)) {
+               if (cb->time_to_send <= now) {
+                       skb = qdisc_dequeue_peeked(q->qdisc);
+                       if (unlikely(!skb))
+                               return NULL;
+
+#ifdef CONFIG_NET_CLS_ACT
+                       /*
+                        * If it's at ingress let's pretend the delay is
+                        * from the network (tstamp will be updated).
+                        */
+                       if (G_TC_FROM(skb->tc_verd) & AT_INGRESS)
+                               skb->tstamp.tv64 = 0;
+#endif

                        pr_debug("netem_dequeue: return skb=%p\n", skb);
                        sch->q.qlen--;
                        pr_debug("netem_dequeue: return skb=%p\n", skb);
                        sch->q.qlen--;

-                       sch->flags &= ~TCQ_F_THROTTLED;

                        return skb;
                        return skb;

-               } else {
-                       psched_tdiff_t delay = PSCHED_TDIFF(cb->time_to_send, now);
-
-                       if (q->qdisc->ops->requeue(skb, q->qdisc) != NET_XMIT_SUCCESS) {
-                               sch->qstats.drops++;
-
-                               /* After this qlen is confused */
-                               printk(KERN_ERR "netem: queue discpline %s could not requeue\n",
-                                      q->qdisc->ops->id);
-
-                               sch->q.qlen--;
-                       }
-
-                       mod_timer(&q->timer, jiffies + PSCHED_US2JIFFIE(delay));
-                       sch->flags |= TCQ_F_THROTTLED;

                }
                }

+
+               qdisc_watchdog_schedule(&q->watchdog, cb->time_to_send);

        }
 
        return NULL;
 }
 
        }
 
        return NULL;
 }
 

-static void netem_watchdog(unsigned long arg)
-{
-       struct Qdisc *sch = (struct Qdisc *)arg;
-
-       pr_debug("netem_watchdog qlen=%d\n", sch->q.qlen);
-       sch->flags &= ~TCQ_F_THROTTLED;
-       netif_schedule(sch->dev);
-}
-

 static void netem_reset(struct Qdisc *sch)
 {
        struct netem_sched_data *q = qdisc_priv(sch);
 
        qdisc_reset(q->qdisc);
        sch->q.qlen = 0;
 static void netem_reset(struct Qdisc *sch)
 {
        struct netem_sched_data *q = qdisc_priv(sch);
 
        qdisc_reset(q->qdisc);
        sch->q.qlen = 0;

-       sch->flags &= ~TCQ_F_THROTTLED;
-       del_timer_sync(&q->timer);
-}
-
-/* Pass size change message down to embedded FIFO */
-static int set_fifo_limit(struct Qdisc *q, int limit)
-{
-        struct rtattr *rta;
-       int ret = -ENOMEM;
-
-       /* Hack to avoid sending change message to non-FIFO */
-       if (strncmp(q->ops->id + 1, "fifo", 4) != 0)
-               return 0;
-
-       rta = kmalloc(RTA_LENGTH(sizeof(struct tc_fifo_qopt)), GFP_KERNEL);
-       if (rta) {
-               rta->rta_type = RTM_NEWQDISC;
-               rta->rta_len = RTA_LENGTH(sizeof(struct tc_fifo_qopt)); 
-               ((struct tc_fifo_qopt *)RTA_DATA(rta))->limit = limit;
-               
-               ret = q->ops->change(q, rta);
-               kfree(rta);
-       }
-       return ret;
+       qdisc_watchdog_cancel(&q->watchdog);

 }
 
 /*
  * Distribution data is a variable size payload containing
  * signed 16 bit values.
  */
 }
 
 /*
  * Distribution data is a variable size payload containing
  * signed 16 bit values.
  */

-static int get_dist_table(struct Qdisc *sch, const struct rtattr *attr)
+static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr)

 {
        struct netem_sched_data *q = qdisc_priv(sch);
 {
        struct netem_sched_data *q = qdisc_priv(sch);

-       unsigned long n = RTA_PAYLOAD(attr)/sizeof(__s16);
-       const __s16 *data = RTA_DATA(attr);
+       unsigned long n = nla_len(attr)/sizeof(__s16);
+       const __s16 *data = nla_data(attr);
+       spinlock_t *root_lock;

        struct disttable *d;
        int i;
 
        struct disttable *d;
        int i;
 


@@ -364,72 +331,86 @@ static int get_dist_table(struct Qdisc *sch, const struct rtattr *attr)
        d->size = n;
        for (i = 0; i < n; i++)
                d->table[i] = data[i];
        d->size = n;
        for (i = 0; i < n; i++)
                d->table[i] = data[i];

-       
-       spin_lock_bh(&sch->dev->queue_lock);
-       d = xchg(&q->delay_dist, d);
-       spin_unlock_bh(&sch->dev->queue_lock);

 
 

-       kfree(d);
+       root_lock = qdisc_root_sleeping_lock(sch);
+
+       spin_lock_bh(root_lock);
+       kfree(q->delay_dist);
+       q->delay_dist = d;
+       spin_unlock_bh(root_lock);

        return 0;
 }
 
        return 0;
 }
 

-static int get_correlation(struct Qdisc *sch, const struct rtattr *attr)
+static void get_correlation(struct Qdisc *sch, const struct nlattr *attr)

 {
        struct netem_sched_data *q = qdisc_priv(sch);
 {
        struct netem_sched_data *q = qdisc_priv(sch);

-       const struct tc_netem_corr *c = RTA_DATA(attr);
-
-       if (RTA_PAYLOAD(attr) != sizeof(*c))
-               return -EINVAL;
+       const struct tc_netem_corr *c = nla_data(attr);

 
        init_crandom(&q->delay_cor, c->delay_corr);
        init_crandom(&q->loss_cor, c->loss_corr);
        init_crandom(&q->dup_cor, c->dup_corr);
 
        init_crandom(&q->delay_cor, c->delay_corr);
        init_crandom(&q->loss_cor, c->loss_corr);
        init_crandom(&q->dup_cor, c->dup_corr);

-       return 0;

 }
 
 }
 

-static int get_reorder(struct Qdisc *sch, const struct rtattr *attr)
+static void get_reorder(struct Qdisc *sch, const struct nlattr *attr)

 {
        struct netem_sched_data *q = qdisc_priv(sch);
 {
        struct netem_sched_data *q = qdisc_priv(sch);

-       const struct tc_netem_reorder *r = RTA_DATA(attr);
-
-       if (RTA_PAYLOAD(attr) != sizeof(*r))
-               return -EINVAL;
+       const struct tc_netem_reorder *r = nla_data(attr);

 
        q->reorder = r->probability;
        init_crandom(&q->reorder_cor, r->correlation);
 
        q->reorder = r->probability;
        init_crandom(&q->reorder_cor, r->correlation);

-       return 0;

 }
 
 }
 

-static int get_corrupt(struct Qdisc *sch, const struct rtattr *attr)
+static void get_corrupt(struct Qdisc *sch, const struct nlattr *attr)

 {
        struct netem_sched_data *q = qdisc_priv(sch);
 {
        struct netem_sched_data *q = qdisc_priv(sch);

-       const struct tc_netem_corrupt *r = RTA_DATA(attr);
-
-       if (RTA_PAYLOAD(attr) != sizeof(*r))
-               return -EINVAL;
+       const struct tc_netem_corrupt *r = nla_data(attr);

 
        q->corrupt = r->probability;
        init_crandom(&q->corrupt_cor, r->correlation);
 
        q->corrupt = r->probability;
        init_crandom(&q->corrupt_cor, r->correlation);

+}
+
+static const struct nla_policy netem_policy[TCA_NETEM_MAX + 1] = {
+       [TCA_NETEM_CORR]        = { .len = sizeof(struct tc_netem_corr) },
+       [TCA_NETEM_REORDER]     = { .len = sizeof(struct tc_netem_reorder) },
+       [TCA_NETEM_CORRUPT]     = { .len = sizeof(struct tc_netem_corrupt) },
+};
+
+static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla,
+                     const struct nla_policy *policy, int len)
+{
+       int nested_len = nla_len(nla) - NLA_ALIGN(len);
+
+       if (nested_len < 0)
+               return -EINVAL;
+       if (nested_len >= nla_attr_size(0))
+               return nla_parse(tb, maxtype, nla_data(nla) + NLA_ALIGN(len),
+                                nested_len, policy);
+       memset(tb, 0, sizeof(struct nlattr *) * (maxtype + 1));

        return 0;
 }
 
 /* Parse netlink message to set options */
        return 0;
 }
 
 /* Parse netlink message to set options */

-static int netem_change(struct Qdisc *sch, struct rtattr *opt)
+static int netem_change(struct Qdisc *sch, struct nlattr *opt)

 {
        struct netem_sched_data *q = qdisc_priv(sch);
 {
        struct netem_sched_data *q = qdisc_priv(sch);

+       struct nlattr *tb[TCA_NETEM_MAX + 1];

        struct tc_netem_qopt *qopt;
        int ret;
        struct tc_netem_qopt *qopt;
        int ret;

-       
-       if (opt == NULL || RTA_PAYLOAD(opt) < sizeof(*qopt))
+
+       if (opt == NULL)

                return -EINVAL;
 
                return -EINVAL;
 

-       qopt = RTA_DATA(opt);
-       ret = set_fifo_limit(q->qdisc, qopt->limit);
+       qopt = nla_data(opt);
+       ret = parse_attr(tb, TCA_NETEM_MAX, opt, netem_policy, sizeof(*qopt));
+       if (ret < 0)
+               return ret;
+
+       ret = fifo_set_limit(q->qdisc, qopt->limit);

        if (ret) {
                pr_debug("netem: can't set fifo limit\n");
                return ret;
        }
        if (ret) {
                pr_debug("netem: can't set fifo limit\n");
                return ret;
        }

-       
+

        q->latency = qopt->latency;
        q->jitter = qopt->jitter;
        q->limit = qopt->limit;
        q->latency = qopt->latency;
        q->jitter = qopt->jitter;
        q->limit = qopt->limit;


@@ -438,45 +419,26 @@ static int netem_change(struct Qdisc *sch, struct rtattr *opt)
        q->loss = qopt->loss;
        q->duplicate = qopt->duplicate;
 
        q->loss = qopt->loss;
        q->duplicate = qopt->duplicate;
 

-       /* for compatiablity with earlier versions.
-        * if gap is set, need to assume 100% probablity
+       /* for compatibility with earlier versions.
+        * if gap is set, need to assume 100% probability

         */
         */

-       q->reorder = ~0;
-
-       /* Handle nested options after initial queue options.
-        * Should have put all options in nested format but too late now.
-        */ 
-       if (RTA_PAYLOAD(opt) > sizeof(*qopt)) {
-               struct rtattr *tb[TCA_NETEM_MAX];
-               if (rtattr_parse(tb, TCA_NETEM_MAX, 
-                                RTA_DATA(opt) + sizeof(*qopt),
-                                RTA_PAYLOAD(opt) - sizeof(*qopt)))
-                       return -EINVAL;
+       if (q->gap)
+               q->reorder = ~0;

 
 

-               if (tb[TCA_NETEM_CORR-1]) {
-                       ret = get_correlation(sch, tb[TCA_NETEM_CORR-1]);
-                       if (ret)
-                               return ret;
-               }
+       if (tb[TCA_NETEM_CORR])
+               get_correlation(sch, tb[TCA_NETEM_CORR]);

 
 

-               if (tb[TCA_NETEM_DELAY_DIST-1]) {
-                       ret = get_dist_table(sch, tb[TCA_NETEM_DELAY_DIST-1]);
-                       if (ret)
-                               return ret;
-               }
+       if (tb[TCA_NETEM_DELAY_DIST]) {
+               ret = get_dist_table(sch, tb[TCA_NETEM_DELAY_DIST]);
+               if (ret)
+                       return ret;
+       }

 
 

-               if (tb[TCA_NETEM_REORDER-1]) {
-                       ret = get_reorder(sch, tb[TCA_NETEM_REORDER-1]);
-                       if (ret)
-                               return ret;
-               }
+       if (tb[TCA_NETEM_REORDER])
+               get_reorder(sch, tb[TCA_NETEM_REORDER]);

 
 

-               if (tb[TCA_NETEM_CORRUPT-1]) {
-                       ret = get_corrupt(sch, tb[TCA_NETEM_CORRUPT-1]);
-                       if (ret)
-                               return ret;
-               }
-       }
+       if (tb[TCA_NETEM_CORRUPT])
+               get_corrupt(sch, tb[TCA_NETEM_CORRUPT]);

 
        return 0;
 }
 
        return 0;
 }


@@ -487,50 +449,56 @@ static int netem_change(struct Qdisc *sch, struct rtattr *opt)
  */
 struct fifo_sched_data {
        u32 limit;
  */
 struct fifo_sched_data {
        u32 limit;

+       psched_time_t oldest;

 };
 
 static int tfifo_enqueue(struct sk_buff *nskb, struct Qdisc *sch)
 {
        struct fifo_sched_data *q = qdisc_priv(sch);
        struct sk_buff_head *list = &sch->q;
 };
 
 static int tfifo_enqueue(struct sk_buff *nskb, struct Qdisc *sch)
 {
        struct fifo_sched_data *q = qdisc_priv(sch);
        struct sk_buff_head *list = &sch->q;

-       const struct netem_skb_cb *ncb
-               = (const struct netem_skb_cb *)nskb->cb;
+       psched_time_t tnext = netem_skb_cb(nskb)->time_to_send;

        struct sk_buff *skb;
 
        if (likely(skb_queue_len(list) < q->limit)) {
        struct sk_buff *skb;
 
        if (likely(skb_queue_len(list) < q->limit)) {

+               /* Optimize for add at tail */
+               if (likely(skb_queue_empty(list) || tnext >= q->oldest)) {
+                       q->oldest = tnext;
+                       return qdisc_enqueue_tail(nskb, sch);
+               }
+

                skb_queue_reverse_walk(list, skb) {
                skb_queue_reverse_walk(list, skb) {

-                       const struct netem_skb_cb *cb
-                               = (const struct netem_skb_cb *)skb->cb;
+                       const struct netem_skb_cb *cb = netem_skb_cb(skb);

 
 

-                       if (!PSCHED_TLESS(ncb->time_to_send, cb->time_to_send))
+                       if (tnext >= cb->time_to_send)

                                break;
                }
 
                __skb_queue_after(list, skb, nskb);
 
                                break;
                }
 
                __skb_queue_after(list, skb, nskb);
 

-               sch->qstats.backlog += nskb->len;
-               sch->bstats.bytes += nskb->len;
+               sch->qstats.backlog += qdisc_pkt_len(nskb);
+               sch->bstats.bytes += qdisc_pkt_len(nskb);

                sch->bstats.packets++;
 
                return NET_XMIT_SUCCESS;
        }
 
                sch->bstats.packets++;
 
                return NET_XMIT_SUCCESS;
        }
 

-       return qdisc_drop(nskb, sch);
+       return qdisc_reshape_fail(nskb, sch);

 }
 
 }
 

-static int tfifo_init(struct Qdisc *sch, struct rtattr *opt)
+static int tfifo_init(struct Qdisc *sch, struct nlattr *opt)

 {
        struct fifo_sched_data *q = qdisc_priv(sch);
 
        if (opt) {
 {
        struct fifo_sched_data *q = qdisc_priv(sch);
 
        if (opt) {

-               struct tc_fifo_qopt *ctl = RTA_DATA(opt);
-               if (RTA_PAYLOAD(opt) < sizeof(*ctl))
+               struct tc_fifo_qopt *ctl = nla_data(opt);
+               if (nla_len(opt) < sizeof(*ctl))

                        return -EINVAL;
 
                q->limit = ctl->limit;
        } else
                        return -EINVAL;
 
                q->limit = ctl->limit;
        } else

-               q->limit = max_t(u32, sch->dev->tx_queue_len, 1);
+               q->limit = max_t(u32, qdisc_dev(sch)->tx_queue_len, 1);

 
 

+       q->oldest = PSCHED_PASTPERFECT;

        return 0;
 }
 
        return 0;
 }
 


@@ -539,19 +507,19 @@ static int tfifo_dump(struct Qdisc *sch, struct sk_buff *skb)
        struct fifo_sched_data *q = qdisc_priv(sch);
        struct tc_fifo_qopt opt = { .limit = q->limit };
 
        struct fifo_sched_data *q = qdisc_priv(sch);
        struct tc_fifo_qopt opt = { .limit = q->limit };
 

-       RTA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
+       NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);

        return skb->len;
 
        return skb->len;
 

-rtattr_failure:
+nla_put_failure:

        return -1;
 }
 
        return -1;
 }
 

-static struct Qdisc_ops tfifo_qdisc_ops = {
+static struct Qdisc_ops tfifo_qdisc_ops __read_mostly = {

        .id             =       "tfifo",
        .priv_size      =       sizeof(struct fifo_sched_data),
        .enqueue        =       tfifo_enqueue,
        .dequeue        =       qdisc_dequeue_head,
        .id             =       "tfifo",
        .priv_size      =       sizeof(struct fifo_sched_data),
        .enqueue        =       tfifo_enqueue,
        .dequeue        =       qdisc_dequeue_head,

-       .requeue        =       qdisc_requeue,
+       .peek           =       qdisc_peek_head,

        .drop           =       qdisc_queue_drop,
        .init           =       tfifo_init,
        .reset          =       qdisc_reset_queue,
        .drop           =       qdisc_queue_drop,
        .init           =       tfifo_init,
        .reset          =       qdisc_reset_queue,


@@ -559,7 +527,7 @@ static struct Qdisc_ops tfifo_qdisc_ops = {
        .dump           =       tfifo_dump,
 };
 
        .dump           =       tfifo_dump,
 };
 

-static int netem_init(struct Qdisc *sch, struct rtattr *opt)
+static int netem_init(struct Qdisc *sch, struct nlattr *opt)

 {
        struct netem_sched_data *q = qdisc_priv(sch);
        int ret;
 {
        struct netem_sched_data *q = qdisc_priv(sch);
        int ret;


@@ -567,11 +535,11 @@ static int netem_init(struct Qdisc *sch, struct rtattr *opt)
        if (!opt)
                return -EINVAL;
 
        if (!opt)
                return -EINVAL;
 

-       init_timer(&q->timer);
-       q->timer.function = netem_watchdog;
-       q->timer.data = (unsigned long) sch;
+       qdisc_watchdog_init(&q->watchdog, sch);

 
 

-       q->qdisc = qdisc_create_dflt(sch->dev, &tfifo_qdisc_ops);
+       q->qdisc = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
+                                    &tfifo_qdisc_ops,
+                                    TC_H_MAKE(sch->handle, 1));

        if (!q->qdisc) {
                pr_debug("netem: qdisc create failed\n");
                return -ENOMEM;
        if (!q->qdisc) {
                pr_debug("netem: qdisc create failed\n");
                return -ENOMEM;


@@ -589,7 +557,7 @@ static void netem_destroy(struct Qdisc *sch)
 {
        struct netem_sched_data *q = qdisc_priv(sch);
 
 {
        struct netem_sched_data *q = qdisc_priv(sch);
 

-       del_timer_sync(&q->timer);
+       qdisc_watchdog_cancel(&q->watchdog);

        qdisc_destroy(q->qdisc);
        kfree(q->delay_dist);
 }
        qdisc_destroy(q->qdisc);
        kfree(q->delay_dist);
 }


@@ -597,8 +565,8 @@ static void netem_destroy(struct Qdisc *sch)
 static int netem_dump(struct Qdisc *sch, struct sk_buff *skb)
 {
        const struct netem_sched_data *q = qdisc_priv(sch);
 static int netem_dump(struct Qdisc *sch, struct sk_buff *skb)
 {
        const struct netem_sched_data *q = qdisc_priv(sch);

-       unsigned char    *b = skb->tail;
-       struct rtattr *rta = (struct rtattr *) b;
+       unsigned char *b = skb_tail_pointer(skb);
+       struct nlattr *nla = (struct nlattr *) b;

        struct tc_netem_qopt qopt;
        struct tc_netem_corr cor;
        struct tc_netem_reorder reorder;
        struct tc_netem_qopt qopt;
        struct tc_netem_corr cor;
        struct tc_netem_reorder reorder;


@@ -610,123 +578,36 @@ static int netem_dump(struct Qdisc *sch, struct sk_buff *skb)
        qopt.loss = q->loss;
        qopt.gap = q->gap;
        qopt.duplicate = q->duplicate;
        qopt.loss = q->loss;
        qopt.gap = q->gap;
        qopt.duplicate = q->duplicate;

-       RTA_PUT(skb, TCA_OPTIONS, sizeof(qopt), &qopt);
+       NLA_PUT(skb, TCA_OPTIONS, sizeof(qopt), &qopt);

 
        cor.delay_corr = q->delay_cor.rho;
        cor.loss_corr = q->loss_cor.rho;
        cor.dup_corr = q->dup_cor.rho;
 
        cor.delay_corr = q->delay_cor.rho;
        cor.loss_corr = q->loss_cor.rho;
        cor.dup_corr = q->dup_cor.rho;

-       RTA_PUT(skb, TCA_NETEM_CORR, sizeof(cor), &cor);
+       NLA_PUT(skb, TCA_NETEM_CORR, sizeof(cor), &cor);

 
        reorder.probability = q->reorder;
        reorder.correlation = q->reorder_cor.rho;
 
        reorder.probability = q->reorder;
        reorder.correlation = q->reorder_cor.rho;

-       RTA_PUT(skb, TCA_NETEM_REORDER, sizeof(reorder), &reorder);
+       NLA_PUT(skb, TCA_NETEM_REORDER, sizeof(reorder), &reorder);

 
        corrupt.probability = q->corrupt;
        corrupt.correlation = q->corrupt_cor.rho;
 
        corrupt.probability = q->corrupt;
        corrupt.correlation = q->corrupt_cor.rho;

-       RTA_PUT(skb, TCA_NETEM_CORRUPT, sizeof(corrupt), &corrupt);
+       NLA_PUT(skb, TCA_NETEM_CORRUPT, sizeof(corrupt), &corrupt);

 
 

-       rta->rta_len = skb->tail - b;
+       nla->nla_len = skb_tail_pointer(skb) - b;

 
        return skb->len;
 
 
        return skb->len;
 

-rtattr_failure:
-       skb_trim(skb, b - skb->data);
+nla_put_failure:
+       nlmsg_trim(skb, b);

        return -1;
 }
 
        return -1;
 }
 

-static int netem_dump_class(struct Qdisc *sch, unsigned long cl,
-                         struct sk_buff *skb, struct tcmsg *tcm)
-{
-       struct netem_sched_data *q = qdisc_priv(sch);
-
-       if (cl != 1)    /* only one class */
-               return -ENOENT;
-
-       tcm->tcm_handle |= TC_H_MIN(1);
-       tcm->tcm_info = q->qdisc->handle;
-
-       return 0;
-}
-
-static int netem_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
-                    struct Qdisc **old)
-{
-       struct netem_sched_data *q = qdisc_priv(sch);
-
-       if (new == NULL)
-               new = &noop_qdisc;
-
-       sch_tree_lock(sch);
-       *old = xchg(&q->qdisc, new);
-       qdisc_reset(*old);
-       sch->q.qlen = 0;
-       sch_tree_unlock(sch);
-
-       return 0;
-}
-
-static struct Qdisc *netem_leaf(struct Qdisc *sch, unsigned long arg)
-{
-       struct netem_sched_data *q = qdisc_priv(sch);
-       return q->qdisc;
-}
-
-static unsigned long netem_get(struct Qdisc *sch, u32 classid)
-{
-       return 1;
-}
-
-static void netem_put(struct Qdisc *sch, unsigned long arg)
-{
-}
-
-static int netem_change_class(struct Qdisc *sch, u32 classid, u32 parentid, 
-                           struct rtattr **tca, unsigned long *arg)
-{
-       return -ENOSYS;
-}
-
-static int netem_delete(struct Qdisc *sch, unsigned long arg)
-{
-       return -ENOSYS;
-}
-
-static void netem_walk(struct Qdisc *sch, struct qdisc_walker *walker)
-{
-       if (!walker->stop) {
-               if (walker->count >= walker->skip)
-                       if (walker->fn(sch, 1, walker) < 0) {
-                               walker->stop = 1;
-                               return;
-                       }
-               walker->count++;
-       }
-}
-
-static struct tcf_proto **netem_find_tcf(struct Qdisc *sch, unsigned long cl)
-{
-       return NULL;
-}
-
-static struct Qdisc_class_ops netem_class_ops = {
-       .graft          =       netem_graft,
-       .leaf           =       netem_leaf,
-       .get            =       netem_get,
-       .put            =       netem_put,
-       .change         =       netem_change_class,
-       .delete         =       netem_delete,
-       .walk           =       netem_walk,
-       .tcf_chain      =       netem_find_tcf,
-       .dump           =       netem_dump_class,
-};
-
-static struct Qdisc_ops netem_qdisc_ops = {
+static struct Qdisc_ops netem_qdisc_ops __read_mostly = {

        .id             =       "netem",
        .id             =       "netem",

-       .cl_ops         =       &netem_class_ops,

        .priv_size      =       sizeof(struct netem_sched_data),
        .enqueue        =       netem_enqueue,
        .dequeue        =       netem_dequeue,
        .priv_size      =       sizeof(struct netem_sched_data),
        .enqueue        =       netem_enqueue,
        .dequeue        =       netem_dequeue,

-       .requeue        =       netem_requeue,
+       .peek           =       qdisc_peek_dequeued,

        .drop           =       netem_drop,
        .init           =       netem_init,
        .reset          =       netem_reset,
        .drop           =       netem_drop,
        .init           =       netem_init,
        .reset          =       netem_reset,