net_sched: move tc_action into tcf_common

[cascardo/linux.git] / net / sched / act_skbedit.c

diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index 69da5a8..a133dcb 100644 (file)
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -30,14 +30,15 @@
 #define SKBEDIT_TAB_MASK     15
 
 static int skbedit_net_id;
+static struct tc_action_ops act_skbedit_ops;
 
 static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a,
                       struct tcf_result *res)
 {
-       struct tcf_skbedit *d = a->priv;
+       struct tcf_skbedit *d = to_skbedit(a);
 
        spin_lock(&d->tcf_lock);
-       d->tcf_tm.lastuse = jiffies;
+       tcf_lastuse_update(&d->tcf_tm);
        bstats_update(&d->tcf_bstats, skb);
 
        if (d->flags & SKBEDIT_F_PRIORITY)
@@ -47,6 +48,8 @@ static int tcf_skbedit(struct sk_buff *skb, const struct tc_action *a,
                skb_set_queue_mapping(skb, d->queue_mapping);
        if (d->flags & SKBEDIT_F_MARK)
                skb->mark = d->mark;
+       if (d->flags & SKBEDIT_F_PTYPE)
+               skb->pkt_type = d->ptype;
 
        spin_unlock(&d->tcf_lock);
        return d->tcf_action;
@@ -57,10 +60,11 @@ static const struct nla_policy skbedit_policy[TCA_SKBEDIT_MAX + 1] = {
        [TCA_SKBEDIT_PRIORITY]          = { .len = sizeof(u32) },
        [TCA_SKBEDIT_QUEUE_MAPPING]     = { .len = sizeof(u16) },
        [TCA_SKBEDIT_MARK]              = { .len = sizeof(u32) },
+       [TCA_SKBEDIT_PTYPE]             = { .len = sizeof(u16) },
 };
 
 static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
-                           struct nlattr *est, struct tc_action *a,
+                           struct nlattr *est, struct tc_action **a,
                            int ovr, int bind)
 {
        struct tc_action_net *tn = net_generic(net, skbedit_net_id);
@@ -68,8 +72,9 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
        struct tc_skbedit *parm;
        struct tcf_skbedit *d;
        u32 flags = 0, *priority = NULL, *mark = NULL;
-       u16 *queue_mapping = NULL;
-       int ret = 0, err, exists = 0;
+       u16 *queue_mapping = NULL, *ptype = NULL;
+       bool exists = false;
+       int ret = 0, err;
 
        if (nla == NULL)
                return -EINVAL;
@@ -91,6 +96,13 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
                queue_mapping = nla_data(tb[TCA_SKBEDIT_QUEUE_MAPPING]);
        }
 
+       if (tb[TCA_SKBEDIT_PTYPE] != NULL) {
+               ptype = nla_data(tb[TCA_SKBEDIT_PTYPE]);
+               if (!skb_pkt_type_ok(*ptype))
+                       return -EINVAL;
+               flags |= SKBEDIT_F_PTYPE;
+       }
+
        if (tb[TCA_SKBEDIT_MARK] != NULL) {
                flags |= SKBEDIT_F_MARK;
                mark = nla_data(tb[TCA_SKBEDIT_MARK]);
@@ -103,21 +115,21 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
                return 0;
 
        if (!flags) {
-               tcf_hash_release(a, bind);
+               tcf_hash_release(*a, bind);
                return -EINVAL;
        }
 
        if (!exists) {
                ret = tcf_hash_create(tn, parm->index, est, a,
-                                     sizeof(*d), bind, false);
+                                     &act_skbedit_ops, bind, false);
                if (ret)
                        return ret;
 
-               d = to_skbedit(a);
+               d = to_skbedit(*a);
                ret = ACT_P_CREATED;
        } else {
-               d = to_skbedit(a);
-               tcf_hash_release(a, bind);
+               d = to_skbedit(*a);
+               tcf_hash_release(*a, bind);
                if (!ovr)
                        return -EEXIST;
        }
@@ -131,13 +143,15 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
                d->queue_mapping = *queue_mapping;
        if (flags & SKBEDIT_F_MARK)
                d->mark = *mark;
+       if (flags & SKBEDIT_F_PTYPE)
+               d->ptype = *ptype;
 
        d->tcf_action = parm->action;
 
        spin_unlock_bh(&d->tcf_lock);
 
        if (ret == ACT_P_CREATED)
-               tcf_hash_insert(tn, a);
+               tcf_hash_insert(tn, *a);
        return ret;
 }
 
