p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Namespaceify mtu_expires sysctl 

This patch enables the sysctl mtu_expires to be configured per net
namespace.

Signed-off-by: xu xin <xu.xin16@zte.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
xu xin 2022-01-04 10:59:47 +00:00 committed by David S. Miller
parent 1de6b15a43
commit 1135fad204
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,7 @@ struct netns_ipv4 {
int sysctl_icmp_ratemask; int sysctl_icmp_ratemask;
u32 ip_rt_min_pmtu; u32 ip_rt_min_pmtu;
int ip_rt_mtu_expires;
struct local_ports ip_local_ports; struct local_ports ip_local_ports;

21
net/ipv4/route.c
View File

@ -111,6 +111,7 @@
#define RT_GC_TIMEOUT (300*HZ) #define RT_GC_TIMEOUT (300*HZ)
#define DEFAULT_MIN_PMTU (512 + 20 + 20) #define DEFAULT_MIN_PMTU (512 + 20 + 20)
#define DEFAULT_MTU_EXPIRES (10 * 60 * HZ)
static int ip_rt_max_size; static int ip_rt_max_size;
static int ip_rt_redirect_number __read_mostly = 9; static int ip_rt_redirect_number __read_mostly = 9;
@ -118,7 +119,6 @@ static int ip_rt_redirect_load __read_mostly = HZ / 50;
static int ip_rt_redirect_silence __read_mostly = ((HZ / 50) << (9 + 1)); static int ip_rt_redirect_silence __read_mostly = ((HZ / 50) << (9 + 1));
static int ip_rt_error_cost __read_mostly = HZ; static int ip_rt_error_cost __read_mostly = HZ;
static int ip_rt_error_burst __read_mostly = 5 * HZ; static int ip_rt_error_burst __read_mostly = 5 * HZ;
static int ip_rt_mtu_expires __read_mostly = 10 * 60 * HZ;
static int ip_rt_min_advmss __read_mostly = 256; static int ip_rt_min_advmss __read_mostly = 256;
static int ip_rt_gc_timeout __read_mostly = RT_GC_TIMEOUT; static int ip_rt_gc_timeout __read_mostly = RT_GC_TIMEOUT;
@ -1025,7 +1025,7 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
} }
if (rt->rt_pmtu == mtu && !lock && if (rt->rt_pmtu == mtu && !lock &&
time_before(jiffies, dst->expires - ip_rt_mtu_expires / 2)) time_before(jiffies, dst->expires - net->ipv4.ip_rt_mtu_expires / 2))
return; return;
rcu_read_lock(); rcu_read_lock();
@ -1035,7 +1035,7 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
fib_select_path(net, &res, fl4, NULL); fib_select_path(net, &res, fl4, NULL);
nhc = FIB_RES_NHC(res); nhc = FIB_RES_NHC(res);
update_or_create_fnhe(nhc, fl4->daddr, 0, mtu, lock, update_or_create_fnhe(nhc, fl4->daddr, 0, mtu, lock,
jiffies + ip_rt_mtu_expires); jiffies + net->ipv4.ip_rt_mtu_expires);
} }
rcu_read_unlock(); rcu_read_unlock();
} }
@ -3535,13 +3535,6 @@ static struct ctl_table ipv4_route_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
{
.procname = "mtu_expires",
.data = &ip_rt_mtu_expires,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
},
{ {
.procname = "min_adv_mss", .procname = "min_adv_mss",
.data = &ip_rt_min_advmss, .data = &ip_rt_min_advmss,
@ -3569,6 +3562,13 @@ static struct ctl_table ipv4_route_netns_table[] = {
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &ip_min_valid_pmtu, .extra1 = &ip_min_valid_pmtu,
}, },
{
.procname = "mtu_expires",
.data = &init_net.ipv4.ip_rt_mtu_expires,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
},
{ }, { },
}; };
@ -3630,6 +3630,7 @@ static __net_init int netns_ip_rt_init(struct net *net)
{ {
/* Set default value for namespaceified sysctls */ /* Set default value for namespaceified sysctls */
net->ipv4.ip_rt_min_pmtu = DEFAULT_MIN_PMTU; net->ipv4.ip_rt_min_pmtu = DEFAULT_MIN_PMTU;
net->ipv4.ip_rt_mtu_expires = DEFAULT_MTU_EXPIRES;
return 0; return 0;
} }