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

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

Merge branch 'tcp-ns-rmem-wmem' 



Eric Dumazet says:

====================
net: Namespace-ify sysctl_tcp_rmem and sysctl_tcp_wmem

We need to get per netns sysctl for sysctl_[proto]_rmem and sysctl_[proto]_wmem

This patch series adds the basic infrastructure allowing per proto
conversion, and takes care of TCP.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2ea7a679 356d1833

include/net/netns/ipv4.h

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ struct netns_ipv4 { 
	int sysctl_tcp_invalid_ratelimit;

	int sysctl_tcp_pacing_ss_ratio;

	int sysctl_tcp_pacing_ca_ratio;

	int sysctl_tcp_wmem[3];

	int sysctl_tcp_rmem[3];

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

	int sysctl_tcp_fastopen;

include/net/sock.h

+22 −0
Original line number Diff line number Diff line
@@ -1101,8 +1101,12 @@ struct proto { 
	 */

	unsigned long		*memory_pressure;

	long			*sysctl_mem;



	int			*sysctl_wmem;

	int			*sysctl_rmem;

	u32			sysctl_wmem_offset;

	u32			sysctl_rmem_offset;



	int			max_header;

	bool			no_autobind;
@@ -2390,4 +2394,22 @@ extern int sysctl_optmem_max; 
extern __u32 sysctl_wmem_default;

extern __u32 sysctl_rmem_default;



static inline int sk_get_wmem0(const struct sock *sk, const struct proto *proto)

{

	/* Does this proto have per netns sysctl_wmem ? */

	if (proto->sysctl_wmem_offset)

		return *(int *)((void *)sock_net(sk) + proto->sysctl_wmem_offset);



	return *proto->sysctl_wmem;

}



static inline int sk_get_rmem0(const struct sock *sk, const struct proto *proto)

{

	/* Does this proto have per netns sysctl_rmem ? */

	if (proto->sysctl_rmem_offset)

		return *(int *)((void *)sock_net(sk) + proto->sysctl_rmem_offset);



	return *proto->sysctl_rmem;

}



#endif	/* _SOCK_H */

include/net/tcp.h

+0 −2
Original line number Diff line number Diff line
@@ -242,8 +242,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo); 
/* sysctl variables for tcp */

extern int sysctl_tcp_max_orphans;

extern long sysctl_tcp_mem[3];

extern int sysctl_tcp_wmem[3];

extern int sysctl_tcp_rmem[3];



#define TCP_RACK_LOSS_DETECTION  0x1 /* Use RACK to detect losses */

#define TCP_RACK_STATIC_REO_WND  0x2 /* Use static RACK reo wnd */

include/trace/events/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ TRACE_EVENT(sock_exceed_buf_limit, 
		strncpy(__entry->name, prot->name, 32);

		__entry->sysctl_mem = prot->sysctl_mem;

		__entry->allocated = allocated;

		__entry->sysctl_rmem = prot->sysctl_rmem[0];

		__entry->sysctl_rmem = sk_get_rmem0(sk, prot);

		__entry->rmem_alloc = atomic_read(&sk->sk_rmem_alloc);

	),

net/core/sock.c

+6 −4
Original line number Diff line number Diff line
@@ -2346,17 +2346,19 @@ int __sk_mem_raise_allocated(struct sock *sk, int size, int amt, int kind) 


	/* guarantee minimum buffer size under pressure */

	if (kind == SK_MEM_RECV) {

		if (atomic_read(&sk->sk_rmem_alloc) < prot->sysctl_rmem[0])

		if (atomic_read(&sk->sk_rmem_alloc) < sk_get_rmem0(sk, prot))

			return 1;



	} else { /* SK_MEM_SEND */

		int wmem0 = sk_get_wmem0(sk, prot);



		if (sk->sk_type == SOCK_STREAM) {

			if (sk->sk_wmem_queued < prot->sysctl_wmem[0])

			if (sk->sk_wmem_queued < wmem0)

				return 1;

		} else if (refcount_read(&sk->sk_wmem_alloc) <

			   prot->sysctl_wmem[0])

		} else if (refcount_read(&sk->sk_wmem_alloc) < wmem0) {

				return 1;

		}

	}



	if (sk_has_memory_pressure(sk)) {

		int alloc;