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

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

ipv4: Namespaceify tcp_orphan_retries sysctl knob 



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

include/net/netns/ipv4.h

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

	int sysctl_tcp_retries1;

	int sysctl_tcp_retries2;

	int sysctl_tcp_orphan_retries;



	struct ping_group_range ping_group_range;

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ extern int sysctl_tcp_timestamps; 
extern int sysctl_tcp_window_scaling;

extern int sysctl_tcp_sack;

extern int sysctl_tcp_fin_timeout;

extern int sysctl_tcp_orphan_retries;

extern int sysctl_tcp_fastopen;

extern int sysctl_tcp_retrans_collapse;

extern int sysctl_tcp_stdurg;

net/ipv4/sysctl_net_ipv4.c

+7 −7
Original line number Diff line number Diff line
@@ -419,13 +419,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.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",

		.data		= &sysctl_tcp_fack,
@@ -960,6 +953,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.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

	},

	{ }

};

net/ipv4/tcp_ipv4.c

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

	net->ipv4.sysctl_tcp_retries1 = TCP_RETR1;

	net->ipv4.sysctl_tcp_retries2 = TCP_RETR2;

	net->ipv4.sysctl_tcp_orphan_retries = 0;



	return 0;

fail:

net/ipv4/tcp_timer.c

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/gfp.h>

#include <net/tcp.h>



int sysctl_tcp_orphan_retries __read_mostly;

int sysctl_tcp_thin_linear_timeouts __read_mostly;



static void tcp_write_err(struct sock *sk)
@@ -78,7 +77,7 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset) 
/* Calculate maximal number or retries on an orphaned socket. */

static int tcp_orphan_retries(struct sock *sk, bool alive)

{

	int retries = sysctl_tcp_orphan_retries; /* May be zero. */

	int retries = sock_net(sk)->ipv4.sysctl_tcp_orphan_retries; /* May be zero. */



	/* We know from an ICMP that something is wrong. */

	if (sk->sk_err_soft && !alive)