Skip to content

L
linux
Commit 4bbe9642 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files
Options

[PKT_SCHED]: u32: make use of tcf_exts API 

Transforms u32 to use tcf_exts API. Makes the u32 changing
procedure consistent upon failures except for indev failures but
indev will be removed very soon.
Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2a221988
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 84 deletions
net/sched/cls_u32.c
View file @ 4bbe9642
...@@ -61,9 +61,9 @@ ...@@ -61,9 +61,9 @@
struct tc_u32_mark struct tc_u32_mark
{ {
__u32 val; u32 val;
__u32 mask; u32 mask;
__u32 success; u32 success;
}; };
struct tc_u_knode struct tc_u_knode
...@@ -71,13 +71,7 @@ struct tc_u_knode ...@@ -71,13 +71,7 @@ struct tc_u_knode
struct tc_u_knode *next; struct tc_u_knode *next;
u32 handle; u32 handle;
struct tc_u_hnode *ht_up; struct tc_u_hnode *ht_up;
#ifdef CONFIG_NET_CLS_ACT struct tcf_exts exts;
struct tc_action *action;
#else
#ifdef CONFIG_NET_CLS_POLICE
struct tcf_police *police;
#endif
#endif
#ifdef CONFIG_NET_CLS_IND #ifdef CONFIG_NET_CLS_IND
char indev[IFNAMSIZ]; char indev[IFNAMSIZ];
#endif #endif
...@@ -112,6 +106,11 @@ struct tc_u_common ...@@ -112,6 +106,11 @@ struct tc_u_common
u32 hgenerator; u32 hgenerator;
}; };
static struct tcf_ext_map u32_ext_map = {
.action = TCA_U32_ACT,
.police = TCA_U32_POLICE
};
static struct tc_u_common *u32_list; static struct tc_u_common *u32_list;
static __inline__ unsigned u32_hash_fold(u32 key, struct tc_u32_sel *sel, u8 fshift) static __inline__ unsigned u32_hash_fold(u32 key, struct tc_u32_sel *sel, u8 fshift)
...@@ -137,7 +136,7 @@ static int u32_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_re ...@@ -137,7 +136,7 @@ static int u32_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_re
#ifdef CONFIG_CLS_U32_PERF #ifdef CONFIG_CLS_U32_PERF
int j; int j;
#endif #endif
int i; int i, r;
next_ht: next_ht:
n = ht->ht[sel]; n = ht->ht[sel];
...@@ -185,22 +184,13 @@ static int u32_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_re ...@@ -185,22 +184,13 @@ static int u32_classify(struct sk_buff *skb, struct tcf_proto *tp, struct tcf_re
#ifdef CONFIG_CLS_U32_PERF #ifdef CONFIG_CLS_U32_PERF
n->pf->rhit +=1; n->pf->rhit +=1;
#endif #endif
#ifdef CONFIG_NET_CLS_ACT r = tcf_exts_exec(skb, &n->exts, res);
if (n->action) { if (r < 0) {
int pol_res = tcf_action_exec(skb, n->action, res); n = n->next;
if (pol_res >= 0) goto next_knode;
return pol_res; }
} else
#else return r;
#ifdef CONFIG_NET_CLS_POLICE
if (n->police) {
int pol_res = tcf_police(skb, n->police);
if (pol_res >= 0)
return pol_res;
} else
#endif
#endif
return 0;
} }
n = n->next; n = n->next;
goto next_knode; goto next_knode;
...@@ -359,15 +349,7 @@ static int u32_init(struct tcf_proto *tp) ...@@ -359,15 +349,7 @@ static int u32_init(struct tcf_proto *tp)
static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n) static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n)
{ {
tcf_unbind_filter(tp, &n->res); tcf_unbind_filter(tp, &n->res);
#ifdef CONFIG_NET_CLS_ACT tcf_exts_destroy(tp, &n->exts);
if (n->action) {
tcf_action_destroy(n->action, TCA_ACT_UNBIND);
}
#else
#ifdef CONFIG_NET_CLS_POLICE
tcf_police_release(n->police, TCA_ACT_UNBIND);
#endif
#endif
if (n->ht_down) if (n->ht_down)
n->ht_down->refcnt--; n->ht_down->refcnt--;
#ifdef CONFIG_CLS_U32_PERF #ifdef CONFIG_CLS_U32_PERF
...@@ -509,18 +491,26 @@ static int u32_set_parms(struct tcf_proto *tp, unsigned long base, ...@@ -509,18 +491,26 @@ static int u32_set_parms(struct tcf_proto *tp, unsigned long base,
struct tc_u_knode *n, struct rtattr **tb, struct tc_u_knode *n, struct rtattr **tb,
struct rtattr *est) struct rtattr *est)
{ {
int err;
struct tcf_exts e;
err = tcf_exts_validate(tp, tb, est, &e, &u32_ext_map);
if (err < 0)
return err;
err = -EINVAL;
if (tb[TCA_U32_LINK-1]) { if (tb[TCA_U32_LINK-1]) {
u32 handle = *(u32*)RTA_DATA(tb[TCA_U32_LINK-1]); u32 handle = *(u32*)RTA_DATA(tb[TCA_U32_LINK-1]);
struct tc_u_hnode *ht_down = NULL; struct tc_u_hnode *ht_down = NULL;
if (TC_U32_KEY(handle)) if (TC_U32_KEY(handle))
return -EINVAL; goto errout;
if (handle) { if (handle) {
ht_down = u32_lookup_ht(ht->tp_c, handle); ht_down = u32_lookup_ht(ht->tp_c, handle);
if (ht_down == NULL) if (ht_down == NULL)
return -EINVAL; goto errout;
ht_down->refcnt++; ht_down->refcnt++;
} }
...@@ -535,36 +525,20 @@ static int u32_set_parms(struct tcf_proto *tp, unsigned long base, ...@@ -535,36 +525,20 @@ static int u32_set_parms(struct tcf_proto *tp, unsigned long base,
n->res.classid = *(u32*)RTA_DATA(tb[TCA_U32_CLASSID-1]); n->res.classid = *(u32*)RTA_DATA(tb[TCA_U32_CLASSID-1]);
tcf_bind_filter(tp, &n->res, base); tcf_bind_filter(tp, &n->res, base);
} }
#ifdef CONFIG_NET_CLS_ACT
if (tb[TCA_U32_POLICE-1]) {
int err = tcf_change_act_police(tp, &n->action, tb[TCA_U32_POLICE-1], est);
if (err < 0)
return err;
}
if (tb[TCA_U32_ACT-1]) {
int err = tcf_change_act(tp, &n->action, tb[TCA_U32_ACT-1], est);
if (err < 0)
return err;
}
#else
#ifdef CONFIG_NET_CLS_POLICE
if (tb[TCA_U32_POLICE-1]) {
int err = tcf_change_police(tp, &n->police, tb[TCA_U32_POLICE-1], est);
if (err < 0)
return err;
}
#endif
#endif
#ifdef CONFIG_NET_CLS_IND #ifdef CONFIG_NET_CLS_IND
if (tb[TCA_U32_INDEV-1]) { if (tb[TCA_U32_INDEV-1]) {
int err = tcf_change_indev(tp, n->indev, tb[TCA_U32_INDEV-1]); int err = tcf_change_indev(tp, n->indev, tb[TCA_U32_INDEV-1]);
if (err < 0) if (err < 0)
return err; goto errout;
} }
#endif #endif
tcf_exts_change(tp, &n->exts, &e);
return 0; return 0;
errout:
tcf_exts_destroy(tp, &e);
return err;
} }
static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle, static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle,
...@@ -584,7 +558,7 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle, ...@@ -584,7 +558,7 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle,
if (opt == NULL) if (opt == NULL)
return handle ? -EINVAL : 0; return handle ? -EINVAL : 0;
if (rtattr_parse(tb, TCA_U32_MAX, RTA_DATA(opt), RTA_PAYLOAD(opt)) < 0) if (rtattr_parse_nested(tb, TCA_U32_MAX, opt) < 0)
return -EINVAL; return -EINVAL;
if ((n = (struct tc_u_knode*)*arg) != NULL) { if ((n = (struct tc_u_knode*)*arg) != NULL) {
...@@ -657,12 +631,12 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle, ...@@ -657,12 +631,12 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle,
memset(n, 0, sizeof(*n) + s->nkeys*sizeof(struct tc_u32_key)); memset(n, 0, sizeof(*n) + s->nkeys*sizeof(struct tc_u32_key));
#ifdef CONFIG_CLS_U32_PERF #ifdef CONFIG_CLS_U32_PERF
n->pf = kmalloc(sizeof(struct tc_u32_pcnt) + s->nkeys*sizeof(__u64), GFP_KERNEL); n->pf = kmalloc(sizeof(struct tc_u32_pcnt) + s->nkeys*sizeof(u64), GFP_KERNEL);
if (n->pf == NULL) { if (n->pf == NULL) {
kfree(n); kfree(n);
return -ENOBUFS; return -ENOBUFS;
} }
memset(n->pf, 0, sizeof(struct tc_u32_pcnt) + s->nkeys*sizeof(__u64)); memset(n->pf, 0, sizeof(struct tc_u32_pcnt) + s->nkeys*sizeof(u64));
#endif #endif
memcpy(&n->sel, s, sizeof(*s) + s->nkeys*sizeof(struct tc_u32_key)); memcpy(&n->sel, s, sizeof(*s) + s->nkeys*sizeof(struct tc_u32_key));
...@@ -783,15 +757,8 @@ static int u32_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -783,15 +757,8 @@ static int u32_dump(struct tcf_proto *tp, unsigned long fh,
RTA_PUT(skb, TCA_U32_MARK, sizeof(n->mark), &n->mark); RTA_PUT(skb, TCA_U32_MARK, sizeof(n->mark), &n->mark);
#endif #endif
#ifdef CONFIG_NET_CLS_ACT if (tcf_exts_dump(skb, &n->exts, &u32_ext_map) < 0)
if (tcf_dump_act(skb, n->action, TCA_U32_ACT, TCA_U32_POLICE) < 0)
goto rtattr_failure; goto rtattr_failure;
#else
#ifdef CONFIG_NET_CLS_POLICE
if (tcf_dump_police(skb, n->police, TCA_U32_POLICE) < 0)
goto rtattr_failure;
#endif
#endif
#ifdef CONFIG_NET_CLS_IND #ifdef CONFIG_NET_CLS_IND
if(strlen(n->indev)) if(strlen(n->indev))
...@@ -799,26 +766,15 @@ static int u32_dump(struct tcf_proto *tp, unsigned long fh, ...@@ -799,26 +766,15 @@ static int u32_dump(struct tcf_proto *tp, unsigned long fh,
#endif #endif
#ifdef CONFIG_CLS_U32_PERF #ifdef CONFIG_CLS_U32_PERF
RTA_PUT(skb, TCA_U32_PCNT, RTA_PUT(skb, TCA_U32_PCNT,
sizeof(struct tc_u32_pcnt) + n->sel.nkeys*sizeof(__u64), sizeof(struct tc_u32_pcnt) + n->sel.nkeys*sizeof(u64),
n->pf); n->pf);
#endif #endif
} }
rta->rta_len = skb->tail - b; rta->rta_len = skb->tail - b;
#ifdef CONFIG_NET_CLS_ACT if (TC_U32_KEY(n->handle))
if (TC_U32_KEY(n->handle) != 0) { if (tcf_exts_dump_stats(skb, &n->exts, &u32_ext_map) < 0)
if (TC_U32_KEY(n->handle) && n->action && n->action->type == TCA_OLD_COMPAT) {
if (tcf_action_copy_stats(skb,n->action))
goto rtattr_failure; goto rtattr_failure;
}
}
#else
#ifdef CONFIG_NET_CLS_POLICE
if (TC_U32_KEY(n->handle) && n->police)
if (tcf_police_dump_stats(skb, n->police) < 0)
goto rtattr_failure;
#endif
#endif
return skb->len; return skb->len;
rtattr_failure: rtattr_failure:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7