mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
tcp: Namespace-ify sysctl_tcp_max_reordering
Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
773d4bb96c
commit
c6e2180359
5 changed files with 11 additions and 10 deletions
|
@ -137,6 +137,7 @@ struct netns_ipv4 {
|
|||
int sysctl_tcp_rfc1337;
|
||||
int sysctl_tcp_abort_on_overflow;
|
||||
int sysctl_tcp_fack;
|
||||
int sysctl_tcp_max_reordering;
|
||||
struct inet_timewait_death_row tcp_death_row;
|
||||
int sysctl_max_syn_backlog;
|
||||
int sysctl_tcp_fastopen;
|
||||
|
|
|
@ -244,7 +244,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo);
|
|||
|
||||
/* sysctl variables for tcp */
|
||||
extern int sysctl_tcp_max_orphans;
|
||||
extern int sysctl_tcp_max_reordering;
|
||||
extern int sysctl_tcp_dsack;
|
||||
extern long sysctl_tcp_mem[3];
|
||||
extern int sysctl_tcp_wmem[3];
|
||||
|
|
|
@ -414,13 +414,6 @@ static struct ctl_table ipv4_table[] = {
|
|||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_jiffies,
|
||||
},
|
||||
{
|
||||
.procname = "tcp_max_reordering",
|
||||
.data = &sysctl_tcp_max_reordering,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{
|
||||
.procname = "tcp_dsack",
|
||||
.data = &sysctl_tcp_dsack,
|
||||
|
@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = {
|
|||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{
|
||||
.procname = "tcp_max_reordering",
|
||||
.data = &init_net.ipv4.sysctl_tcp_max_reordering,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
|
|
|
@ -79,7 +79,6 @@
|
|||
#include <linux/unaligned/access_ok.h>
|
||||
#include <linux/static_key.h>
|
||||
|
||||
int sysctl_tcp_max_reordering __read_mostly = 300;
|
||||
int sysctl_tcp_dsack __read_mostly = 1;
|
||||
int sysctl_tcp_app_win __read_mostly = 31;
|
||||
int sysctl_tcp_adv_win_scale __read_mostly = 1;
|
||||
|
@ -889,7 +888,7 @@ static void tcp_update_reordering(struct sock *sk, const int metric,
|
|||
return;
|
||||
|
||||
if (metric > tp->reordering) {
|
||||
tp->reordering = min(sysctl_tcp_max_reordering, metric);
|
||||
tp->reordering = min(sock_net(sk)->ipv4.sysctl_tcp_max_reordering, metric);
|
||||
|
||||
#if FASTRETRANS_DEBUG > 1
|
||||
pr_debug("Disorder%d %d %u f%u s%u rr%d\n",
|
||||
|
|
|
@ -2488,6 +2488,8 @@ static int __net_init tcp_sk_init(struct net *net)
|
|||
net->ipv4.sysctl_tcp_recovery = TCP_RACK_LOSS_DETECTION;
|
||||
net->ipv4.sysctl_tcp_slow_start_after_idle = 1; /* By default, RFC2861 behavior. */
|
||||
net->ipv4.sysctl_tcp_retrans_collapse = 1;
|
||||
net->ipv4.sysctl_tcp_max_reordering = 300;
|
||||
|
||||
net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;
|
||||
spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);
|
||||
net->ipv4.sysctl_tcp_fastopen_blackhole_timeout = 60 * 60;
|
||||
|
|
Loading…
Reference in a new issue