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

Merge branch 'remove-clear_sk' 



Eric Dumazet says:

====================
net: remove clear_sk() method

Since IPv6 socket lookups no longer dereference pinet6 pointer
and UDP lost SLAB_DESTROY_BY_RCU special rules, we no longer
need special clear_sk() methods.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5d77dca8 ba2489b0

include/net/sock.h

+0 −3
Original line number Diff line number Diff line
@@ -1020,7 +1020,6 @@ struct proto { 
	void			(*unhash)(struct sock *sk);

	void			(*rehash)(struct sock *sk);

	int			(*get_port)(struct sock *sk, unsigned short snum);

	void			(*clear_sk)(struct sock *sk, int size);



	/* Keeping track of sockets in use */

#ifdef CONFIG_PROC_FS
@@ -1242,8 +1241,6 @@ static inline int __sk_prot_rehash(struct sock *sk) 
	return sk->sk_prot->hash(sk);

}



void sk_prot_clear_portaddr_nulls(struct sock *sk, int size);



/* About 10 seconds */

#define SOCK_DESTROY_TIME (10*HZ)

net/core/sock.c

+2 −24
Original line number Diff line number Diff line
@@ -1315,24 +1315,6 @@ static void sock_copy(struct sock *nsk, const struct sock *osk) 
#endif

}



void sk_prot_clear_portaddr_nulls(struct sock *sk, int size)

{

	unsigned long nulls1, nulls2;



	nulls1 = offsetof(struct sock, __sk_common.skc_node.next);

	nulls2 = offsetof(struct sock, __sk_common.skc_portaddr_node.next);

	if (nulls1 > nulls2)

		swap(nulls1, nulls2);



	if (nulls1 != 0)

		memset((char *)sk, 0, nulls1);

	memset((char *)sk + nulls1 + sizeof(void *), 0,

	       nulls2 - nulls1 - sizeof(void *));

	memset((char *)sk + nulls2 + sizeof(void *), 0,

	       size - nulls2 - sizeof(void *));

}

EXPORT_SYMBOL(sk_prot_clear_portaddr_nulls);



static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority,

		int family)

{
@@ -1344,12 +1326,8 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority, 
		sk = kmem_cache_alloc(slab, priority & ~__GFP_ZERO);

		if (!sk)

			return sk;

		if (priority & __GFP_ZERO) {

			if (prot->clear_sk)

				prot->clear_sk(sk, prot->obj_size);

			else

		if (priority & __GFP_ZERO)

			sk_prot_clear_nulls(sk, prot->obj_size);

		}

	} else

		sk = kmalloc(prot->obj_size, priority);

net/ipv4/udp.c

+0 −1
Original line number Diff line number Diff line
@@ -2237,7 +2237,6 @@ struct proto udp_prot = { 
	.compat_setsockopt = compat_udp_setsockopt,

	.compat_getsockopt = compat_udp_getsockopt,

#endif

	.clear_sk	   = sk_prot_clear_portaddr_nulls,

	.diag_destroy	   = udp_abort,

};

EXPORT_SYMBOL(udp_prot);

net/ipv4/udplite.c

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ struct proto udplite_prot = { 
	.compat_setsockopt = compat_udp_setsockopt,

	.compat_getsockopt = compat_udp_getsockopt,

#endif

	.clear_sk	   = sk_prot_clear_portaddr_nulls,

};

EXPORT_SYMBOL(udplite_prot);

net/ipv6/tcp_ipv6.c

+0 −12
Original line number Diff line number Diff line
@@ -1862,17 +1862,6 @@ void tcp6_proc_exit(struct net *net) 
}

#endif



static void tcp_v6_clear_sk(struct sock *sk, int size)

{

	struct inet_sock *inet = inet_sk(sk);



	/* we do not want to clear pinet6 field, because of RCU lookups */

	sk_prot_clear_nulls(sk, offsetof(struct inet_sock, pinet6));



	size -= offsetof(struct inet_sock, pinet6) + sizeof(inet->pinet6);

	memset(&inet->pinet6 + 1, 0, size);

}



struct proto tcpv6_prot = {

	.name			= "TCPv6",

	.owner			= THIS_MODULE,
@@ -1914,7 +1903,6 @@ struct proto tcpv6_prot = { 
	.compat_setsockopt	= compat_tcp_setsockopt,

	.compat_getsockopt	= compat_tcp_getsockopt,

#endif

	.clear_sk		= tcp_v6_clear_sk,

	.diag_destroy		= tcp_abort,

};