mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
tcp: Namespace-ify sysctl_tcp_pacing_ca_ratio
Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
23a7102a2d
commit
c26e91f8b9
5 changed files with 12 additions and 14 deletions
|
@ -153,6 +153,7 @@ struct netns_ipv4 {
|
|||
int sysctl_tcp_autocorking;
|
||||
int sysctl_tcp_invalid_ratelimit;
|
||||
int sysctl_tcp_pacing_ss_ratio;
|
||||
int sysctl_tcp_pacing_ca_ratio;
|
||||
struct inet_timewait_death_row tcp_death_row;
|
||||
int sysctl_max_syn_backlog;
|
||||
int sysctl_tcp_fastopen;
|
||||
|
|
|
@ -250,8 +250,6 @@ extern int sysctl_tcp_rmem[3];
|
|||
|
||||
#define TCP_RACK_LOSS_DETECTION 0x1 /* Use RACK to detect losses */
|
||||
|
||||
extern int sysctl_tcp_pacing_ca_ratio;
|
||||
|
||||
extern atomic_long_t tcp_memory_allocated;
|
||||
extern struct percpu_counter tcp_sockets_allocated;
|
||||
extern unsigned long tcp_memory_pressure;
|
||||
|
|
|
@ -492,15 +492,6 @@ static struct ctl_table ipv4_table[] = {
|
|||
.mode = 0644,
|
||||
.proc_handler = proc_allowed_congestion_control,
|
||||
},
|
||||
{
|
||||
.procname = "tcp_pacing_ca_ratio",
|
||||
.data = &sysctl_tcp_pacing_ca_ratio,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.extra1 = &zero,
|
||||
.extra2 = &thousand,
|
||||
},
|
||||
{
|
||||
.procname = "tcp_available_ulp",
|
||||
.maxlen = TCP_ULP_BUF_MAX,
|
||||
|
@ -1145,6 +1136,15 @@ static struct ctl_table ipv4_net_table[] = {
|
|||
.extra1 = &zero,
|
||||
.extra2 = &thousand,
|
||||
},
|
||||
{
|
||||
.procname = "tcp_pacing_ca_ratio",
|
||||
.data = &init_net.ipv4.sysctl_tcp_pacing_ca_ratio,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_minmax,
|
||||
.extra1 = &zero,
|
||||
.extra2 = &thousand,
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
|
|
|
@ -767,8 +767,6 @@ static void tcp_rtt_estimator(struct sock *sk, long mrtt_us)
|
|||
tp->srtt_us = max(1U, srtt);
|
||||
}
|
||||
|
||||
int sysctl_tcp_pacing_ca_ratio __read_mostly = 120;
|
||||
|
||||
static void tcp_update_pacing_rate(struct sock *sk)
|
||||
{
|
||||
const struct tcp_sock *tp = tcp_sk(sk);
|
||||
|
@ -788,7 +786,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
|
|||
if (tp->snd_cwnd < tp->snd_ssthresh / 2)
|
||||
rate *= sock_net(sk)->ipv4.sysctl_tcp_pacing_ss_ratio;
|
||||
else
|
||||
rate *= sysctl_tcp_pacing_ca_ratio;
|
||||
rate *= sock_net(sk)->ipv4.sysctl_tcp_pacing_ca_ratio;
|
||||
|
||||
rate *= max(tp->snd_cwnd, tp->packets_out);
|
||||
|
||||
|
|
|
@ -2508,6 +2508,7 @@ static int __net_init tcp_sk_init(struct net *net)
|
|||
net->ipv4.sysctl_tcp_autocorking = 1;
|
||||
net->ipv4.sysctl_tcp_invalid_ratelimit = HZ/2;
|
||||
net->ipv4.sysctl_tcp_pacing_ss_ratio = 200;
|
||||
net->ipv4.sysctl_tcp_pacing_ca_ratio = 120;
|
||||
|
||||
net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;
|
||||
spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);
|
||||
|
|
Loading…
Reference in a new issue