net: spread __net_init, __net_exit

[safe/jmp/linux-2.6] / net / core / fib_rules.c

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 32b3a01..9a24377 100644 (file)
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -72,7 +72,7 @@ static void flush_route_cache(struct fib_rules_ops *ops)
                ops->flush_cache(ops);
 }
 
-int fib_rules_register(struct fib_rules_ops *ops)
+static int __fib_rules_register(struct fib_rules_ops *ops)
 {
        int err = -EEXIST;
        struct fib_rules_ops *o;
@@ -102,6 +102,28 @@ errout:
        return err;
 }
 
+struct fib_rules_ops *
+fib_rules_register(struct fib_rules_ops *tmpl, struct net *net)
+{
+       struct fib_rules_ops *ops;
+       int err;
+
+       ops = kmemdup(tmpl, sizeof (*ops), GFP_KERNEL);
+       if (ops == NULL)
+               return ERR_PTR(-ENOMEM);
+
+       INIT_LIST_HEAD(&ops->rules_list);
+       ops->fro_net = net;
+
+       err = __fib_rules_register(ops);
+       if (err) {
+               kfree(ops);
+               ops = ERR_PTR(err);
+       }
+
+       return ops;
+}
+
 EXPORT_SYMBOL_GPL(fib_rules_register);
 
 void fib_rules_cleanup_ops(struct fib_rules_ops *ops)
@@ -115,6 +137,15 @@ void fib_rules_cleanup_ops(struct fib_rules_ops *ops)
 }
 EXPORT_SYMBOL_GPL(fib_rules_cleanup_ops);
 
+static void fib_rules_put_rcu(struct rcu_head *head)
+{
+       struct fib_rules_ops *ops = container_of(head, struct fib_rules_ops, rcu);
+       struct net *net = ops->fro_net;
+
+       release_net(net);
+       kfree(ops);
+}
+
 void fib_rules_unregister(struct fib_rules_ops *ops)
 {
        struct net *net = ops->fro_net;
@@ -124,8 +155,7 @@ void fib_rules_unregister(struct fib_rules_ops *ops)
        fib_rules_cleanup_ops(ops);
        spin_unlock(&net->rules_mod_lock);
 
-       synchronize_rcu();
-       release_net(net);
+       call_rcu(&ops->rcu, fib_rules_put_rcu);
 }
 
 EXPORT_SYMBOL_GPL(fib_rules_unregister);
