[IPV6] SYSCTL: complete initialization for sysctl table in subsystem code.

[~andy/linux] / net / ipv6 / icmp.c

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 121d517bf91c9d16467c5aa85df47efdd0b6c58e..12c0b85d6c46142b2d60ab97309623cc9a2de0f9 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -80,8 +80,10 @@ EXPORT_SYMBOL(icmpv6msg_statistics);
  *
  *     On SMP we have one ICMP socket per-cpu.
  */
-static DEFINE_PER_CPU(struct socket *, __icmpv6_socket) = NULL;
-#define icmpv6_socket  __get_cpu_var(__icmpv6_socket)
+static inline struct sock *icmpv6_sk(struct net *net)
+{
+       return net->ipv6.icmp_sk[smp_processor_id()];
+}
 
 static int icmpv6_rcv(struct sk_buff *skb);
 
@@ -90,11 +92,11 @@ static struct inet6_protocol icmpv6_protocol = {
        .flags          =       INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
 };
 
-static __inline__ int icmpv6_xmit_lock(void)
+static __inline__ int icmpv6_xmit_lock(struct sock *sk)
 {
        local_bh_disable();
 
-       if (unlikely(!spin_trylock(&icmpv6_socket->sk->sk_lock.slock))) {
+       if (unlikely(!spin_trylock(&sk->sk_lock.slock))) {
                /* This can happen if the output path (f.e. SIT or
                 * ip6ip6 tunnel) signals dst_link_failure() for an
                 * outgoing ICMP6 packet.
@@ -105,9 +107,9 @@ static __inline__ int icmpv6_xmit_lock(void)
        return 0;
 }
 
-static __inline__ void icmpv6_xmit_unlock(void)
+static __inline__ void icmpv6_xmit_unlock(struct sock *sk)
 {
-       spin_unlock_bh(&icmpv6_socket->sk->sk_lock.slock);
+       spin_unlock_bh(&sk->sk_lock.slock);
 }
 
 /*
@@ -389,12 +391,12 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
        fl.fl_icmp_code = code;
        security_skb_classify_flow(skb, &fl);
 
-       if (icmpv6_xmit_lock())
-               return;
-
-       sk = icmpv6_socket->sk;
+       sk = icmpv6_sk(&init_net);
        np = inet6_sk(sk);
 
+       if (icmpv6_xmit_lock(sk))
+               return;
+
        if (!icmpv6_xrlim_allow(sk, type, &fl))
                goto out;
 
@@ -498,7 +500,7 @@ out_put:
 out_dst_release:
        dst_release(dst);
 out:
-       icmpv6_xmit_unlock();
+       icmpv6_xmit_unlock(sk);
 }
 
 EXPORT_SYMBOL(icmpv6_send);
@@ -535,12 +537,12 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
        fl.fl_icmp_type = ICMPV6_ECHO_REPLY;
        security_skb_classify_flow(skb, &fl);
 
-       if (icmpv6_xmit_lock())
-               return;
-
-       sk = icmpv6_socket->sk;
+       sk = icmpv6_sk(&init_net);
        np = inet6_sk(sk);
 
+       if (icmpv6_xmit_lock(sk))
+               return;
+
        if (!fl.oif && ipv6_addr_is_multicast(&fl.fl6_dst))
                fl.oif = np->mcast_oif;
 
@@ -584,7 +586,7 @@ out_put:
                in6_dev_put(idev);
        dst_release(dst);
 out:
-       icmpv6_xmit_unlock();
+       icmpv6_xmit_unlock(sk);
 }
 
 static void icmpv6_notify(struct sk_buff *skb, int type, int code, __be32 info)
@@ -776,18 +778,24 @@ drop_no_count:
 }
 
 /*
- * Special lock-class for __icmpv6_socket:
+ * Special lock-class for __icmpv6_sk:
  */
 static struct lock_class_key icmpv6_socket_sk_dst_lock_key;
 
-int __init icmpv6_init(struct net_proto_family *ops)
+static int __net_init icmpv6_sk_init(struct net *net)
 {
        struct sock *sk;
        int err, i, j;
 
+       net->ipv6.icmp_sk =
+               kzalloc(nr_cpu_ids * sizeof(struct sock *), GFP_KERNEL);
+       if (net->ipv6.icmp_sk == NULL)
+               return -ENOMEM;
+
        for_each_possible_cpu(i) {
+               struct socket *sock;
                err = sock_create_kern(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6,
-                                      &per_cpu(__icmpv6_socket, i));
+                                      &sock);
                if (err < 0) {
                        printk(KERN_ERR
                               "Failed to initialize the ICMP6 control socket "
@@ -796,12 +804,14 @@ int __init icmpv6_init(struct net_proto_family *ops)
                        goto fail;
                }
 
-               sk = per_cpu(__icmpv6_socket, i)->sk;
+               net->ipv6.icmp_sk[i] = sk = sock->sk;
+               sk_change_net(sk, net);
+
                sk->sk_allocation = GFP_ATOMIC;
                /*
                 * Split off their lock-class, because sk->sk_dst_lock
                 * gets used from softirqs, which is safe for
-                * __icmpv6_socket (because those never get directly used
+                * __icmpv6_sk (because those never get directly used
                 * via userspace syscalls), but unsafe for normal sockets.
                 */
                lockdep_set_class(&sk->sk_dst_lock,
@@ -815,36 +825,56 @@ int __init icmpv6_init(struct net_proto_family *ops)
 
                sk->sk_prot->unhash(sk);
        }
-
-
-       if (inet6_add_protocol(&icmpv6_protocol, IPPROTO_ICMPV6) < 0) {
-               printk(KERN_ERR "Failed to register ICMP6 protocol\n");
-               err = -EAGAIN;
-               goto fail;
-       }
-
        return 0;
 
  fail:
-       for (j = 0; j < i; j++) {
-               if (!cpu_possible(j))
-                       continue;
-               sock_release(per_cpu(__icmpv6_socket, j));
-       }
-
+       for (j = 0; j < i; j++)
+               sk_release_kernel(net->ipv6.icmp_sk[j]);
+       kfree(net->ipv6.icmp_sk);
        return err;
 }
 
-void icmpv6_cleanup(void)
+static void __net_exit icmpv6_sk_exit(struct net *net)
 {
        int i;
 
        for_each_possible_cpu(i) {
-               sock_release(per_cpu(__icmpv6_socket, i));
+               sk_release_kernel(net->ipv6.icmp_sk[i]);
        }
+       kfree(net->ipv6.icmp_sk);
+}
+
+static struct pernet_operations icmpv6_sk_ops = {
+       .init = icmpv6_sk_init,
+       .exit = icmpv6_sk_exit,
+};
+
+int __init icmpv6_init(void)
+{
+       int err;
+
+       err = register_pernet_subsys(&icmpv6_sk_ops);
+       if (err < 0)
+               return err;
+
+       err = -EAGAIN;
+       if (inet6_add_protocol(&icmpv6_protocol, IPPROTO_ICMPV6) < 0)
+               goto fail;
+       return 0;
+
+fail:
+       printk(KERN_ERR "Failed to register ICMP6 protocol\n");
+       unregister_pernet_subsys(&icmpv6_sk_ops);
+       return err;
+}
+
+void icmpv6_cleanup(void)
+{
+       unregister_pernet_subsys(&icmpv6_sk_ops);
        inet6_del_protocol(&icmpv6_protocol, IPPROTO_ICMPV6);
 }
 
+
 static const struct icmp6_err {
        int err;
        int fatal;
@@ -925,6 +955,10 @@ struct ctl_table *ipv6_icmp_sysctl_init(struct net *net)
        table = kmemdup(ipv6_icmp_table_template,
                        sizeof(ipv6_icmp_table_template),
                        GFP_KERNEL);
+
+       if (table)
+               table[0].data = &net->ipv6.sysctl.icmpv6_time;
+
        return table;
 }
 #endif