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

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

Merge branch 'ns-tcp-sysctls' 



Nikolay Borisov says:

====================
Namespaceify more of the tcp sysctl knobs

This patch series continues making more of the tcp-related
sysctl knobs be per net-namespace. Most of these apply per
socket and have global defaults so should be safe and I
don't expect any breakages.

Having those per net-namespace is useful when multiple
containers are hosted and it is required to tune the
tcp settings for each independently of the host node.

I've split the patches to be per-sysctl but after
the review if the outcome is positive I'm happy
to either send it in one big blob or just.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9d1eb21b 4979f2d9

include/net/netns/ipv4.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -98,6 +98,16 @@ struct netns_ipv4 { 
	int sysctl_tcp_keepalive_probes;

	int sysctl_tcp_keepalive_probes;

	int sysctl_tcp_keepalive_intvl;

	int sysctl_tcp_keepalive_intvl;





	int sysctl_tcp_syn_retries;

	int sysctl_tcp_synack_retries;

	int sysctl_tcp_syncookies;

	int sysctl_tcp_reordering;

	int sysctl_tcp_retries1;

	int sysctl_tcp_retries2;

	int sysctl_tcp_orphan_retries;

	int sysctl_tcp_fin_timeout;

	unsigned int sysctl_tcp_notsent_lowat;



	struct ping_group_range ping_group_range;

	struct ping_group_range ping_group_range;





	atomic_t dev_addr_genid;

	atomic_t dev_addr_genid;

include/net/tcp.h

+6 −11
Original line number Original line Diff line number Diff line
@@ -239,13 +239,6 @@ extern struct inet_timewait_death_row tcp_death_row; 
extern int sysctl_tcp_timestamps;

extern int sysctl_tcp_timestamps;

extern int sysctl_tcp_window_scaling;

extern int sysctl_tcp_window_scaling;

extern int sysctl_tcp_sack;

extern int sysctl_tcp_sack;

extern int sysctl_tcp_fin_timeout;

extern int sysctl_tcp_syn_retries;

extern int sysctl_tcp_synack_retries;

extern int sysctl_tcp_retries1;

extern int sysctl_tcp_retries2;

extern int sysctl_tcp_orphan_retries;

extern int sysctl_tcp_syncookies;

extern int sysctl_tcp_fastopen;

extern int sysctl_tcp_fastopen;

extern int sysctl_tcp_retrans_collapse;

extern int sysctl_tcp_retrans_collapse;

extern int sysctl_tcp_stdurg;

extern int sysctl_tcp_stdurg;
@@ -274,7 +267,6 @@ extern int sysctl_tcp_thin_dupack; 
extern int sysctl_tcp_early_retrans;

extern int sysctl_tcp_early_retrans;

extern int sysctl_tcp_limit_output_bytes;

extern int sysctl_tcp_limit_output_bytes;

extern int sysctl_tcp_challenge_ack_limit;

extern int sysctl_tcp_challenge_ack_limit;

extern unsigned int sysctl_tcp_notsent_lowat;

extern int sysctl_tcp_min_tso_segs;

extern int sysctl_tcp_min_tso_segs;

extern int sysctl_tcp_min_rtt_wlen;

extern int sysctl_tcp_min_rtt_wlen;

extern int sysctl_tcp_autocorking;

extern int sysctl_tcp_autocorking;
@@ -964,9 +956,11 @@ static inline void tcp_enable_fack(struct tcp_sock *tp) 
 */

 */

static inline void tcp_enable_early_retrans(struct tcp_sock *tp)

static inline void tcp_enable_early_retrans(struct tcp_sock *tp)

{

{

	struct net *net = sock_net((struct sock *)tp);



	tp->do_early_retrans = sysctl_tcp_early_retrans &&

	tp->do_early_retrans = sysctl_tcp_early_retrans &&

		sysctl_tcp_early_retrans < 4 && !sysctl_tcp_thin_dupack &&

		sysctl_tcp_early_retrans < 4 && !sysctl_tcp_thin_dupack &&

		sysctl_tcp_reordering == 3;

		net->ipv4.sysctl_tcp_reordering == 3;

}

}





static inline void tcp_disable_early_retrans(struct tcp_sock *tp)

static inline void tcp_disable_early_retrans(struct tcp_sock *tp)
@@ -1253,7 +1247,7 @@ static inline u32 keepalive_time_elapsed(const struct tcp_sock *tp) 




static inline int tcp_fin_time(const struct sock *sk)

static inline int tcp_fin_time(const struct sock *sk)

{

{

	int fin_timeout = tcp_sk(sk)->linger2 ? : sysctl_tcp_fin_timeout;

	int fin_timeout = tcp_sk(sk)->linger2 ? : sock_net(sk)->ipv4.sysctl_tcp_fin_timeout;

	const int rto = inet_csk(sk)->icsk_rto;

	const int rto = inet_csk(sk)->icsk_rto;





	if (fin_timeout < (rto << 2) - (rto >> 1))

	if (fin_timeout < (rto << 2) - (rto >> 1))
@@ -1687,7 +1681,8 @@ void __tcp_v4_send_check(struct sk_buff *skb, __be32 saddr, __be32 daddr); 




static inline u32 tcp_notsent_lowat(const struct tcp_sock *tp)

static inline u32 tcp_notsent_lowat(const struct tcp_sock *tp)

{

{

	return tp->notsent_lowat ?: sysctl_tcp_notsent_lowat;

	struct net *net = sock_net((struct sock *)tp);

	return tp->notsent_lowat ?: net->ipv4.sysctl_tcp_notsent_lowat;

}

}





static inline bool tcp_stream_memory_free(const struct sock *sk)

static inline bool tcp_stream_memory_free(const struct sock *sk)

net/ipv4/inet_connection_sock.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -482,10 +482,6 @@ EXPORT_SYMBOL_GPL(inet_csk_route_child_sock); 
#define AF_INET_FAMILY(fam) true

#define AF_INET_FAMILY(fam) true

#endif

#endif





/* Only thing we need from tcp.h */

extern int sysctl_tcp_synack_retries;





/* Decide when to expire the request and when to resend SYN-ACK */

/* Decide when to expire the request and when to resend SYN-ACK */

static inline void syn_ack_recalc(struct request_sock *req, const int thresh,

static inline void syn_ack_recalc(struct request_sock *req, const int thresh,

				  const int max_retries,

				  const int max_retries,
@@ -557,6 +553,7 @@ static void reqsk_timer_handler(unsigned long data) 
{

{

	struct request_sock *req = (struct request_sock *)data;

	struct request_sock *req = (struct request_sock *)data;

	struct sock *sk_listener = req->rsk_listener;

	struct sock *sk_listener = req->rsk_listener;

	struct net *net = sock_net(sk_listener);

	struct inet_connection_sock *icsk = inet_csk(sk_listener);

	struct inet_connection_sock *icsk = inet_csk(sk_listener);

	struct request_sock_queue *queue = &icsk->icsk_accept_queue;

	struct request_sock_queue *queue = &icsk->icsk_accept_queue;

	int qlen, expire = 0, resend = 0;

	int qlen, expire = 0, resend = 0;
@@ -566,7 +563,7 @@ static void reqsk_timer_handler(unsigned long data) 
	if (sk_state_load(sk_listener) != TCP_LISTEN)

	if (sk_state_load(sk_listener) != TCP_LISTEN)

		goto drop;

		goto drop;





	max_retries = icsk->icsk_syn_retries ? : sysctl_tcp_synack_retries;

	max_retries = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_synack_retries;

	thresh = max_retries;

	thresh = max_retries;

	/* Normally all the openreqs are young and become mature

	/* Normally all the openreqs are young and become mature

	 * (i.e. converted to established socket) for first timeout.

	 * (i.e. converted to established socket) for first timeout.

net/ipv4/syncookies.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include <net/tcp.h>

#include <net/tcp.h>

#include <net/route.h>

#include <net/route.h>





extern int sysctl_tcp_syncookies;



static u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS] __read_mostly;

static u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS] __read_mostly;





#define COOKIEBITS 24	/* Upper bits store count */

#define COOKIEBITS 24	/* Upper bits store count */
@@ -307,7 +305,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) 
	__u8 rcv_wscale;

	__u8 rcv_wscale;

	struct flowi4 fl4;

	struct flowi4 fl4;





	if (!sysctl_tcp_syncookies || !th->ack || th->rst)

	if (!sock_net(sk)->ipv4.sysctl_tcp_syncookies || !th->ack || th->rst)

		goto out;

		goto out;





	if (tcp_synq_no_recent_overflow(sk))

	if (tcp_synq_no_recent_overflow(sk))

net/ipv4/sysctl_net_ipv4.c

+68 −68
Original line number Original line Diff line number Diff line
@@ -291,22 +291,6 @@ static struct ctl_table ipv4_table[] = { 
		.extra1		= &ip_ttl_min,

		.extra1		= &ip_ttl_min,

		.extra2		= &ip_ttl_max,

		.extra2		= &ip_ttl_max,

	},

	},

	{

		.procname	= "tcp_syn_retries",

		.data		= &sysctl_tcp_syn_retries,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &tcp_syn_retries_min,

		.extra2		= &tcp_syn_retries_max

	},

	{

		.procname	= "tcp_synack_retries",

		.data		= &sysctl_tcp_synack_retries,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

	{

		.procname	= "tcp_max_orphans",

		.procname	= "tcp_max_orphans",

		.data		= &sysctl_tcp_max_orphans,

		.data		= &sysctl_tcp_max_orphans,
@@ -335,37 +319,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.mode		= 0644,

		.proc_handler	= proc_dointvec

		.proc_handler	= proc_dointvec

	},

	},

	{

		.procname	= "tcp_retries1",

		.data		= &sysctl_tcp_retries1,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra2		= &tcp_retr1_max

	},

	{

		.procname	= "tcp_retries2",

		.data		= &sysctl_tcp_retries2,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_fin_timeout",

		.data		= &sysctl_tcp_fin_timeout,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

	},

#ifdef CONFIG_SYN_COOKIES

	{

		.procname	= "tcp_syncookies",

		.data		= &sysctl_tcp_syncookies,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

#endif

	{

	{

		.procname	= "tcp_fastopen",

		.procname	= "tcp_fastopen",

		.data		= &sysctl_tcp_fastopen,

		.data		= &sysctl_tcp_fastopen,
@@ -459,13 +412,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

		.proc_handler	= proc_dointvec_jiffies,

	},

	},

	{

		.procname	= "tcp_orphan_retries",

		.data		= &sysctl_tcp_orphan_retries,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

	{

		.procname	= "tcp_fack",

		.procname	= "tcp_fack",

		.data		= &sysctl_tcp_fack,

		.data		= &sysctl_tcp_fack,
@@ -480,13 +426,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.proc_handler	= proc_dointvec,

	},

	},

	{

		.procname	= "tcp_reordering",

		.data		= &sysctl_tcp_reordering,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

	{

		.procname	= "tcp_max_reordering",

		.procname	= "tcp_max_reordering",

		.data		= &sysctl_tcp_max_reordering,

		.data		= &sysctl_tcp_max_reordering,
@@ -516,13 +455,6 @@ static struct ctl_table ipv4_table[] = { 
		.proc_handler	= proc_dointvec_minmax,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &one,

		.extra1		= &one,

	},

	},

	{

		.procname	= "tcp_notsent_lowat",

		.data		= &sysctl_tcp_notsent_lowat,

		.maxlen		= sizeof(sysctl_tcp_notsent_lowat),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

	{

		.procname	= "tcp_rmem",

		.procname	= "tcp_rmem",

		.data		= &sysctl_tcp_rmem,

		.data		= &sysctl_tcp_rmem,
@@ -960,6 +892,74 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

		.proc_handler	= proc_dointvec_jiffies,

	},

	},

	{

		.procname	= "tcp_syn_retries",

		.data		= &init_net.ipv4.sysctl_tcp_syn_retries,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &tcp_syn_retries_min,

		.extra2		= &tcp_syn_retries_max

	},

	{

		.procname	= "tcp_synack_retries",

		.data		= &init_net.ipv4.sysctl_tcp_synack_retries,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

#ifdef CONFIG_SYN_COOKIES

	{

		.procname	= "tcp_syncookies",

		.data		= &init_net.ipv4.sysctl_tcp_syncookies,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

#endif

	{

		.procname	= "tcp_reordering",

		.data		= &init_net.ipv4.sysctl_tcp_reordering,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_retries1",

		.data		= &init_net.ipv4.sysctl_tcp_retries1,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra2		= &tcp_retr1_max

	},

	{

		.procname	= "tcp_retries2",

		.data		= &init_net.ipv4.sysctl_tcp_retries2,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_orphan_retries",

		.data		= &init_net.ipv4.sysctl_tcp_orphan_retries,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_fin_timeout",

		.data		= &init_net.ipv4.sysctl_tcp_fin_timeout,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

	},

	{

		.procname	= "tcp_notsent_lowat",

		.data		= &init_net.ipv4.sysctl_tcp_notsent_lowat,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{ }

	{ }

};

};