[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API

[mirror_ubuntu-bionic-kernel.git] / net / sched / sch_api.c

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index dc89a9343f30c100c82f773bead6148549c86a74..7abb028dd96b5af3fac5f130837b61451c2cbe4a 100644 (file)
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -213,14 +213,14 @@ static struct Qdisc *qdisc_leaf(struct Qdisc *p, u32 classid)
 
 /* Find queueing discipline by name */
 
-static struct Qdisc_ops *qdisc_lookup_ops(struct rtattr *kind)
+static struct Qdisc_ops *qdisc_lookup_ops(struct nlattr *kind)
 {
        struct Qdisc_ops *q = NULL;
 
        if (kind) {
                read_lock(&qdisc_mod_lock);
                for (q = qdisc_base; q; q = q->next) {
-                       if (rtattr_strcmp(kind, q->id) == 0) {
+                       if (nla_strcmp(kind, q->id) == 0) {
                                if (!try_module_get(q->owner))
                                        q = NULL;
                                break;
@@ -233,7 +233,7 @@ static struct Qdisc_ops *qdisc_lookup_ops(struct rtattr *kind)
 
 static struct qdisc_rate_table *qdisc_rtab_list;
 
-struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, struct rtattr *tab)
+struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, struct nlattr *tab)
 {
        struct qdisc_rate_table *rtab;
 
@@ -244,14 +244,14 @@ struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, struct rtattr *ta
                }
        }
 
-       if (tab == NULL || r->rate == 0 || r->cell_log == 0 || RTA_PAYLOAD(tab) != 1024)
+       if (tab == NULL || r->rate == 0 || r->cell_log == 0 || nla_len(tab) != 1024)
                return NULL;
 
        rtab = kmalloc(sizeof(*rtab), GFP_KERNEL);
        if (rtab) {
                rtab->rate = *r;
                rtab->refcnt = 1;
-               memcpy(rtab->data, RTA_DATA(tab), 1024);
+               memcpy(rtab->data, nla_data(tab), 1024);
                rtab->next = qdisc_rtab_list;
                qdisc_rtab_list = rtab;
        }
@@ -445,10 +445,10 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
 
 static struct Qdisc *
 qdisc_create(struct net_device *dev, u32 parent, u32 handle,
-          struct rtattr **tca, int *errp)
+          struct nlattr **tca, int *errp)
 {
        int err;
-       struct rtattr *kind = tca[TCA_KIND-1];
+       struct nlattr *kind = tca[TCA_KIND];
        struct Qdisc *sch;
        struct Qdisc_ops *ops;
 
@@ -456,7 +456,7 @@ qdisc_create(struct net_device *dev, u32 parent, u32 handle,
 #ifdef CONFIG_KMOD
        if (ops == NULL && kind != NULL) {
                char name[IFNAMSIZ];
-               if (rtattr_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) {
+               if (nla_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) {
                        /* We dropped the RTNL semaphore in order to
                         * perform the module load.  So, even if we
                         * succeeded in loading the module we have to
@@ -509,11 +509,11 @@ qdisc_create(struct net_device *dev, u32 parent, u32 handle,
 
        sch->handle = handle;
 
-       if (!ops->init || (err = ops->init(sch, tca[TCA_OPTIONS-1])) == 0) {
-               if (tca[TCA_RATE-1]) {
+       if (!ops->init || (err = ops->init(sch, tca[TCA_OPTIONS])) == 0) {
+               if (tca[TCA_RATE]) {
                        err = gen_new_estimator(&sch->bstats, &sch->rate_est,
                                                sch->stats_lock,
-                                               tca[TCA_RATE-1]);
+                                               tca[TCA_RATE]);
                        if (err) {
                                /*
                                 * Any broken qdiscs that would require
@@ -541,20 +541,20 @@ err_out:
        return NULL;
 }
 
-static int qdisc_change(struct Qdisc *sch, struct rtattr **tca)
+static int qdisc_change(struct Qdisc *sch, struct nlattr **tca)
 {
-       if (tca[TCA_OPTIONS-1]) {
+       if (tca[TCA_OPTIONS]) {
                int err;
 
                if (sch->ops->change == NULL)
                        return -EINVAL;
-               err = sch->ops->change(sch, tca[TCA_OPTIONS-1]);
+               err = sch->ops->change(sch, tca[TCA_OPTIONS]);
                if (err)
                        return err;
        }
-       if (tca[TCA_RATE-1])
+       if (tca[TCA_RATE])
                gen_replace_estimator(&sch->bstats, &sch->rate_est,
-                       sch->stats_lock, tca[TCA_RATE-1]);
+                       sch->stats_lock, tca[TCA_RATE]);
        return 0;
 }
 
@@ -606,7 +606,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 {
        struct net *net = skb->sk->sk_net;
        struct tcmsg *tcm = NLMSG_DATA(n);
-       struct rtattr **tca = arg;
+       struct nlattr *tca[TCA_MAX + 1];
        struct net_device *dev;
        u32 clid = tcm->tcm_parent;
        struct Qdisc *q = NULL;
@@ -619,6 +619,10 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
        if ((dev = __dev_get_by_index(&init_net, tcm->tcm_ifindex)) == NULL)
                return -ENODEV;
 
+       err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);
+       if (err < 0)
+               return err;
+
        if (clid) {
                if (clid != TC_H_ROOT) {
                        if (TC_H_MAJ(clid) != TC_H_MAJ(TC_H_INGRESS)) {
@@ -641,7 +645,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
                        return -ENOENT;
        }
 
-       if (tca[TCA_KIND-1] && rtattr_strcmp(tca[TCA_KIND-1], q->ops->id))
+       if (tca[TCA_KIND] && nla_strcmp(tca[TCA_KIND], q->ops->id))
                return -EINVAL;
 
        if (n->nlmsg_type == RTM_DELQDISC) {
@@ -671,7 +675,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 {
        struct net *net = skb->sk->sk_net;
        struct tcmsg *tcm;
-       struct rtattr **tca;
+       struct nlattr *tca[TCA_MAX + 1];
        struct net_device *dev;
        u32 clid;
        struct Qdisc *q, *p;
@@ -683,13 +687,16 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 replay:
        /* Reinit, just in case something touches this. */
        tcm = NLMSG_DATA(n);
-       tca = arg;
        clid = tcm->tcm_parent;
        q = p = NULL;
 
        if ((dev = __dev_get_by_index(&init_net, tcm->tcm_ifindex)) == NULL)
                return -ENODEV;
 
+       err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);
+       if (err < 0)
+               return err;
+
        if (clid) {
                if (clid != TC_H_ROOT) {
                        if (clid != TC_H_INGRESS) {
@@ -717,7 +724,7 @@ replay:
                                        goto create_n_graft;
                                if (n->nlmsg_flags&NLM_F_EXCL)
                                        return -EEXIST;
-                               if (tca[TCA_KIND-1] && rtattr_strcmp(tca[TCA_KIND-1], q->ops->id))
+                               if (tca[TCA_KIND] && nla_strcmp(tca[TCA_KIND], q->ops->id))
                                        return -EINVAL;
                                if (q == p ||
                                    (p && check_loop(q, p, 0)))
@@ -750,8 +757,8 @@ replay:
                                if ((n->nlmsg_flags&NLM_F_CREATE) &&
                                    (n->nlmsg_flags&NLM_F_REPLACE) &&
                                    ((n->nlmsg_flags&NLM_F_EXCL) ||
-                                    (tca[TCA_KIND-1] &&
-                                     rtattr_strcmp(tca[TCA_KIND-1], q->ops->id))))
+                                    (tca[TCA_KIND] &&
+                                     nla_strcmp(tca[TCA_KIND], q->ops->id))))
                                        goto create_n_graft;
                        }
                }
@@ -766,7 +773,7 @@ replay:
                return -ENOENT;
        if (n->nlmsg_flags&NLM_F_EXCL)
                return -EEXIST;
-       if (tca[TCA_KIND-1] && rtattr_strcmp(tca[TCA_KIND-1], q->ops->id))
+       if (tca[TCA_KIND] && nla_strcmp(tca[TCA_KIND], q->ops->id))
                return -EINVAL;
        err = qdisc_change(q, tca);
        if (err == 0)
@@ -827,31 +834,31 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid,
        tcm->tcm_parent = clid;
        tcm->tcm_handle = q->handle;
        tcm->tcm_info = atomic_read(&q->refcnt);
-       RTA_PUT(skb, TCA_KIND, IFNAMSIZ, q->ops->id);
+       NLA_PUT(skb, TCA_KIND, IFNAMSIZ, q->ops->id);
        if (q->ops->dump && q->ops->dump(q, skb) < 0)
-               goto rtattr_failure;
+               goto nla_put_failure;
        q->qstats.qlen = q->q.qlen;
 
        if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,
                        TCA_XSTATS, q->stats_lock, &d) < 0)
-               goto rtattr_failure;
+               goto nla_put_failure;
 
        if (q->ops->dump_stats && q->ops->dump_stats(q, &d) < 0)
-               goto rtattr_failure;
+               goto nla_put_failure;
 
        if (gnet_stats_copy_basic(&d, &q->bstats) < 0 ||
            gnet_stats_copy_rate_est(&d, &q->rate_est) < 0 ||
            gnet_stats_copy_queue(&d, &q->qstats) < 0)
-               goto rtattr_failure;
+               goto nla_put_failure;
 
        if (gnet_stats_finish_copy(&d) < 0)
-               goto rtattr_failure;
+               goto nla_put_failure;
 
        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
        return skb->len;
 
 nlmsg_failure:
-rtattr_failure:
+nla_put_failure:
        nlmsg_trim(skb, b);
        return -1;
 }
@@ -939,7 +946,7 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 {
        struct net *net = skb->sk->sk_net;
        struct tcmsg *tcm = NLMSG_DATA(n);
-       struct rtattr **tca = arg;
+       struct nlattr *tca[TCA_MAX + 1];
        struct net_device *dev;
        struct Qdisc *q = NULL;
        const struct Qdisc_class_ops *cops;
@@ -956,6 +963,10 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
        if ((dev = __dev_get_by_index(&init_net, tcm->tcm_ifindex)) == NULL)
                return -ENODEV;
 
+       err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);
+       if (err < 0)
+               return err;
+
        /*
           parent == TC_H_UNSPEC - unspecified parent.
           parent == TC_H_ROOT   - class is root, which has no parent.
@@ -1069,25 +1080,25 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q,
        tcm->tcm_parent = q->handle;
        tcm->tcm_handle = q->handle;
        tcm->tcm_info = 0;
-       RTA_PUT(skb, TCA_KIND, IFNAMSIZ, q->ops->id);
+       NLA_PUT(skb, TCA_KIND, IFNAMSIZ, q->ops->id);
        if (cl_ops->dump && cl_ops->dump(q, cl, skb, tcm) < 0)
-               goto rtattr_failure;
+               goto nla_put_failure;
 
        if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,
                        TCA_XSTATS, q->stats_lock, &d) < 0)
-               goto rtattr_failure;
+               goto nla_put_failure;
 
        if (cl_ops->dump_stats && cl_ops->dump_stats(q, cl, &d) < 0)
-               goto rtattr_failure;
+               goto nla_put_failure;
 
        if (gnet_stats_finish_copy(&d) < 0)
-               goto rtattr_failure;
+               goto nla_put_failure;
 
        nlh->nlmsg_len = skb_tail_pointer(skb) - b;
        return skb->len;
 
 nlmsg_failure:
-rtattr_failure:
+nla_put_failure:
        nlmsg_trim(skb, b);
        return -1;
 }