[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.

[firefly-linux-kernel-4.4.55.git] / net / ipv6 / ip6_fib.c

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 350a970ca1e31b95e5a98c047a8d04cf685659f9..b3f6e03c454cc7571800fc8b06538bdb5aa4c24e 100644 (file)
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -48,8 +48,6 @@
 #define RT6_TRACE(x...) do { ; } while (0)
 #endif
 
-struct rt6_statistics  rt6_stats;
-
 static struct kmem_cache * fib6_node_kmem __read_mostly;
 
 enum fib_walk_state_t
@@ -81,8 +79,8 @@ static DEFINE_RWLOCK(fib6_walker_lock);
 
 static void fib6_prune_clones(struct net *net, struct fib6_node *fn,
                              struct rt6_info *rt);
-static struct rt6_info * fib6_find_prefix(struct fib6_node *fn);
-static struct fib6_node * fib6_repair_tree(struct fib6_node *fn);
+static struct rt6_info *fib6_find_prefix(struct net *net, struct fib6_node *fn);
+static struct fib6_node *fib6_repair_tree(struct net *net, struct fib6_node *fn);
 static int fib6_walk(struct fib6_walker_t *w);
 static int fib6_walk_continue(struct fib6_walker_t *w);
 
@@ -195,14 +193,14 @@ static void fib6_link_table(struct net *net, struct fib6_table *tb)
 
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
 
-static struct fib6_table *fib6_alloc_table(u32 id)
+static struct fib6_table *fib6_alloc_table(struct net *net, u32 id)
 {
        struct fib6_table *table;
 
        table = kzalloc(sizeof(*table), GFP_ATOMIC);
        if (table != NULL) {
                table->tb6_id = id;
-               table->tb6_root.leaf = &ip6_null_entry;
+               table->tb6_root.leaf = net->ipv6.ip6_null_entry;
                table->tb6_root.fn_flags = RTN_ROOT | RTN_TL_ROOT | RTN_RTINFO;
        }
 
@@ -219,7 +217,7 @@ struct fib6_table *fib6_new_table(struct net *net, u32 id)
        if (tb)
                return tb;
 
-       tb = fib6_alloc_table(id);
+       tb = fib6_alloc_table(net, id);
        if (tb != NULL)
                fib6_link_table(net, tb);
 
@@ -269,7 +267,7 @@ struct fib6_table *fib6_get_table(struct net *net, u32 id)
 struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi *fl,
                                   int flags, pol_lookup_t lookup)
 {
-       return (struct dst_entry *) lookup(net->ipv6.fib6_main_tbl, fl, flags);
+       return (struct dst_entry *) lookup(net, net->ipv6.fib6_main_tbl, fl, flags);
 }
 
 static void fib6_tables_init(struct net *net)
@@ -348,7 +346,7 @@ end:
 
 static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
 {
-       struct net *net = skb->sk->sk_net;
+       struct net *net = sock_net(skb->sk);
        unsigned int h, s_h;
        unsigned int e = 0, s_e;
        struct rt6_rtnl_dump_arg arg;
@@ -653,10 +651,10 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,
        rt->rt6i_node = fn;
        atomic_inc(&rt->rt6i_ref);
        inet6_rt_notify(RTM_NEWROUTE, rt, info);
-       rt6_stats.fib_rt_entries++;
+       info->nl_net->ipv6.rt6_stats->fib_rt_entries++;
 
        if ((fn->fn_flags & RTN_RTINFO) == 0) {
-               rt6_stats.fib_route_nodes++;
+               info->nl_net->ipv6.rt6_stats->fib_route_nodes++;
                fn->fn_flags |= RTN_RTINFO;
        }
 
@@ -719,8 +717,8 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info)
                        if (sfn == NULL)
                                goto st_failure;
 
-                       sfn->leaf = &ip6_null_entry;
-                       atomic_inc(&ip6_null_entry.rt6i_ref);
+                       sfn->leaf = info->nl_net->ipv6.ip6_null_entry;
+                       atomic_inc(&info->nl_net->ipv6.ip6_null_entry->rt6i_ref);
                        sfn->fn_flags = RTN_ROOT;
                        sfn->fn_sernum = fib6_new_sernum();
 
@@ -775,11 +773,11 @@ out:
                 * super-tree leaf node we have to find a new one for it.
                 */
                if (pn != fn && !pn->leaf && !(pn->fn_flags & RTN_RTINFO)) {
-                       pn->leaf = fib6_find_prefix(pn);
+                       pn->leaf = fib6_find_prefix(info->nl_net, pn);
 #if RT6_DEBUG >= 2
                        if (!pn->leaf) {
                                BUG_TRAP(pn->leaf != NULL);
-                               pn->leaf = &ip6_null_entry;
+                               pn->leaf = info->nl_net->ipv6.ip6_null_entry;
                        }
 #endif
                        atomic_inc(&pn->leaf->rt6i_ref);
@@ -795,7 +793,7 @@ out:
         */
 st_failure:
        if (fn && !(fn->fn_flags & (RTN_RTINFO|RTN_ROOT)))
-               fib6_repair_tree(fn);
+               fib6_repair_tree(info->nl_net, fn);
        dst_free(&rt->u.dst);
        return err;
 #endif
@@ -961,10 +959,10 @@ struct fib6_node * fib6_locate(struct fib6_node *root,
  *
  */
 
-static struct rt6_info * fib6_find_prefix(struct fib6_node *fn)
+static struct rt6_info *fib6_find_prefix(struct net *net, struct fib6_node *fn)
 {
        if (fn->fn_flags&RTN_ROOT)
-               return &ip6_null_entry;
+               return net->ipv6.ip6_null_entry;
 
        while(fn) {
                if(fn->left)
@@ -983,7 +981,8 @@ static struct rt6_info * fib6_find_prefix(struct fib6_node *fn)
  *     is the node we want to try and remove.
  */
 
-static struct fib6_node * fib6_repair_tree(struct fib6_node *fn)
+static struct fib6_node *fib6_repair_tree(struct net *net,
+                                          struct fib6_node *fn)
 {
        int children;
        int nstate;
@@ -1010,11 +1009,11 @@ static struct fib6_node * fib6_repair_tree(struct fib6_node *fn)
                    || (children && fn->fn_flags&RTN_ROOT)
 #endif
                    ) {
-                       fn->leaf = fib6_find_prefix(fn);
+                       fn->leaf = fib6_find_prefix(net, fn);
 #if RT6_DEBUG >= 2
                        if (fn->leaf==NULL) {
                                BUG_TRAP(fn->leaf);
-                               fn->leaf = &ip6_null_entry;
+                               fn->leaf = net->ipv6.ip6_null_entry;
                        }
 #endif
                        atomic_inc(&fn->leaf->rt6i_ref);
@@ -1087,14 +1086,15 @@ static void fib6_del_route(struct fib6_node *fn, struct rt6_info **rtp,
 {
        struct fib6_walker_t *w;
        struct rt6_info *rt = *rtp;
+       struct net *net = info->nl_net;
 
        RT6_TRACE("fib6_del_route\n");
 
        /* Unlink it */
        *rtp = rt->u.dst.rt6_next;
        rt->rt6i_node = NULL;
-       rt6_stats.fib_rt_entries--;
-       rt6_stats.fib_discarded_routes++;
+       net->ipv6.rt6_stats->fib_rt_entries--;
+       net->ipv6.rt6_stats->fib_discarded_routes++;
 
        /* Reset round-robin state, if necessary */
        if (fn->rr_ptr == rt)
@@ -1117,8 +1117,8 @@ static void fib6_del_route(struct fib6_node *fn, struct rt6_info **rtp,
        /* If it was last route, expunge its radix tree node */
        if (fn->leaf == NULL) {
                fn->fn_flags &= ~RTN_RTINFO;
-               rt6_stats.fib_route_nodes--;
-               fn = fib6_repair_tree(fn);
+               net->ipv6.rt6_stats->fib_route_nodes--;
+               fn = fib6_repair_tree(net, fn);
        }
 
        if (atomic_read(&rt->rt6i_ref) != 1) {
@@ -1130,7 +1130,7 @@ static void fib6_del_route(struct fib6_node *fn, struct rt6_info **rtp,
                 */
                while (fn) {
                        if (!(fn->fn_flags&RTN_RTINFO) && fn->leaf == rt) {
-                               fn->leaf = fib6_find_prefix(fn);
+                               fn->leaf = fib6_find_prefix(net, fn);
                                atomic_inc(&fn->leaf->rt6i_ref);
                                rt6_release(rt);
                        }
@@ -1146,6 +1146,7 @@ static void fib6_del_route(struct fib6_node *fn, struct rt6_info **rtp,
 
 int fib6_del(struct rt6_info *rt, struct nl_info *info)
 {
+       struct net *net = info->nl_net;
        struct fib6_node *fn = rt->rt6i_node;
        struct rt6_info **rtp;
 
@@ -1155,7 +1156,7 @@ int fib6_del(struct rt6_info *rt, struct nl_info *info)
                return -ENOENT;
        }
 #endif
-       if (fn == NULL || rt == &ip6_null_entry)
+       if (fn == NULL || rt == net->ipv6.ip6_null_entry)
                return -ENOENT;
 
        BUG_TRAP(fn->fn_flags&RTN_RTINFO);
@@ -1486,11 +1487,15 @@ static int fib6_net_init(struct net *net)
        setup_timer(timer, fib6_gc_timer_cb, (unsigned long)net);
        net->ipv6.ip6_fib_timer = timer;
 
+       net->ipv6.rt6_stats = kzalloc(sizeof(*net->ipv6.rt6_stats), GFP_KERNEL);
+       if (!net->ipv6.rt6_stats)
+               goto out_timer;
+
        net->ipv6.fib_table_hash =
                kzalloc(sizeof(*net->ipv6.fib_table_hash)*FIB_TABLE_HASHSZ,
                        GFP_KERNEL);
        if (!net->ipv6.fib_table_hash)
-               goto out_timer;
+               goto out_rt6_stats;
 
        net->ipv6.fib6_main_tbl = kzalloc(sizeof(*net->ipv6.fib6_main_tbl),
                                          GFP_KERNEL);
@@ -1498,7 +1503,7 @@ static int fib6_net_init(struct net *net)
                goto out_fib_table_hash;
 
        net->ipv6.fib6_main_tbl->tb6_id = RT6_TABLE_MAIN;
-       net->ipv6.fib6_main_tbl->tb6_root.leaf = &ip6_null_entry;
+       net->ipv6.fib6_main_tbl->tb6_root.leaf = net->ipv6.ip6_null_entry;
        net->ipv6.fib6_main_tbl->tb6_root.fn_flags =
                RTN_ROOT | RTN_TL_ROOT | RTN_RTINFO;
 
@@ -1508,7 +1513,7 @@ static int fib6_net_init(struct net *net)
        if (!net->ipv6.fib6_local_tbl)
                goto out_fib6_main_tbl;
        net->ipv6.fib6_local_tbl->tb6_id = RT6_TABLE_LOCAL;
-       net->ipv6.fib6_local_tbl->tb6_root.leaf = &ip6_null_entry;
+       net->ipv6.fib6_local_tbl->tb6_root.leaf = net->ipv6.ip6_null_entry;
        net->ipv6.fib6_local_tbl->tb6_root.fn_flags =
                RTN_ROOT | RTN_TL_ROOT | RTN_RTINFO;
 #endif
@@ -1524,6 +1529,8 @@ out_fib6_main_tbl:
 #endif
 out_fib_table_hash:
        kfree(net->ipv6.fib_table_hash);
+out_rt6_stats:
+       kfree(net->ipv6.rt6_stats);
 out_timer:
        kfree(timer);
        goto out;
@@ -1531,6 +1538,7 @@ out_timer:
 
 static void fib6_net_exit(struct net *net)
 {
+       rt6_ifdown(net, NULL);
        del_timer(net->ipv6.ip6_fib_timer);
        kfree(net->ipv6.ip6_fib_timer);
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -1538,6 +1546,7 @@ static void fib6_net_exit(struct net *net)
 #endif
        kfree(net->ipv6.fib6_main_tbl);
        kfree(net->ipv6.fib_table_hash);
+       kfree(net->ipv6.rt6_stats);
 }
 
 static struct pernet_operations fib6_net_ops = {