Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4fd5da3 authored by Pavel Emelianov's avatar Pavel Emelianov Committed by David S. Miller
Browse files

[TCP]: Consolidate checking for tcp orphan count being too big. 



tcp_out_of_resources() and tcp_close() perform the
same checking of number of orphan sockets. Move this
code into common place.

Signed-off-by: default avatarPavel Emelianov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e07a91c

include/net/tcp.h

+6 −0
Original line number Diff line number Diff line
@@ -254,6 +254,12 @@ static inline int between(__u32 seq1, __u32 seq2, __u32 seq3) 
	return seq3 - seq2 >= seq1 - seq2;

}



static inline int tcp_too_many_orphans(struct sock *sk, int num)

{

	return (num > sysctl_tcp_max_orphans) ||

		(sk->sk_wmem_queued > SOCK_MIN_SNDBUF &&

		 atomic_read(&tcp_memory_allocated) > sysctl_tcp_mem[2]);

}



extern struct proto tcp_prot;

net/ipv4/tcp.c

+2 −3
Original line number Diff line number Diff line
@@ -1674,9 +1674,8 @@ void tcp_close(struct sock *sk, long timeout) 
	}

	if (sk->sk_state != TCP_CLOSE) {

		sk_stream_mem_reclaim(sk);

		if (atomic_read(sk->sk_prot->orphan_count) > sysctl_tcp_max_orphans ||

		    (sk->sk_wmem_queued > SOCK_MIN_SNDBUF &&

		     atomic_read(&tcp_memory_allocated) > sysctl_tcp_mem[2])) {

		if (tcp_too_many_orphans(sk,

				atomic_read(sk->sk_prot->orphan_count))) {

			if (net_ratelimit())

				printk(KERN_INFO "TCP: too many of orphaned "

				       "sockets\n");

net/ipv4/tcp_timer.c

+1 −3
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ static int tcp_out_of_resources(struct sock *sk, int do_reset) 
	if (sk->sk_err_soft)

		orphans <<= 1;



	if (orphans >= sysctl_tcp_max_orphans ||

	    (sk->sk_wmem_queued > SOCK_MIN_SNDBUF &&

	     atomic_read(&tcp_memory_allocated) > sysctl_tcp_mem[2])) {

	if (tcp_too_many_orphans(sk, orphans)) {

		if (net_ratelimit())

			printk(KERN_INFO "Out of socket memory\n");