lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

act_mirred: optimization.

Browse Source 
move checking if eaction is valid in tcf_mirred_init()

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Changli Gao
2009-11-17 04:15:16 -08:00
committed by David S. Miller
parent feed1f1724
commit b76965e02b
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
net/sched/act_mirred.c
View File

@@ -65,48 +65,53 @@ static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est,
struct tc_mirred *parm; struct tc_mirred *parm;
struct tcf_mirred *m; struct tcf_mirred *m;
struct tcf_common *pc; struct tcf_common *pc;
struct net_device *dev = NULL; struct net_device *dev;
int ret = 0, err; int ret, ok_push = 0;
int ok_push = 0;
if (nla == NULL) if (nla == NULL)
return -EINVAL; return -EINVAL;
ret = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, mirred_policy);
err = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, mirred_policy); if (ret < 0)
if (err < 0) return ret;
return err;
if (tb[TCA_MIRRED_PARMS] == NULL) if (tb[TCA_MIRRED_PARMS] == NULL)
return -EINVAL; return -EINVAL;
parm = nla_data(tb[TCA_MIRRED_PARMS]); parm = nla_data(tb[TCA_MIRRED_PARMS]);
switch (parm->eaction) {
case TCA_EGRESS_MIRROR:
case TCA_EGRESS_REDIR:
break;
default:
return -EINVAL;
}
if (parm->ifindex) { if (parm->ifindex) {
dev = __dev_get_by_index(&init_net, parm->ifindex); dev = __dev_get_by_index(&init_net, parm->ifindex);
if (dev == NULL) if (dev == NULL)
return -ENODEV; return -ENODEV;
switch (dev->type) { switch (dev->type) {
case ARPHRD_TUNNEL: case ARPHRD_TUNNEL:
case ARPHRD_TUNNEL6: case ARPHRD_TUNNEL6:
case ARPHRD_SIT: case ARPHRD_SIT:
case ARPHRD_IPGRE: case ARPHRD_IPGRE:
case ARPHRD_VOID: case ARPHRD_VOID:
case ARPHRD_NONE: case ARPHRD_NONE:
ok_push = 0; ok_push = 0;
break; break;
default: default:
ok_push = 1; ok_push = 1;
break; break;
} }
} else {
dev = NULL;
} }
pc = tcf_hash_check(parm->index, a, bind, &mirred_hash_info); pc = tcf_hash_check(parm->index, a, bind, &mirred_hash_info);
if (!pc) { if (!pc) {
if (!parm->ifindex) if (dev == NULL)
return -EINVAL; return -EINVAL;
pc = tcf_hash_create(parm->index, est, a, sizeof(*m), bind, pc = tcf_hash_create(parm->index, est, a, sizeof(*m), bind,
&mirred_idx_gen, &mirred_hash_info); &mirred_idx_gen, &mirred_hash_info);
if (IS_ERR(pc)) if (IS_ERR(pc))
return PTR_ERR(pc); return PTR_ERR(pc);
ret = ACT_P_CREATED; ret = ACT_P_CREATED;
} else { } else {
if (!ovr) { if (!ovr) {
@@ -119,12 +124,12 @@ static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est,
spin_lock_bh(&m->tcf_lock); spin_lock_bh(&m->tcf_lock);
m->tcf_action = parm->action; m->tcf_action = parm->action;
m->tcfm_eaction = parm->eaction; m->tcfm_eaction = parm->eaction;
if (parm->ifindex) { if (dev != NULL) {
m->tcfm_ifindex = parm->ifindex; m->tcfm_ifindex = parm->ifindex;
if (ret != ACT_P_CREATED) if (ret != ACT_P_CREATED)
dev_put(m->tcfm_dev); dev_put(m->tcfm_dev);
m->tcfm_dev = dev;
dev_hold(dev); dev_hold(dev);
m->tcfm_dev = dev;
m->tcfm_ok_push = ok_push; m->tcfm_ok_push = ok_push;
} }
spin_unlock_bh(&m->tcf_lock); spin_unlock_bh(&m->tcf_lock);
@@ -154,13 +159,6 @@ static int tcf_mirred(struct sk_buff *skb, struct tc_action *a,
spin_lock(&m->tcf_lock); spin_lock(&m->tcf_lock);
m->tcf_tm.lastuse = jiffies; m->tcf_tm.lastuse = jiffies;
if (m->tcfm_eaction != TCA_EGRESS_MIRROR &&
m->tcfm_eaction != TCA_EGRESS_REDIR) {
if (net_ratelimit())
printk("tcf_mirred unknown action %d\n",
m->tcfm_eaction);
goto out;
}
dev = m->tcfm_dev; dev = m->tcfm_dev;
if (!(dev->flags & IFF_UP)) { if (!(dev->flags & IFF_UP)) {