#include <linux/errno.h>
#include <linux/netdevice.h>
#include <net/ip.h>
-#include <net/pkt_sched.h>
+#include <net/act_api.h>
+#include <net/pkt_cls.h>
#include <net/route.h>
struct tcindex_filter_result {
- struct tcf_police *police;
- struct tcf_result res;
+ struct tcf_exts exts;
+ struct tcf_result res;
};
struct tcindex_filter {
- __u16 key;
+ u16 key;
struct tcindex_filter_result result;
struct tcindex_filter *next;
};
struct tcindex_filter_result *perfect; /* perfect hash; NULL if none */
struct tcindex_filter **h; /* imperfect hash; only used if !perfect;
NULL if unused */
- __u16 mask; /* AND key with mask */
+ u16 mask; /* AND key with mask */
int shift; /* shift ANDed key to the right */
int hash; /* hash table size; 0 if undefined */
int alloc_hash; /* allocated size */
int fall_through; /* 0: only classify if explicit match */
};
+static struct tcf_ext_map tcindex_ext_map = {
+ .police = TCA_TCINDEX_POLICE,
+ .action = TCA_TCINDEX_ACT
+};
+
+static inline int
+tcindex_filter_is_set(struct tcindex_filter_result *r)
+{
+ return tcf_exts_is_predicative(&r->exts) || r->res.classid;
+}
-static struct tcindex_filter_result *lookup(struct tcindex_data *p,__u16 key)
+static struct tcindex_filter_result *
+tcindex_lookup(struct tcindex_data *p, u16 key)
{
struct tcindex_filter *f;
if (p->perfect)
- return p->perfect[key].res.class ? p->perfect+key : NULL;
- if (!p->h)
- return NULL;
- for (f = p->h[key % p->hash]; f; f = f->next) {
- if (f->key == key)
- return &f->result;
+ return tcindex_filter_is_set(p->perfect + key) ?
+ p->perfect + key : NULL;
+ else if (p->h) {
+ for (f = p->h[key % p->hash]; f; f = f->next)
+ if (f->key == key)
+ return &f->result;
}
+
return NULL;
}
static int tcindex_classify(struct sk_buff *skb, struct tcf_proto *tp,
- struct tcf_result *res)
+ struct tcf_result *res)
{
struct tcindex_data *p = PRIV(tp);
struct tcindex_filter_result *f;
+ int key = (skb->tc_index & p->mask) >> p->shift;
D2PRINTK("tcindex_classify(skb %p,tp %p,res %p),p %p\n",skb,tp,res,p);
- f = lookup(p,(skb->tc_index & p->mask) >> p->shift);
+ f = tcindex_lookup(p, key);
if (!f) {
if (!p->fall_through)
return -1;
- res->classid = TC_H_MAKE(TC_H_MAJ(tp->q->handle),
- (skb->tc_index& p->mask) >> p->shift);
+ res->classid = TC_H_MAKE(TC_H_MAJ(tp->q->handle), key);
res->class = 0;
D2PRINTK("alg 0x%x\n",res->classid);
return 0;
}
*res = f->res;
D2PRINTK("map 0x%x\n",res->classid);
-#ifdef CONFIG_NET_CLS_POLICE
- if (f->police) {
- int result;
- result = tcf_police(skb,f->police);
- D2PRINTK("police %d\n",res);
- return result;
- }
-#endif
- return 0;
+ return tcf_exts_exec(skb, &f->exts, res);
}
DPRINTK("tcindex_get(tp %p,handle 0x%08x)\n",tp,handle);
if (p->perfect && handle >= p->alloc_hash)
return 0;
- r = lookup(PRIV(tp),handle);
- return r && r->res.class ? (unsigned long) r : 0;
+ r = tcindex_lookup(p, handle);
+ return r && tcindex_filter_is_set(r) ? (unsigned long) r : 0UL;
}
if (!p)
return -ENOMEM;
- tp->root = p;
- p->perfect = NULL;
- p->h = NULL;
- p->hash = 0;
+ memset(p, 0, sizeof(*p));
p->mask = 0xffff;
- p->shift = 0;
+ p->hash = DEFAULT_HASH_SIZE;
p->fall_through = 1;
+
+ tp->root = p;
return 0;
}
-static int tcindex_delete(struct tcf_proto *tp, unsigned long arg)
+static int
+__tcindex_delete(struct tcf_proto *tp, unsigned long arg, int lock)
{
struct tcindex_data *p = PRIV(tp);
struct tcindex_filter_result *r = (struct tcindex_filter_result *) arg;
struct tcindex_filter *f = NULL;
- unsigned long cl;
DPRINTK("tcindex_delete(tp %p,arg 0x%lx),p %p,f %p\n",tp,arg,p,f);
if (p->perfect) {
found:
f = *walk;
- tcf_tree_lock(tp);
+ if (lock)
+ tcf_tree_lock(tp);
*walk = f->next;
- tcf_tree_unlock(tp);
+ if (lock)
+ tcf_tree_unlock(tp);
}
- cl = __cls_set_class(&r->res.class,0);
- if (cl)
- tp->q->ops->cl_ops->unbind_tcf(tp->q,cl);
-#ifdef CONFIG_NET_CLS_POLICE
- tcf_police_release(r->police, TCA_ACT_UNBIND);
-#endif
+ tcf_unbind_filter(tp, &r->res);
+ tcf_exts_destroy(tp, &r->exts);
if (f)
kfree(f);
return 0;
}
+static int tcindex_delete(struct tcf_proto *tp, unsigned long arg)
+{
+ return __tcindex_delete(tp, arg, 1);
+}
-/*
- * There are no parameters for tcindex_init, so we overload tcindex_change
- */
-
-
-static int tcindex_change(struct tcf_proto *tp,unsigned long base,u32 handle,
- struct rtattr **tca,unsigned long *arg)
+static inline int
+valid_perfect_hash(struct tcindex_data *p)
{
- struct tcindex_filter_result new_filter_result = {
- NULL, /* no policing */
- { 0,0 }, /* no classification */
- };
- struct rtattr *opt = tca[TCA_OPTIONS-1];
- struct rtattr *tb[TCA_TCINDEX_MAX];
- struct tcindex_data *p = PRIV(tp);
- struct tcindex_filter *f;
- struct tcindex_filter_result *r = (struct tcindex_filter_result *) *arg;
- struct tcindex_filter **walk;
- int hash,shift;
- __u16 mask;
+ return p->hash > (p->mask >> p->shift);
+}
- DPRINTK("tcindex_change(tp %p,handle 0x%08x,tca %p,arg %p),opt %p,"
- "p %p,r %p\n",tp,handle,tca,arg,opt,p,r);
- if (arg)
- DPRINTK("*arg = 0x%lx\n",*arg);
- if (!opt)
- return 0;
- if (rtattr_parse(tb,TCA_TCINDEX_MAX,RTA_DATA(opt),RTA_PAYLOAD(opt)) < 0)
- return -EINVAL;
- if (!tb[TCA_TCINDEX_HASH-1]) {
- hash = p->hash;
- } else {
- if (RTA_PAYLOAD(tb[TCA_TCINDEX_HASH-1]) < sizeof(int))
- return -EINVAL;
- hash = *(int *) RTA_DATA(tb[TCA_TCINDEX_HASH-1]);
+static int
+tcindex_set_parms(struct tcf_proto *tp, unsigned long base, u32 handle,
+ struct tcindex_data *p, struct tcindex_filter_result *r,
+ struct rtattr **tb, struct rtattr *est)
+{
+ int err, balloc = 0;
+ struct tcindex_filter_result new_filter_result, *old_r = r;
+ struct tcindex_filter_result cr;
+ struct tcindex_data cp;
+ struct tcindex_filter *f = NULL; /* make gcc behave */
+ struct tcf_exts e;
+
+ err = tcf_exts_validate(tp, tb, est, &e, &tcindex_ext_map);
+ if (err < 0)
+ return err;
+
+ memcpy(&cp, p, sizeof(cp));
+ memset(&new_filter_result, 0, sizeof(new_filter_result));
+
+ if (old_r)
+ memcpy(&cr, r, sizeof(cr));
+ else
+ memset(&cr, 0, sizeof(cr));
+
+ err = -EINVAL;
+ if (tb[TCA_TCINDEX_HASH-1]) {
+ if (RTA_PAYLOAD(tb[TCA_TCINDEX_HASH-1]) < sizeof(u32))
+ goto errout;
+ cp.hash = *(u32 *) RTA_DATA(tb[TCA_TCINDEX_HASH-1]);
}
- if (!tb[TCA_TCINDEX_MASK-1]) {
- mask = p->mask;
- } else {
- if (RTA_PAYLOAD(tb[TCA_TCINDEX_MASK-1]) < sizeof(__u16))
- return -EINVAL;
- mask = *(__u16 *) RTA_DATA(tb[TCA_TCINDEX_MASK-1]);
+
+ if (tb[TCA_TCINDEX_MASK-1]) {
+ if (RTA_PAYLOAD(tb[TCA_TCINDEX_MASK-1]) < sizeof(u16))
+ goto errout;
+ cp.mask = *(u16 *) RTA_DATA(tb[TCA_TCINDEX_MASK-1]);
}
- if (!tb[TCA_TCINDEX_SHIFT-1])
- shift = p->shift;
- else {
- if (RTA_PAYLOAD(tb[TCA_TCINDEX_SHIFT-1]) < sizeof(__u16))
- return -EINVAL;
- shift = *(int *) RTA_DATA(tb[TCA_TCINDEX_SHIFT-1]);
+
+ if (tb[TCA_TCINDEX_SHIFT-1]) {
+ if (RTA_PAYLOAD(tb[TCA_TCINDEX_SHIFT-1]) < sizeof(u16))
+ goto errout;
+ cp.shift = *(u16 *) RTA_DATA(tb[TCA_TCINDEX_SHIFT-1]);
}
- if (p->perfect && hash <= (mask >> shift))
- return -EBUSY;
- if (p->perfect && hash > p->alloc_hash)
- return -EBUSY;
- if (p->h && hash != p->alloc_hash)
- return -EBUSY;
- p->hash = hash;
- p->mask = mask;
- p->shift = shift;
+
+ err = -EBUSY;
+ /* Hash already allocated, make sure that we still meet the
+ * requirements for the allocated hash.
+ */
+ if (cp.perfect) {
+ if (!valid_perfect_hash(&cp) ||
+ cp.hash > cp.alloc_hash)
+ goto errout;
+ } else if (cp.h && cp.hash != cp.alloc_hash)
+ goto errout;
+
+ err = -EINVAL;
if (tb[TCA_TCINDEX_FALL_THROUGH-1]) {
- if (RTA_PAYLOAD(tb[TCA_TCINDEX_FALL_THROUGH-1]) < sizeof(int))
- return -EINVAL;
- p->fall_through =
- *(int *) RTA_DATA(tb[TCA_TCINDEX_FALL_THROUGH-1]);
+ if (RTA_PAYLOAD(tb[TCA_TCINDEX_FALL_THROUGH-1]) < sizeof(u32))
+ goto errout;
+ cp.fall_through =
+ *(u32 *) RTA_DATA(tb[TCA_TCINDEX_FALL_THROUGH-1]);
}
- DPRINTK("classid/police %p/%p\n",tb[TCA_TCINDEX_CLASSID-1],
- tb[TCA_TCINDEX_POLICE-1]);
- if (!tb[TCA_TCINDEX_CLASSID-1] && !tb[TCA_TCINDEX_POLICE-1])
- return 0;
- if (!hash) {
- if ((mask >> shift) < PERFECT_HASH_THRESHOLD) {
- p->hash = (mask >> shift)+1;
- } else {
- p->hash = DEFAULT_HASH_SIZE;
- }
+
+ if (!cp.hash) {
+ /* Hash not specified, use perfect hash if the upper limit
+ * of the hashing index is below the threshold.
+ */
+ if ((cp.mask >> cp.shift) < PERFECT_HASH_THRESHOLD)
+ cp.hash = (cp.mask >> cp.shift)+1;
+ else
+ cp.hash = DEFAULT_HASH_SIZE;
}
- if (!p->perfect && !p->h) {
- p->alloc_hash = p->hash;
- DPRINTK("hash %d mask %d\n",p->hash,p->mask);
- if (p->hash > (mask >> shift)) {
- p->perfect = kmalloc(p->hash*
- sizeof(struct tcindex_filter_result),GFP_KERNEL);
- if (!p->perfect)
- return -ENOMEM;
- memset(p->perfect, 0,
- p->hash * sizeof(struct tcindex_filter_result));
+
+ if (!cp.perfect && !cp.h)
+ cp.alloc_hash = cp.hash;
+
+ /* Note: this could be as restrictive as if (handle & ~(mask >> shift))
+ * but then, we'd fail handles that may become valid after some future
+ * mask change. While this is extremely unlikely to ever matter,
+ * the check below is safer (and also more backwards-compatible).
+ */
+ if (cp.perfect || valid_perfect_hash(&cp))
+ if (handle >= cp.alloc_hash)
+ goto errout;
+
+
+ err = -ENOMEM;
+ if (!cp.perfect && !cp.h) {
+ if (valid_perfect_hash(&cp)) {
+ cp.perfect = kmalloc(cp.hash * sizeof(*r), GFP_KERNEL);
+ if (!cp.perfect)
+ goto errout;
+ memset(cp.perfect, 0, cp.hash * sizeof(*r));
+ balloc = 1;
} else {
- p->h = kmalloc(p->hash*sizeof(struct tcindex_filter *),
- GFP_KERNEL);
- if (!p->h)
- return -ENOMEM;
- memset(p->h, 0, p->hash*sizeof(struct tcindex_filter *));
+ cp.h = kmalloc(cp.hash * sizeof(f), GFP_KERNEL);
+ if (!cp.h)
+ goto errout;
+ memset(cp.h, 0, cp.hash * sizeof(f));
+ balloc = 2;
}
}
- /*
- * Note: this could be as restrictive as
- * if (handle & ~(mask >> shift))
- * but then, we'd fail handles that may become valid after some
- * future mask change. While this is extremely unlikely to ever
- * matter, the check below is safer (and also more
- * backwards-compatible).
- */
- if (p->perfect && handle >= p->alloc_hash)
- return -EINVAL;
- if (p->perfect) {
- r = p->perfect+handle;
- } else {
- r = lookup(p,handle);
- DPRINTK("r=%p\n",r);
- if (!r)
- r = &new_filter_result;
- }
- DPRINTK("r=%p\n",r);
+
+ if (cp.perfect)
+ r = cp.perfect + handle;
+ else
+ r = tcindex_lookup(&cp, handle) ? : &new_filter_result;
+
+ if (r == &new_filter_result) {
+ f = kmalloc(sizeof(*f), GFP_KERNEL);
+ if (!f)
+ goto errout_alloc;
+ memset(f, 0, sizeof(*f));
+ }
+
if (tb[TCA_TCINDEX_CLASSID-1]) {
- unsigned long cl = cls_set_class(tp,&r->res.class,0);
-
- if (cl)
- tp->q->ops->cl_ops->unbind_tcf(tp->q,cl);
- r->res.classid = *(__u32 *) RTA_DATA(tb[TCA_TCINDEX_CLASSID-1]);
- r->res.class = tp->q->ops->cl_ops->bind_tcf(tp->q,base,
- r->res.classid);
- if (!r->res.class) {
- r->res.classid = 0;
- return -ENOENT;
- }
- }
-#ifdef CONFIG_NET_CLS_POLICE
- {
- struct tcf_police *police;
-
- police = tb[TCA_TCINDEX_POLICE-1] ?
- tcf_police_locate(tb[TCA_TCINDEX_POLICE-1],NULL) : NULL;
- tcf_tree_lock(tp);
- police = xchg(&r->police,police);
- tcf_tree_unlock(tp);
- tcf_police_release(police,TCA_ACT_UNBIND);
- }
-#endif
- if (r != &new_filter_result)
- return 0;
- f = kmalloc(sizeof(struct tcindex_filter),GFP_KERNEL);
- if (!f)
- return -ENOMEM;
- f->key = handle;
- f->result = new_filter_result;
- f->next = NULL;
- for (walk = p->h+(handle % p->hash); *walk; walk = &(*walk)->next)
- /* nothing */;
- wmb();
- *walk = f;
+ cr.res.classid = *(u32 *) RTA_DATA(tb[TCA_TCINDEX_CLASSID-1]);
+ tcf_bind_filter(tp, &cr.res, base);
+ }
+
+ tcf_exts_change(tp, &cr.exts, &e);
+
+ tcf_tree_lock(tp);
+ if (old_r && old_r != r)
+ memset(old_r, 0, sizeof(*old_r));
+
+ memcpy(p, &cp, sizeof(cp));
+ memcpy(r, &cr, sizeof(cr));
+
+ if (r == &new_filter_result) {
+ struct tcindex_filter **fp;
+
+ f->key = handle;
+ f->result = new_filter_result;
+ f->next = NULL;
+ for (fp = p->h+(handle % p->hash); *fp; fp = &(*fp)->next)
+ /* nothing */;
+ *fp = f;
+ }
+ tcf_tree_unlock(tp);
+
return 0;
+
+errout_alloc:
+ if (balloc == 1)
+ kfree(cp.perfect);
+ else if (balloc == 2)
+ kfree(cp.h);
+errout:
+ tcf_exts_destroy(tp, &e);
+ return err;
+}
+
+static int
+tcindex_change(struct tcf_proto *tp, unsigned long base, u32 handle,
+ struct rtattr **tca, unsigned long *arg)
+{
+ struct rtattr *opt = tca[TCA_OPTIONS-1];
+ struct rtattr *tb[TCA_TCINDEX_MAX];
+ struct tcindex_data *p = PRIV(tp);
+ struct tcindex_filter_result *r = (struct tcindex_filter_result *) *arg;
+
+ DPRINTK("tcindex_change(tp %p,handle 0x%08x,tca %p,arg %p),opt %p,"
+ "p %p,r %p,*arg 0x%lx\n",
+ tp, handle, tca, arg, opt, p, r, arg ? *arg : 0L);
+
+ if (!opt)
+ return 0;
+
+ if (rtattr_parse_nested(tb, TCA_TCINDEX_MAX, opt) < 0)
+ return -EINVAL;
+
+ return tcindex_set_parms(tp, base, handle, p, r, tb, tca[TCA_RATE-1]);
}
static int tcindex_destroy_element(struct tcf_proto *tp,
unsigned long arg, struct tcf_walker *walker)
{
- return tcindex_delete(tp,arg);
+ return __tcindex_delete(tp, arg, 0);
}
RTA_PUT(skb,TCA_TCINDEX_SHIFT,sizeof(p->shift),&p->shift);
RTA_PUT(skb,TCA_TCINDEX_FALL_THROUGH,sizeof(p->fall_through),
&p->fall_through);
+ rta->rta_len = skb->tail-b;
} else {
if (p->perfect) {
t->tcm_handle = r-p->perfect;
DPRINTK("handle = %d\n",t->tcm_handle);
if (r->res.class)
RTA_PUT(skb, TCA_TCINDEX_CLASSID, 4, &r->res.classid);
-#ifdef CONFIG_NET_CLS_POLICE
- if (r->police) {
- struct rtattr *p_rta = (struct rtattr *) skb->tail;
-
- RTA_PUT(skb,TCA_TCINDEX_POLICE,0,NULL);
- if (tcf_police_dump(skb,r->police) < 0)
- goto rtattr_failure;
- p_rta->rta_len = skb->tail-(u8 *) p_rta;
- }
-#endif
+
+ if (tcf_exts_dump(skb, &r->exts, &tcindex_ext_map) < 0)
+ goto rtattr_failure;
+ rta->rta_len = skb->tail-b;
+
+ if (tcf_exts_dump_stats(skb, &r->exts, &tcindex_ext_map) < 0)
+ goto rtattr_failure;
}
- rta->rta_len = skb->tail-b;
+
return skb->len;
rtattr_failure:
git://git.onelab.eu / linux-2.6.git / blobdiff