Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
[sfrench/cifs-2.6.git] / net / sched / act_simple.c
index e5f2e1f431e2a36d92ed5c8c4263b8fcefbd44fd..901571a677072c8480b270df13f7d01c173a070c 100644 (file)
@@ -10,7 +10,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 
 #define TCA_ACT_SIMP 22
 
-/* XXX: Hide all these common elements under some macro 
- * probably
-*/
 #include <linux/tc_act/tc_defact.h>
 #include <net/tc_act/tc_defact.h>
 
-/* use generic hash table with 8 buckets */
-#define MY_TAB_SIZE     8
-#define MY_TAB_MASK     (MY_TAB_SIZE - 1)
-static u32 idx_gen;
-static struct tcf_defact *tcf_simp_ht[MY_TAB_SIZE];
+#define SIMP_TAB_MASK     7
+static struct tcf_common *tcf_simp_ht[SIMP_TAB_MASK + 1];
+static u32 simp_idx_gen;
 static DEFINE_RWLOCK(simp_lock);
 
-/* override the defaults */
-#define tcf_st         tcf_defact
-#define tc_st          tc_defact
-#define tcf_t_lock     simp_lock
-#define tcf_ht         tcf_simp_ht
-
-#define CONFIG_NET_ACT_INIT 1
-#include <net/pkt_act.h>
-#include <net/act_generic.h>
+static struct tcf_hashinfo simp_hash_info = {
+       .htab   =       tcf_simp_ht,
+       .hmask  =       SIMP_TAB_MASK,
+       .lock   =       &simp_lock,
+};
 
 static int tcf_simp(struct sk_buff *skb, struct tc_action *a, struct tcf_result *res)
 {
-       struct tcf_defact *p = PRIV(a, defact);
+       struct tcf_defact *d = a->priv;
 
-       spin_lock(&p->lock);
-       p->tm.lastuse = jiffies;
-       p->bstats.bytes += skb->len;
-       p->bstats.packets++;
+       spin_lock(&d->tcf_lock);
+       d->tcf_tm.lastuse = jiffies;
+       d->tcf_bstats.bytes += skb->len;
+       d->tcf_bstats.packets++;
 
        /* print policy string followed by _ then packet count 
         * Example if this was the 3rd packet and the string was "hello" 
         * then it would look like "hello_3" (without quotes) 
         **/
-       printk("simple: %s_%d\n", (char *)p->defdata, p->bstats.packets);
-       spin_unlock(&p->lock);
-       return p->action;
+       printk("simple: %s_%d\n",
+              (char *)d->tcfd_defdata, d->tcf_bstats.packets);
+       spin_unlock(&d->tcf_lock);
+       return d->tcf_action;
+}
+
+static int tcf_simp_release(struct tcf_defact *d, int bind)
+{
+       int ret = 0;
+       if (d) {
+               if (bind)
+                       d->tcf_bindcnt--;
+               d->tcf_refcnt--;
+               if (d->tcf_bindcnt <= 0 && d->tcf_refcnt <= 0) {
+                       kfree(d->tcfd_defdata);
+                       tcf_hash_destroy(&d->common, &simp_hash_info);
+                       ret = 1;
+               }
+       }
+       return ret;
+}
+
+static int alloc_defdata(struct tcf_defact *d, u32 datalen, void *defdata)
+{
+       d->tcfd_defdata = kmalloc(datalen, GFP_KERNEL);
+       if (unlikely(!d->tcfd_defdata))
+               return -ENOMEM;
+       d->tcfd_datalen = datalen;
+       memcpy(d->tcfd_defdata, defdata, datalen);
+       return 0;
+}
+
+static int realloc_defdata(struct tcf_defact *d, u32 datalen, void *defdata)
+{
+       kfree(d->tcfd_defdata);
+       return alloc_defdata(d, datalen, defdata);
+}
+
+static int tcf_simp_init(struct rtattr *rta, struct rtattr *est,
+                        struct tc_action *a, int ovr, int bind)
+{
+       struct rtattr *tb[TCA_DEF_MAX];
+       struct tc_defact *parm;
+       struct tcf_defact *d;
+       struct tcf_common *pc;
+       void *defdata;
+       u32 datalen = 0;
+       int ret = 0;
+
+       if (rta == NULL || rtattr_parse_nested(tb, TCA_DEF_MAX, rta) < 0)
+               return -EINVAL;
+
+       if (tb[TCA_DEF_PARMS - 1] == NULL ||
+           RTA_PAYLOAD(tb[TCA_DEF_PARMS - 1]) < sizeof(*parm))
+               return -EINVAL;
+
+       parm = RTA_DATA(tb[TCA_DEF_PARMS - 1]);
+       defdata = RTA_DATA(tb[TCA_DEF_DATA - 1]);
+       if (defdata == NULL)
+               return -EINVAL;
+
+       datalen = RTA_PAYLOAD(tb[TCA_DEF_DATA - 1]);
+       if (datalen <= 0)
+               return -EINVAL;
+
+       pc = tcf_hash_check(parm->index, a, bind, &simp_hash_info);
+       if (!pc) {
+               pc = tcf_hash_create(parm->index, est, a, sizeof(*d), bind,
+                                    &simp_idx_gen, &simp_hash_info);
+               if (unlikely(!pc))
+                       return -ENOMEM;
+
+               d = to_defact(pc);
+               ret = alloc_defdata(d, datalen, defdata);
+               if (ret < 0) {
+                       kfree(pc);
+                       return ret;
+               }
+               ret = ACT_P_CREATED;
+       } else {
+               d = to_defact(pc);
+               if (!ovr) {
+                       tcf_simp_release(d, bind);
+                       return -EEXIST;
+               }
+               realloc_defdata(d, datalen, defdata);
+       }
+
+       spin_lock_bh(&d->tcf_lock);
+       d->tcf_action = parm->action;
+       spin_unlock_bh(&d->tcf_lock);
+
+       if (ret == ACT_P_CREATED)
+               tcf_hash_insert(pc, &simp_hash_info);
+       return ret;
+}
+
+static inline int tcf_simp_cleanup(struct tc_action *a, int bind)
+{
+       struct tcf_defact *d = a->priv;
+
+       if (d)
+               return tcf_simp_release(d, bind);
+       return 0;
+}
+
+static inline int tcf_simp_dump(struct sk_buff *skb, struct tc_action *a,
+                               int bind, int ref)
+{
+       unsigned char *b = skb->tail;
+       struct tcf_defact *d = a->priv;
+       struct tc_defact opt;
+       struct tcf_t t;
+
+       opt.index = d->tcf_index;
+       opt.refcnt = d->tcf_refcnt - ref;
+       opt.bindcnt = d->tcf_bindcnt - bind;
+       opt.action = d->tcf_action;
+       RTA_PUT(skb, TCA_DEF_PARMS, sizeof(opt), &opt);
+       RTA_PUT(skb, TCA_DEF_DATA, d->tcfd_datalen, d->tcfd_defdata);
+       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);
+       RTA_PUT(skb, TCA_DEF_TM, sizeof(t), &t);
+       return skb->len;
+
+rtattr_failure:
+       skb_trim(skb, b - skb->data);
+       return -1;
 }
 
 static struct tc_action_ops act_simp_ops = {
-       .kind = "simple",
-       .type = TCA_ACT_SIMP,
-       .capab = TCA_CAP_NONE,
-       .owner = THIS_MODULE,
-       .act = tcf_simp,
-       tca_use_default_ops
+       .kind           =       "simple",
+       .hinfo          =       &simp_hash_info,
+       .type           =       TCA_ACT_SIMP,
+       .capab          =       TCA_CAP_NONE,
+       .owner          =       THIS_MODULE,
+       .act            =       tcf_simp,
+       .dump           =       tcf_simp_dump,
+       .cleanup        =       tcf_simp_cleanup,
+       .init           =       tcf_simp_init,
+       .walk           =       tcf_generic_walker,
 };
 
 MODULE_AUTHOR("Jamal Hadi Salim(2005)");