From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolay Borisov Subject: [PATCH 2/4] inetpeer: Namespacify inet_peer_maxttl sysctl knob Date: Wed, 17 Feb 2016 12:09:56 +0200 Message-ID: <1455703798-15258-3-git-send-email-kernel@kyup.com> References: <1455703798-15258-1-git-send-email-kernel@kyup.com> Cc: netdev@vger.kernel.org, ebiederm@xmission.com To: davem@davemloft.net Return-path: Received: from mail-wm0-f51.google.com ([74.125.82.51]:38045 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933881AbcBQKKF (ORCPT ); Wed, 17 Feb 2016 05:10:05 -0500 Received: by mail-wm0-f51.google.com with SMTP id a4so20294388wme.1 for ; Wed, 17 Feb 2016 02:10:03 -0800 (PST) In-Reply-To: <1455703798-15258-1-git-send-email-kernel@kyup.com> Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Nikolay Borisov --- include/net/ip.h | 1 - include/net/netns/ipv4.h | 2 ++ net/ipv4/inetpeer.c | 2 +- net/ipv4/sysctl_net_ipv4.c | 15 ++++++++------- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/net/ip.h b/include/net/ip.h index cbb134b2f0e4..c33d53176d3c 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -243,7 +243,6 @@ static inline int inet_is_local_reserved_port(struct net *net, int port) /* From inetpeer.c */ extern int inet_peer_threshold; extern int inet_peer_minttl; -extern int inet_peer_maxttl; void ipfrag_init(void); diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index a69cde3ce460..b0623c4e2f0a 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -88,6 +88,8 @@ struct netns_ipv4 { int sysctl_ip_dynaddr; int sysctl_ip_early_demux; + int sysctl_inet_peer_maxttl; + int sysctl_fwmark_reflect; int sysctl_tcp_fwmark_accept; #ifdef CONFIG_NET_L3_MASTER_DEV diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index 86fa45809540..a9245ada56c2 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c @@ -82,7 +82,6 @@ EXPORT_SYMBOL_GPL(inet_peer_base_init); int inet_peer_threshold __read_mostly = 65536 + 128; /* start to throw entries more * aggressively at this stage */ int inet_peer_minttl __read_mostly = 120 * HZ; /* TTL under high load: 120 sec */ -int inet_peer_maxttl __read_mostly = 10 * 60 * HZ; /* usual time to live: 10 min */ static void inetpeer_gc_worker(struct work_struct *work) { @@ -369,6 +368,7 @@ static int inet_peer_gc(struct inet_peer_base *base, struct inet_peer __rcu ***stackptr) { struct inet_peer *p, *gchead = NULL; + int inet_peer_maxttl = base->net->ipv4.sysctl_inet_peer_maxttl; __u32 delta, ttl; int cnt = 0; diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 1e1fe6086dd9..2aaa049cbf9d 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -359,13 +359,6 @@ static struct ctl_table ipv4_table[] = { .proc_handler = proc_dointvec_jiffies, }, { - .procname = "inet_peer_maxttl", - .data = &inet_peer_maxttl, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_jiffies, - }, - { .procname = "tcp_fack", .data = &sysctl_tcp_fack, .maxlen = sizeof(int), @@ -737,6 +730,13 @@ static struct ctl_table ipv4_net_table[] = { .proc_handler = proc_dointvec }, { + .procname = "inet_peer_maxttl", + .data = &init_net.ipv4.sysctl_inet_peer_maxttl, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_jiffies, + }, + { .procname = "ip_early_demux", .data = &init_net.ipv4.sysctl_ip_early_demux, .maxlen = sizeof(int), @@ -991,6 +991,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) net->ipv4.sysctl_ip_default_ttl = IPDEFTTL; net->ipv4.sysctl_ip_dynaddr = 0; net->ipv4.sysctl_ip_early_demux = 1; + net->ipv4.sysctl_inet_peer_maxttl = 10 * 60 * HZ; /* usual time to live: 10 min */ return 0; -- 2.5.0