Commit 1135fad2 authored by xu xin's avatar xu xin Committed by David S. Miller
Browse files

Namespaceify mtu_expires sysctl 



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

Signed-off-by: default avatarxu xin <xu.xin16@zte.com.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1de6b15a

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct netns_ipv4 { 
	int sysctl_icmp_ratemask;



	u32 ip_rt_min_pmtu;

	int ip_rt_mtu_expires;



	struct local_ports ip_local_ports;

net/ipv4/route.c

+11 −10
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 
#define RT_GC_TIMEOUT (300*HZ)



#define DEFAULT_MIN_PMTU (512 + 20 + 20)

#define DEFAULT_MTU_EXPIRES (10 * 60 * HZ)



static int ip_rt_max_size;

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_error_cost __read_mostly	= 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_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 &&

	    time_before(jiffies, dst->expires - ip_rt_mtu_expires / 2))

	    time_before(jiffies, dst->expires - net->ipv4.ip_rt_mtu_expires / 2))

		return;



	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);

		nhc = FIB_RES_NHC(res);

		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();

}
@@ -3535,13 +3535,6 @@ static struct ctl_table ipv4_route_table[] = { 
		.mode		= 0644,

		.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",

		.data		= &ip_rt_min_advmss,
@@ -3569,6 +3562,13 @@ static struct ctl_table ipv4_route_netns_table[] = { 
		.proc_handler   = proc_dointvec_minmax,

		.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 */

	net->ipv4.ip_rt_min_pmtu = DEFAULT_MIN_PMTU;

	net->ipv4.ip_rt_mtu_expires = DEFAULT_MTU_EXPIRES;

	return 0;

}