@@ -135,7 +165,10 @@ static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops,
 {
        int ret = 0;
 
-       if (rule->ifindex && (rule->ifindex != fl->iif))
+       if (rule->iifindex && (rule->iifindex != fl->iif))
+               goto out;
+
+       if (rule->oifindex && (rule->oifindex != fl->oif))
                goto out;
 
        if ((rule->mark ^ fl->mark) & rule->mark_mask)
@@ -248,14 +281,24 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
        if (tb[FRA_PRIORITY])
                rule->pref = nla_get_u32(tb[FRA_PRIORITY]);
 
-       if (tb[FRA_IFNAME]) {
+       if (tb[FRA_IIFNAME]) {
+               struct net_device *dev;
+
+               rule->iifindex = -1;
+               nla_strlcpy(rule->iifname, tb[FRA_IIFNAME], IFNAMSIZ);
+               dev = __dev_get_by_name(net, rule->iifname);
+               if (dev)
+                       rule->iifindex = dev->ifindex;
+       }
+
+       if (tb[FRA_OIFNAME]) {
                struct net_device *dev;
 
-               rule->ifindex = -1;
-               nla_strlcpy(rule->ifname, tb[FRA_IFNAME], IFNAMSIZ);
-               dev = __dev_get_by_name(net, rule->ifname);
+               rule->oifindex = -1;
+               nla_strlcpy(rule->oifname, tb[FRA_OIFNAME], IFNAMSIZ);
+               dev = __dev_get_by_name(net, rule->oifname);
                if (dev)
-                       rule->ifindex = dev->ifindex;
+                       rule->oifindex = dev->ifindex;
        }
 
        if (tb[FRA_FWMARK]) {
@@ -274,7 +317,7 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
        rule->flags = frh->flags;
        rule->table = frh_get_table(frh, tb);
 
-       if (!rule->pref && ops->default_pref)
+       if (!tb[FRA_PRIORITY] && ops->default_pref)
                rule->pref = ops->default_pref(ops);
 
        err = -EINVAL;
@@ -299,7 +342,7 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
        } else if (rule->action == FR_ACT_GOTO)
                goto errout_free;
 
-       err = ops->configure(rule, skb, nlh, frh, tb);
+       err = ops->configure(rule, skb, frh, tb);
        if (err < 0)
                goto errout_free;
 
@@ -388,8 +431,12 @@ static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
                    (rule->pref != nla_get_u32(tb[FRA_PRIORITY])))
                        continue;
 
-               if (tb[FRA_IFNAME] &&
-                   nla_strcmp(tb[FRA_IFNAME], rule->ifname))
+               if (tb[FRA_IIFNAME] &&
+                   nla_strcmp(tb[FRA_IIFNAME], rule->iifname))
+                       continue;
+
+               if (tb[FRA_OIFNAME] &&
+                   nla_strcmp(tb[FRA_OIFNAME], rule->oifname))
                        continue;
 
                if (tb[FRA_FWMARK] &&
@@ -447,7 +494,8 @@ static inline size_t fib_rule_nlmsg_size(struct fib_rules_ops *ops,
                                         struct fib_rule *rule)
 {
        size_t payload = NLMSG_ALIGN(sizeof(struct fib_rule_hdr))
-                        + nla_total_size(IFNAMSIZ) /* FRA_IFNAME */
+                        + nla_total_size(IFNAMSIZ) /* FRA_IIFNAME */
+                        + nla_total_size(IFNAMSIZ) /* FRA_OIFNAME */
                         + nla_total_size(4) /* FRA_PRIORITY */
                         + nla_total_size(4) /* FRA_TABLE */
                         + nla_total_size(4) /* FRA_FWMARK */
@@ -481,11 +529,18 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,
        if (rule->action == FR_ACT_GOTO && rule->ctarget == NULL)
                frh->flags |= FIB_RULE_UNRESOLVED;
 
-       if (rule->ifname[0]) {
-               NLA_PUT_STRING(skb, FRA_IFNAME, rule->ifname);
+       if (rule->iifname[0]) {
+               NLA_PUT_STRING(skb, FRA_IIFNAME, rule->iifname);
 
-               if (rule->ifindex == -1)
-                       frh->flags |= FIB_RULE_DEV_DETACHED;
+               if (rule->iifindex == -1)
+                       frh->flags |= FIB_RULE_IIF_DETACHED;
+       }
+
+       if (rule->oifname[0]) {
+               NLA_PUT_STRING(skb, FRA_OIFNAME, rule->oifname);
+
+               if (rule->oifindex == -1)
+                       frh->flags |= FIB_RULE_OIF_DETACHED;
        }
 
        if (rule->pref)
@@ -500,7 +555,7 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,
        if (rule->target)
                NLA_PUT_U32(skb, FRA_GOTO, rule->target);
 
-       if (ops->fill(rule, skb, nlh, frh) < 0)
+       if (ops->fill(rule, skb, frh) < 0)
                goto nla_put_failure;
 
        return nlmsg_end(skb, nlh);
@@ -588,7 +643,8 @@ static void notify_rule_change(int event, struct fib_rule *rule,
                goto errout;
        }
 
-       err = rtnl_notify(skb, net, pid, ops->nlgroup, nlh, GFP_KERNEL);
+       rtnl_notify(skb, net, pid, ops->nlgroup, nlh, GFP_KERNEL);
+       return;
 errout:
        if (err < 0)
                rtnl_set_sk_err(net, ops->nlgroup, err);
@@ -599,9 +655,12 @@ static void attach_rules(struct list_head *rules, struct net_device *dev)
        struct fib_rule *rule;
 
        list_for_each_entry(rule, rules, list) {
-               if (rule->ifindex == -1 &&
-                   strcmp(dev->name, rule->ifname) == 0)
-                       rule->ifindex = dev->ifindex;
+               if (rule->iifindex == -1 &&
+                   strcmp(dev->name, rule->iifname) == 0)
+                       rule->iifindex = dev->ifindex;
+               if (rule->oifindex == -1 &&
+                   strcmp(dev->name, rule->oifname) == 0)
+                       rule->oifindex = dev->ifindex;
        }
 }
 
@@ -609,9 +668,12 @@ static void detach_rules(struct list_head *rules, struct net_device *dev)
 {
        struct fib_rule *rule;
 
-       list_for_each_entry(rule, rules, list)
-               if (rule->ifindex == dev->ifindex)
-                       rule->ifindex = -1;
+       list_for_each_entry(rule, rules, list) {
+               if (rule->iifindex == dev->ifindex)
+                       rule->iifindex = -1;
+               if (rule->oifindex == dev->ifindex)
+                       rule->oifindex = -1;
+       }
 }
 
 
@@ -646,7 +708,7 @@ static struct notifier_block fib_rules_notifier = {
        .notifier_call = fib_rules_event,
 };
 
-static int fib_rules_net_init(struct net *net)
+static int __net_init fib_rules_net_init(struct net *net)
 {
        INIT_LIST_HEAD(&net->rules_ops);
        spin_lock_init(&net->rules_mod_lock);