Commit 2bdeb8e5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ipv4-v6-icmp-small-cleanup-and-update' 



Kefeng Wang says:

====================
ipv4/v6: icmp: small cleanup and update

v2:
- Add cover letter and user proper patch subject-prefix suggested-by Eric Dumazet

This patch series contains some small cleanup and update,
1) use icmp/v6_sk_exit when icmp_sk_init fails instead of open-code
2) use new percpu allocation interface for the ipv6.icmp_sk
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4ef595cb 75efc250

include/net/netns/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv4/icmp.c

+1 −3
Original line number Diff line number Diff line
@@ -1245,9 +1245,7 @@ static int __net_init icmp_sk_init(struct net *net) 
	return 0;



fail:

	for_each_possible_cpu(i)

		inet_ctl_sock_destroy(*per_cpu_ptr(net->ipv4.icmp_sk, i));

	free_percpu(net->ipv4.icmp_sk);

	icmp_sk_exit(net);

	return err;

}

net/ipv6/icmp.c

+14 −18
Original line number Diff line number Diff line
@@ -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,
@@ -953,13 +953,21 @@ void icmpv6_flow_init(struct sock *sk, struct flowi6 *fl6, 
	security_sk_classify_flow(sk, flowi6_to_flowi(fl6));

}



static void __net_exit icmpv6_sk_exit(struct net *net)

{

	int i;



	for_each_possible_cpu(i)

		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)

{

	struct sock *sk;

	int err, i, j;

	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;
@@ -972,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.
@@ -982,22 +990,10 @@ static int __net_init icmpv6_sk_init(struct net *net) 
	return 0;



 fail:

	for (j = 0; j < i; j++)

		inet_ctl_sock_destroy(net->ipv6.icmp_sk[j]);

	kfree(net->ipv6.icmp_sk);

	icmpv6_sk_exit(net);

	return err;

}



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);

}



static struct pernet_operations icmpv6_sk_ops = {

	.init = icmpv6_sk_init,

	.exit = icmpv6_sk_exit,

CRA Git | Maintained and supported by SUSTech CRA and CCSE