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_moderate_rcvbuf
Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ec36e416f0
commit
4540c0cf98
5 changed files with 11 additions and 11 deletions
|
@ -143,6 +143,7 @@ struct netns_ipv4 {
|
|||
int sysctl_tcp_adv_win_scale;
|
||||
int sysctl_tcp_frto;
|
||||
int sysctl_tcp_nometrics_save;
|
||||
int sysctl_tcp_moderate_rcvbuf;
|
||||
struct inet_timewait_death_row tcp_death_row;
|
||||
int sysctl_max_syn_backlog;
|
||||
int sysctl_tcp_fastopen;
|
||||
|
|
|
@ -247,7 +247,6 @@ extern int sysctl_tcp_max_orphans;
|
|||
extern long sysctl_tcp_mem[3];
|
||||
extern int sysctl_tcp_wmem[3];
|
||||
extern int sysctl_tcp_rmem[3];
|
||||
extern int sysctl_tcp_moderate_rcvbuf;
|
||||
extern int sysctl_tcp_tso_win_divisor;
|
||||
extern int sysctl_tcp_workaround_signed_windows;
|
||||
|
||||
|
|
|
@ -451,13 +451,6 @@ static struct ctl_table ipv4_table[] = {
|
|||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{
|
||||
.procname = "tcp_moderate_rcvbuf",
|
||||
.data = &sysctl_tcp_moderate_rcvbuf,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec,
|
||||
},
|
||||
{
|
||||
.procname = "tcp_tso_win_divisor",
|
||||
.data = &sysctl_tcp_tso_win_divisor,
|
||||
|
@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = {
|
|||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec,
|
||||
},
|
||||
{
|
||||
.procname = "tcp_moderate_rcvbuf",
|
||||
.data = &init_net.ipv4.sysctl_tcp_moderate_rcvbuf,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec,
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
|
|
|
@ -84,7 +84,6 @@ int sysctl_tcp_challenge_ack_limit = 1000;
|
|||
|
||||
int sysctl_tcp_max_orphans __read_mostly = NR_FILE;
|
||||
int sysctl_tcp_min_rtt_wlen __read_mostly = 300;
|
||||
int sysctl_tcp_moderate_rcvbuf __read_mostly = 1;
|
||||
int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2;
|
||||
|
||||
#define FLAG_DATA 0x01 /* Incoming frame contained data. */
|
||||
|
@ -411,7 +410,7 @@ static void tcp_fixup_rcvbuf(struct sock *sk)
|
|||
/* Dynamic Right Sizing (DRS) has 2 to 3 RTT latency
|
||||
* Allow enough cushion so that sender is not limited by our window
|
||||
*/
|
||||
if (sysctl_tcp_moderate_rcvbuf)
|
||||
if (sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf)
|
||||
rcvmem <<= 2;
|
||||
|
||||
if (sk->sk_rcvbuf < rcvmem)
|
||||
|
@ -602,7 +601,7 @@ void tcp_rcv_space_adjust(struct sock *sk)
|
|||
* <prev RTT . ><current RTT .. ><next RTT .... >
|
||||
*/
|
||||
|
||||
if (sysctl_tcp_moderate_rcvbuf &&
|
||||
if (sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf &&
|
||||
!(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) {
|
||||
int rcvwin, rcvmem, rcvbuf;
|
||||
|
||||
|
|
|
@ -2493,6 +2493,7 @@ static int __net_init tcp_sk_init(struct net *net)
|
|||
net->ipv4.sysctl_tcp_app_win = 31;
|
||||
net->ipv4.sysctl_tcp_adv_win_scale = 1;
|
||||
net->ipv4.sysctl_tcp_frto = 2;
|
||||
net->ipv4.sysctl_tcp_moderate_rcvbuf = 1;
|
||||
|
||||
net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;
|
||||
spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);
|
||||
|
|
Loading…
Reference in a new issue