xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: Namespace-ify sysctl_tcp_min_tso_segs

Browse Source 
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
2017-10-27 07:47:27 -07:00
committed by David S. Miller
parent b530b68148
commit 26e9596e5b
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/netns/ipv4.h
View File

@@ -148,6 +148,7 @@ struct netns_ipv4 {
int sysctl_tcp_workaround_signed_windows; int sysctl_tcp_workaround_signed_windows;
int sysctl_tcp_limit_output_bytes; int sysctl_tcp_limit_output_bytes;
int sysctl_tcp_challenge_ack_limit; int sysctl_tcp_challenge_ack_limit;
int sysctl_tcp_min_tso_segs;
struct inet_timewait_death_row tcp_death_row; struct inet_timewait_death_row tcp_death_row;
int sysctl_max_syn_backlog; int sysctl_max_syn_backlog;
int sysctl_tcp_fastopen; int sysctl_tcp_fastopen;

1
include/net/tcp.h
View File

@@ -250,7 +250,6 @@ extern int sysctl_tcp_rmem[3];
#define TCP_RACK_LOSS_DETECTION 0x1 /* Use RACK to detect losses */ #define TCP_RACK_LOSS_DETECTION 0x1 /* Use RACK to detect losses */
extern int sysctl_tcp_min_tso_segs;
extern int sysctl_tcp_min_rtt_wlen; extern int sysctl_tcp_min_rtt_wlen;
extern int sysctl_tcp_autocorking; extern int sysctl_tcp_autocorking;
extern int sysctl_tcp_invalid_ratelimit; extern int sysctl_tcp_invalid_ratelimit;

18
net/ipv4/sysctl_net_ipv4.c
View File

@@ -499,15 +499,6 @@ static struct ctl_table ipv4_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = proc_allowed_congestion_control, .proc_handler = proc_allowed_congestion_control,
}, },
{
.procname = "tcp_min_tso_segs",
.data = &sysctl_tcp_min_tso_segs,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = &one,
.extra2 = &gso_max_segs,
},
{ {
.procname = "tcp_pacing_ss_ratio", .procname = "tcp_pacing_ss_ratio",
.data = &sysctl_tcp_pacing_ss_ratio, .data = &sysctl_tcp_pacing_ss_ratio,
@@ -1145,6 +1136,15 @@ static struct ctl_table ipv4_net_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec .proc_handler = proc_dointvec
}, },
{
.procname = "tcp_min_tso_segs",
.data = &init_net.ipv4.sysctl_tcp_min_tso_segs,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = &one,
.extra2 = &gso_max_segs,
},
{ } { }
}; };

2
net/ipv4/tcp.c
View File

@@ -285,8 +285,6 @@
#include <trace/events/tcp.h> #include <trace/events/tcp.h>
int sysctl_tcp_min_tso_segs __read_mostly = 2;
int sysctl_tcp_autocorking __read_mostly = 1; int sysctl_tcp_autocorking __read_mostly = 1;
struct percpu_counter tcp_orphan_count; struct percpu_counter tcp_orphan_count;

1
net/ipv4/tcp_ipv4.c
View File

@@ -2503,6 +2503,7 @@ static int __net_init tcp_sk_init(struct net *net)
net->ipv4.sysctl_tcp_limit_output_bytes = 262144; net->ipv4.sysctl_tcp_limit_output_bytes = 262144;
/* rfc5961 challenge ack rate limiting */ /* rfc5961 challenge ack rate limiting */
net->ipv4.sysctl_tcp_challenge_ack_limit = 1000; net->ipv4.sysctl_tcp_challenge_ack_limit = 1000;
net->ipv4.sysctl_tcp_min_tso_segs = 2;
net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE; net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;
spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock); spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);

3
net/ipv4/tcp_output.c
View File

@@ -1758,7 +1758,8 @@ static u32 tcp_tso_segs(struct sock *sk, unsigned int mss_now)
u32 tso_segs = ca_ops->tso_segs_goal ? ca_ops->tso_segs_goal(sk) : 0; u32 tso_segs = ca_ops->tso_segs_goal ? ca_ops->tso_segs_goal(sk) : 0;
return tso_segs ? : return tso_segs ? :
tcp_tso_autosize(sk, mss_now, sysctl_tcp_min_tso_segs); tcp_tso_autosize(sk, mss_now,
sock_net(sk)->ipv4.sysctl_tcp_min_tso_segs);
} }
/* Returns the portion of skb which can be sent right away */ /* Returns the portion of skb which can be sent right away */