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

Commit 7c083ecb authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David S. Miller
Browse files

ipv4: Namespaceify tcp synack retries sysctl knob 



Signed-off-by: default avatarNikolay Borisov <kernel@kyup.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6fa25166

include/net/netns/ipv4.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ struct netns_ipv4 { 
	int sysctl_tcp_keepalive_intvl;

	int sysctl_tcp_keepalive_intvl;





	int sysctl_tcp_syn_retries;

	int sysctl_tcp_syn_retries;

	int sysctl_tcp_synack_retries;





	struct ping_group_range ping_group_range;

	struct ping_group_range ping_group_range;

include/net/tcp.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -240,7 +240,6 @@ 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_fin_timeout;

extern int sysctl_tcp_synack_retries;

extern int sysctl_tcp_retries1;

extern int sysctl_tcp_retries1;

extern int sysctl_tcp_retries2;

extern int sysctl_tcp_retries2;

extern int sysctl_tcp_orphan_retries;

extern int sysctl_tcp_orphan_retries;

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/sysctl_net_ipv4.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -291,13 +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_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,
@@ -960,6 +953,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.extra1		= &tcp_syn_retries_min,

		.extra1		= &tcp_syn_retries_min,

		.extra2		= &tcp_syn_retries_max

		.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

	},

	{ }

	{ }

};

};

net/ipv4/tcp_ipv4.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2389,6 +2389,7 @@ static int __net_init tcp_sk_init(struct net *net) 
	net->ipv4.sysctl_tcp_keepalive_intvl = TCP_KEEPALIVE_INTVL;

	net->ipv4.sysctl_tcp_keepalive_intvl = TCP_KEEPALIVE_INTVL;





	net->ipv4.sysctl_tcp_syn_retries = TCP_SYN_RETRIES;

	net->ipv4.sysctl_tcp_syn_retries = TCP_SYN_RETRIES;

	net->ipv4.sysctl_tcp_synack_retries = TCP_SYNACK_RETRIES;





	return 0;

	return 0;

fail:

fail: