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_invalid_ratelimit
Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
790f00e19f
commit
4170ba6b58
5 changed files with 10 additions and 10 deletions
|
@ -151,6 +151,7 @@ struct netns_ipv4 {
|
|||
int sysctl_tcp_min_tso_segs;
|
||||
int sysctl_tcp_min_rtt_wlen;
|
||||
int sysctl_tcp_autocorking;
|
||||
int sysctl_tcp_invalid_ratelimit;
|
||||
struct inet_timewait_death_row tcp_death_row;
|
||||
int sysctl_max_syn_backlog;
|
||||
int sysctl_tcp_fastopen;
|
||||
|
|
|
@ -250,7 +250,6 @@ extern int sysctl_tcp_rmem[3];
|
|||
|
||||
#define TCP_RACK_LOSS_DETECTION 0x1 /* Use RACK to detect losses */
|
||||
|
||||
extern int sysctl_tcp_invalid_ratelimit;
|
||||
extern int sysctl_tcp_pacing_ss_ratio;
|
||||
extern int sysctl_tcp_pacing_ca_ratio;
|
||||
|
||||
|
|
|
@ -510,13 +510,6 @@ static struct ctl_table ipv4_table[] = {
|
|||
.extra1 = &zero,
|
||||
.extra2 = &thousand,
|
||||
},
|
||||
{
|
||||
.procname = "tcp_invalid_ratelimit",
|
||||
.data = &sysctl_tcp_invalid_ratelimit,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_ms_jiffies,
|
||||
},
|
||||
{
|
||||
.procname = "tcp_available_ulp",
|
||||
.maxlen = TCP_ULP_BUF_MAX,
|
||||
|
@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = {
|
|||
.extra1 = &zero,
|
||||
.extra2 = &one,
|
||||
},
|
||||
{
|
||||
.procname = "tcp_invalid_ratelimit",
|
||||
.data = &init_net.ipv4.sysctl_tcp_invalid_ratelimit,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec_ms_jiffies,
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
|
|
|
@ -80,7 +80,6 @@
|
|||
#include <linux/static_key.h>
|
||||
|
||||
int sysctl_tcp_max_orphans __read_mostly = NR_FILE;
|
||||
int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2;
|
||||
|
||||
#define FLAG_DATA 0x01 /* Incoming frame contained data. */
|
||||
#define FLAG_WIN_UPDATE 0x02 /* Incoming ACK was a window update. */
|
||||
|
@ -3403,7 +3402,7 @@ static bool __tcp_oow_rate_limited(struct net *net, int mib_idx,
|
|||
if (*last_oow_ack_time) {
|
||||
s32 elapsed = (s32)(tcp_jiffies32 - *last_oow_ack_time);
|
||||
|
||||
if (0 <= elapsed && elapsed < sysctl_tcp_invalid_ratelimit) {
|
||||
if (0 <= elapsed && elapsed < net->ipv4.sysctl_tcp_invalid_ratelimit) {
|
||||
NET_INC_STATS(net, mib_idx);
|
||||
return true; /* rate-limited: don't send yet! */
|
||||
}
|
||||
|
|
|
@ -2506,6 +2506,7 @@ static int __net_init tcp_sk_init(struct net *net)
|
|||
net->ipv4.sysctl_tcp_min_tso_segs = 2;
|
||||
net->ipv4.sysctl_tcp_min_rtt_wlen = 300;
|
||||
net->ipv4.sysctl_tcp_autocorking = 1;
|
||||
net->ipv4.sysctl_tcp_invalid_ratelimit = HZ/2;
|
||||
|
||||
net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;
|
||||
spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);
|
||||
|
|
Loading…
Reference in a new issue