[IPV6]: Simplify IPv6 control sockets creation.

[h-e-n] / net / ipv6 / proc.c

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index be526ad..ca8b82f 100644 (file)
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -27,34 +27,26 @@
 #include <net/ip.h>
 #include <net/sock.h>
 #include <net/tcp.h>
+#include <net/udp.h>
 #include <net/transp_v6.h>
 #include <net/ipv6.h>
 
 static struct proc_dir_entry *proc_net_devsnmp6;
 
-static int fold_prot_inuse(struct proto *proto)
-{
-       int res = 0;
-       int cpu;
-
-       for_each_possible_cpu(cpu)
-               res += proto->stats[cpu].inuse;
-
-       return res;
-}
-
 static int sockstat6_seq_show(struct seq_file *seq, void *v)
 {
+       struct net *net = seq->private;
+
        seq_printf(seq, "TCP6: inuse %d\n",
-                      fold_prot_inuse(&tcpv6_prot));
+                      sock_prot_inuse_get(net, &tcpv6_prot));
        seq_printf(seq, "UDP6: inuse %d\n",
-                      fold_prot_inuse(&udpv6_prot));
+                      sock_prot_inuse_get(net, &udpv6_prot));
        seq_printf(seq, "UDPLITE6: inuse %d\n",
-                       fold_prot_inuse(&udplitev6_prot));
+                       sock_prot_inuse_get(net, &udplitev6_prot));
        seq_printf(seq, "RAW6: inuse %d\n",
-                      fold_prot_inuse(&rawv6_prot));
+                      sock_prot_inuse_get(net, &rawv6_prot));
        seq_printf(seq, "FRAG6: inuse %d memory %d\n",
-                      ip6_frag_nqueues(), ip6_frag_mem());
+                      ip6_frag_nqueues(net), ip6_frag_mem(net));
        return 0;
 }
 
@@ -99,7 +91,7 @@ static char *icmp6type2name[256] = {
        [ICMPV6_PKT_TOOBIG] = "PktTooBigs",
        [ICMPV6_TIME_EXCEED] = "TimeExcds",
        [ICMPV6_PARAMPROB] = "ParmProblems",
-       [ICMPV6_ECHO_REQUEST] = "EchoRequest",
+       [ICMPV6_ECHO_REQUEST] = "Echos",
        [ICMPV6_ECHO_REPLY] = "EchoReplies",
        [ICMPV6_MGM_QUERY] = "GroupMembQueries",
        [ICMPV6_MGM_REPORT] = "GroupMembResponses",
@@ -109,7 +101,7 @@ static char *icmp6type2name[256] = {
        [NDISC_ROUTER_SOLICITATION] = "RouterSolicits",
        [NDISC_NEIGHBOUR_ADVERTISEMENT] = "NeighborAdvertisements",
        [NDISC_NEIGHBOUR_SOLICITATION] = "NeighborSolicits",
-       [NDISC_REDIRECT] = "NeighborRedirects",
+       [NDISC_REDIRECT] = "Redirects",
 };
 
 
@@ -193,7 +185,32 @@ static int snmp6_seq_show(struct seq_file *seq, void *v)
 
 static int sockstat6_seq_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, sockstat6_seq_show, NULL);
+       int err;
+       struct net *net;
+
+       err = -ENXIO;
+       net = get_proc_net(inode);
+       if (net == NULL)
+               goto err_net;
+
+       err = single_open(file, sockstat6_seq_show, net);
+       if (err < 0)
+               goto err_open;
+
+       return 0;
+
+err_open:
+       put_net(net);
+err_net:
+       return err;
+}
+
+static int sockstat6_seq_release(struct inode *inode, struct file *file)
+{
+       struct net *net = ((struct seq_file *)file->private_data)->private;
+
+       put_net(net);
+       return single_release(inode, file);
 }
 
 static const struct file_operations sockstat6_seq_fops = {
@@ -201,7 +218,7 @@ static const struct file_operations sockstat6_seq_fops = {
        .open    = sockstat6_seq_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
-       .release = single_release,
+       .release = sockstat6_seq_release,
 };
 
 static int snmp6_seq_open(struct inode *inode, struct file *file)
@@ -224,15 +241,18 @@ int snmp6_register_dev(struct inet6_dev *idev)
        if (!idev || !idev->dev)
                return -EINVAL;
 
+       if (dev_net(idev->dev) != &init_net)
+               return 0;
+
        if (!proc_net_devsnmp6)
                return -ENOENT;
 
-       p = create_proc_entry(idev->dev->name, S_IRUGO, proc_net_devsnmp6);
+       p = proc_create(idev->dev->name, S_IRUGO,
+                       proc_net_devsnmp6, &snmp6_seq_fops);
        if (!p)
                return -ENOMEM;
 
        p->data = idev;
-       p->proc_fops = &snmp6_seq_fops;
 
        idev->stats.proc_dir_entry = p;
        return 0;
@@ -250,27 +270,45 @@ int snmp6_unregister_dev(struct inet6_dev *idev)
        return 0;
 }
 
+static int ipv6_proc_init_net(struct net *net)
+{
+       if (!proc_net_fops_create(net, "sockstat6", S_IRUGO,
+                       &sockstat6_seq_fops))
+               return -ENOMEM;
+       return 0;
+}
+
+static void ipv6_proc_exit_net(struct net *net)
+{
+       proc_net_remove(net, "sockstat6");
+}
+
+static struct pernet_operations ipv6_proc_ops = {
+       .init = ipv6_proc_init_net,
+       .exit = ipv6_proc_exit_net,
+};
+
 int __init ipv6_misc_proc_init(void)
 {
        int rc = 0;
 
+       if (register_pernet_subsys(&ipv6_proc_ops))
+               goto proc_net_fail;
+
        if (!proc_net_fops_create(&init_net, "snmp6", S_IRUGO, &snmp6_seq_fops))
                goto proc_snmp6_fail;
 
        proc_net_devsnmp6 = proc_mkdir("dev_snmp6", init_net.proc_net);
        if (!proc_net_devsnmp6)
                goto proc_dev_snmp6_fail;
-
-       if (!proc_net_fops_create(&init_net, "sockstat6", S_IRUGO, &sockstat6_seq_fops))
-               goto proc_sockstat6_fail;
 out:
        return rc;
 
-proc_sockstat6_fail:
-       proc_net_remove(&init_net, "dev_snmp6");
 proc_dev_snmp6_fail:
        proc_net_remove(&init_net, "snmp6");
 proc_snmp6_fail:
+       unregister_pernet_subsys(&ipv6_proc_ops);
+proc_net_fail:
        rc = -ENOMEM;
        goto out;
 }
@@ -280,5 +318,6 @@ void ipv6_misc_proc_exit(void)
        proc_net_remove(&init_net, "sockstat6");
        proc_net_remove(&init_net, "dev_snmp6");
        proc_net_remove(&init_net, "snmp6");
+       unregister_pernet_subsys(&ipv6_proc_ops);
 }