UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

tcp: Namespace-ify sysctl_tcp_nometrics_save 

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:21 -07:00 committed by David S. Miller
parent 267146d447
commit ec36e416f0
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,7 @@ struct netns_ipv4 {
int sysctl_tcp_app_win; int sysctl_tcp_app_win;
int sysctl_tcp_adv_win_scale; int sysctl_tcp_adv_win_scale;
int sysctl_tcp_frto; int sysctl_tcp_frto;
int sysctl_tcp_nometrics_save;
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

@ -247,7 +247,6 @@ extern int sysctl_tcp_max_orphans;
extern long sysctl_tcp_mem[3]; extern long sysctl_tcp_mem[3];
extern int sysctl_tcp_wmem[3]; extern int sysctl_tcp_wmem[3];
extern int sysctl_tcp_rmem[3]; extern int sysctl_tcp_rmem[3];
extern int sysctl_tcp_nometrics_save;
extern int sysctl_tcp_moderate_rcvbuf; extern int sysctl_tcp_moderate_rcvbuf;
extern int sysctl_tcp_tso_win_divisor; extern int sysctl_tcp_tso_win_divisor;
extern int sysctl_tcp_workaround_signed_windows; extern int sysctl_tcp_workaround_signed_windows;

14
net/ipv4/sysctl_net_ipv4.c
View File

@ -451,13 +451,6 @@ static struct ctl_table ipv4_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec .proc_handler = proc_dointvec
}, },
{
.procname = "tcp_no_metrics_save",
.data = &sysctl_tcp_nometrics_save,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
{ {
.procname = "tcp_moderate_rcvbuf", .procname = "tcp_moderate_rcvbuf",
.data = &sysctl_tcp_moderate_rcvbuf, .data = &sysctl_tcp_moderate_rcvbuf,
@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec .proc_handler = proc_dointvec
}, },
{
.procname = "tcp_no_metrics_save",
.data = &init_net.ipv4.sysctl_tcp_nometrics_save,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec,
},
{ } { }
}; };

4
net/ipv4/tcp_metrics.c
View File

@ -20,8 +20,6 @@
#include <net/tcp.h> #include <net/tcp.h>
#include <net/genetlink.h> #include <net/genetlink.h>
int sysctl_tcp_nometrics_save __read_mostly;
static struct tcp_metrics_block *__tcp_get_metrics(const struct inetpeer_addr *saddr, static struct tcp_metrics_block *__tcp_get_metrics(const struct inetpeer_addr *saddr,
const struct inetpeer_addr *daddr, const struct inetpeer_addr *daddr,
struct net *net, unsigned int hash); struct net *net, unsigned int hash);
@ -330,7 +328,7 @@ void tcp_update_metrics(struct sock *sk)
int m; int m;
sk_dst_confirm(sk); sk_dst_confirm(sk);
if (sysctl_tcp_nometrics_save || !dst) if (net->ipv4.sysctl_tcp_nometrics_save || !dst)
return; return;
rcu_read_lock(); rcu_read_lock();