ipv6: icmp: use percpu allocation

Use percpu allocation for the ipv6.icmp_sk.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index ef1ed529f33c34e17942f999fd177dd7ee0d6a83..b028a1dc150ddde3e3535351748cef72af56c1ce 100644 (file)
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -83,7 +83,7 @@ struct netns_ipv6 {
        struct fib6_table       *fib6_local_tbl;
        struct fib_rules_ops    *fib6_rules_ops;
 #endif
-       struct sock             **icmp_sk;
+       struct sock * __percpu  *icmp_sk;
        struct sock             *ndisc_sk;
        struct sock             *tcp_sk;
        struct sock             *igmp_sk;

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index af520014def5754fd63bbc0e5fafe3291555f2b3..802faa2fcc0ed10435d08db62b6f3ca3922ac1b2 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -81,7 +81,7 @@
  */
 static inline struct sock *icmpv6_sk(struct net *net)
 {
-       return net->ipv6.icmp_sk[smp_processor_id()];
+       return *this_cpu_ptr(net->ipv6.icmp_sk);
 }
 
 static int icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
@@ -958,8 +958,8 @@ static void __net_exit icmpv6_sk_exit(struct net *net)
        int i;
 
        for_each_possible_cpu(i)
-               inet_ctl_sock_destroy(net->ipv6.icmp_sk[i]);
-       kfree(net->ipv6.icmp_sk);
+               inet_ctl_sock_destroy(*per_cpu_ptr(net->ipv6.icmp_sk, i));
+       free_percpu(net->ipv6.icmp_sk);
 }
 
 static int __net_init icmpv6_sk_init(struct net *net)
@@ -967,8 +967,7 @@ static int __net_init icmpv6_sk_init(struct net *net)
        struct sock *sk;
        int err, i;
 
-       net->ipv6.icmp_sk =
-               kcalloc(nr_cpu_ids, sizeof(struct sock *), GFP_KERNEL);
+       net->ipv6.icmp_sk = alloc_percpu(struct sock *);
        if (!net->ipv6.icmp_sk)
                return -ENOMEM;
 
@@ -981,7 +980,7 @@ static int __net_init icmpv6_sk_init(struct net *net)
                        goto fail;
                }
 
-               net->ipv6.icmp_sk[i] = sk;
+               *per_cpu_ptr(net->ipv6.icmp_sk, i) = sk;
 
                /* Enough space for 2 64K ICMP packets, including
                 * sk_buff struct overhead.