[IPV4]: Unify access to the routing tables.

[safe/jmp/linux-2.6] / net / ipv4 / fib_frontend.c

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 1bb956b..9ff1e66 100644 (file)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -50,39 +50,34 @@
 #define FFprint(a...) printk(KERN_DEBUG a)
 
 static struct sock *fibnl;
+struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];
 
 #ifndef CONFIG_IP_MULTIPLE_TABLES
 
-struct fib_table *ip_fib_local_table;
-struct fib_table *ip_fib_main_table;
-
-#define FIB_TABLE_HASHSZ 1
-static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];
-
-static int __init fib4_rules_init(void)
+static int __net_init fib4_rules_init(struct net *net)
 {
-       ip_fib_local_table = fib_hash_init(RT_TABLE_LOCAL);
-       if (ip_fib_local_table == NULL)
+       struct fib_table *local_table, *main_table;
+
+       local_table = fib_hash_init(RT_TABLE_LOCAL);
+       if (local_table == NULL)
                return -ENOMEM;
 
-       ip_fib_main_table  = fib_hash_init(RT_TABLE_MAIN);
-       if (ip_fib_main_table == NULL)
+       main_table  = fib_hash_init(RT_TABLE_MAIN);
+       if (main_table == NULL)
                goto fail;
 
-       hlist_add_head_rcu(&ip_fib_local_table->tb_hlist, &fib_table_hash[0]);
-       hlist_add_head_rcu(&ip_fib_main_table->tb_hlist, &fib_table_hash[0]);
+       hlist_add_head_rcu(&local_table->tb_hlist,
+                               &fib_table_hash[TABLE_LOCAL_INDEX]);
+       hlist_add_head_rcu(&main_table->tb_hlist,
+                               &fib_table_hash[TABLE_MAIN_INDEX]);
        return 0;
 
 fail:
-       kfree(ip_fib_local_table);
-       ip_fib_local_table = NULL;
+       kfree(local_table);
        return -ENOMEM;
 }
 #else
 
-#define FIB_TABLE_HASHSZ 256
-static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];
-
 struct fib_table *fib_new_table(u32 id)
 {
        struct fib_table *tb;
@@ -863,10 +858,18 @@ static void nl_fib_input(struct sk_buff *skb)
        netlink_unicast(fibnl, skb, pid, MSG_DONTWAIT);
 }
 
-static void nl_fib_lookup_init(void)
+static int nl_fib_lookup_init(struct net *net)
 {
-       fibnl = netlink_kernel_create(&init_net, NETLINK_FIB_LOOKUP, 0,
+       fibnl = netlink_kernel_create(net, NETLINK_FIB_LOOKUP, 0,
                                      nl_fib_input, NULL, THIS_MODULE);
+       if (fibnl == NULL)
+               return -EAFNOSUPPORT;
+       return 0;
+}
+
+static void nl_fib_lookup_exit(struct net *net)
+{
+       sock_put(fibnl);
 }
 
 static void fib_disable_ip(struct net_device *dev, int force)
@@ -949,22 +952,86 @@ static struct notifier_block fib_netdev_notifier = {
        .notifier_call =fib_netdev_event,
 };
 
-void __init ip_fib_init(void)
+static int __net_init ip_fib_net_init(struct net *net)
 {
        unsigned int i;
 
        for (i = 0; i < FIB_TABLE_HASHSZ; i++)
                INIT_HLIST_HEAD(&fib_table_hash[i]);
 
-       BUG_ON(fib4_rules_init());
+       return fib4_rules_init(net);
+}
+
+static void __net_exit ip_fib_net_exit(struct net *net)
+{
+       unsigned int i;
 
-       register_netdevice_notifier(&fib_netdev_notifier);
-       register_inetaddr_notifier(&fib_inetaddr_notifier);
-       nl_fib_lookup_init();
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+       fib4_rules_exit(net);
+#endif
+
+       for (i = 0; i < FIB_TABLE_HASHSZ; i++) {
+               struct fib_table *tb;
+               struct hlist_head *head;
+               struct hlist_node *node, *tmp;
 
+               head = &fib_table_hash[i];
+               hlist_for_each_entry_safe(tb, node, tmp, head, tb_hlist) {
+                       hlist_del(node);
+                       tb->tb_flush(tb);
+                       kfree(tb);
+               }
+       }
+}
+
+static int __net_init fib_net_init(struct net *net)
+{
+       int error;
+
+       error = 0;
+       if (net != &init_net)
+               goto out;
+
+       error = ip_fib_net_init(net);
+       if (error < 0)
+               goto out;
+       error = nl_fib_lookup_init(net);
+       if (error < 0)
+               goto out_nlfl;
+       error = fib_proc_init(net);
+       if (error < 0)
+               goto out_proc;
+out:
+       return error;
+
+out_proc:
+       nl_fib_lookup_exit(net);
+out_nlfl:
+       ip_fib_net_exit(net);
+       goto out;
+}
+
+static void __net_exit fib_net_exit(struct net *net)
+{
+       fib_proc_exit(net);
+       nl_fib_lookup_exit(net);
+       ip_fib_net_exit(net);
+}
+
+static struct pernet_operations fib_net_ops = {
+       .init = fib_net_init,
+       .exit = fib_net_exit,
+};
+
+void __init ip_fib_init(void)
+{
        rtnl_register(PF_INET, RTM_NEWROUTE, inet_rtm_newroute, NULL);
        rtnl_register(PF_INET, RTM_DELROUTE, inet_rtm_delroute, NULL);
        rtnl_register(PF_INET, RTM_GETROUTE, NULL, inet_dump_fib);
+
+       register_pernet_subsys(&fib_net_ops);
+       register_netdevice_notifier(&fib_netdev_notifier);
+       register_inetaddr_notifier(&fib_inetaddr_notifier);
 }
 
 EXPORT_SYMBOL(inet_addr_type);