@@ -145,7 +159,7 @@ static int tcf_skbedit_dump(struct sk_buff *skb, struct tc_action *a,
                            int bind, int ref)
 {
        unsigned char *b = skb_tail_pointer(skb);
-       struct tcf_skbedit *d = a->priv;
+       struct tcf_skbedit *d = to_skbedit(a);
        struct tc_skbedit opt = {
                .index   = d->tcf_index,
                .refcnt  = d->tcf_refcnt - ref,
@@ -157,21 +171,20 @@ static int tcf_skbedit_dump(struct sk_buff *skb, struct tc_action *a,
        if (nla_put(skb, TCA_SKBEDIT_PARMS, sizeof(opt), &opt))
                goto nla_put_failure;
        if ((d->flags & SKBEDIT_F_PRIORITY) &&
-           nla_put(skb, TCA_SKBEDIT_PRIORITY, sizeof(d->priority),
-                   &d->priority))
+           nla_put_u32(skb, TCA_SKBEDIT_PRIORITY, d->priority))
                goto nla_put_failure;
        if ((d->flags & SKBEDIT_F_QUEUE_MAPPING) &&
-           nla_put(skb, TCA_SKBEDIT_QUEUE_MAPPING,
-                   sizeof(d->queue_mapping), &d->queue_mapping))
+           nla_put_u16(skb, TCA_SKBEDIT_QUEUE_MAPPING, d->queue_mapping))
                goto nla_put_failure;
        if ((d->flags & SKBEDIT_F_MARK) &&
-           nla_put(skb, TCA_SKBEDIT_MARK, sizeof(d->mark),
-                   &d->mark))
+           nla_put_u32(skb, TCA_SKBEDIT_MARK, d->mark))
                goto nla_put_failure;
-       t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install);
-       t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);
-       t.expires = jiffies_to_clock_t(d->tcf_tm.expires);
-       if (nla_put(skb, TCA_SKBEDIT_TM, sizeof(t), &t))
+       if ((d->flags & SKBEDIT_F_PTYPE) &&
+           nla_put_u16(skb, TCA_SKBEDIT_PTYPE, d->ptype))
+               goto nla_put_failure;
+
+       tcf_tm_dump(&t, &d->tcf_tm);
+       if (nla_put_64bit(skb, TCA_SKBEDIT_TM, sizeof(t), &t, TCA_SKBEDIT_PAD))
                goto nla_put_failure;
        return skb->len;
 
@@ -182,14 +195,14 @@ nla_put_failure:
 
 static int tcf_skbedit_walker(struct net *net, struct sk_buff *skb,
                              struct netlink_callback *cb, int type,
-                             struct tc_action *a)
+                             const struct tc_action_ops *ops)
 {
        struct tc_action_net *tn = net_generic(net, skbedit_net_id);
 
-       return tcf_generic_walker(tn, skb, cb, type, a);
+       return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_skbedit_search(struct net *net, struct tc_action *a, u32 index)
+static int tcf_skbedit_search(struct net *net, struct tc_action **a, u32 index)
 {
        struct tc_action_net *tn = net_generic(net, skbedit_net_id);
 
@@ -205,6 +218,7 @@ static struct tc_action_ops act_skbedit_ops = {
        .init           =       tcf_skbedit_init,
        .walk           =       tcf_skbedit_walker,
        .lookup         =       tcf_skbedit_search,
+       .size           =       sizeof(struct tcf_skbedit),
 };
 
 static __net_init int skbedit_init_net(struct net *net)