Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d8354d2 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NETNS][FRAGS]: Move ctl tables around. 



This is a preparation for sysctl netns-ization.
Move the ctl tables to the files, where the tuning
variables reside. Plus make the helpers to register
the tables.

This will simplify the later patches and will keep
similar things closer to each other.

ipv4, ipv6 and conntrack_reasm are patched differently,
but the result is all the tables are in appropriate files.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d5c8243

include/net/ip.h

+0 −5
Original line number Diff line number Diff line
@@ -179,11 +179,6 @@ extern int sysctl_ip_nonlocal_bind; 


extern struct ctl_path net_ipv4_ctl_path[];



/* From ip_fragment.c */

struct inet_frags_ctl;

extern struct inet_frags_ctl ip4_frags_ctl;

extern int sysctl_ipfrag_max_dist;



/* From inetpeer.c */

extern int inet_peer_threshold;

extern int inet_peer_minttl;

include/net/ipv6.h

+0 −1
Original line number Diff line number Diff line
@@ -587,7 +587,6 @@ extern int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf, 


#ifdef CONFIG_PROC_FS

extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);

extern void ipv6_frag_sysctl_init(struct net *net);

extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);



extern int  ac6_proc_init(void);

include/net/netfilter/ipv6/nf_conntrack_ipv6.h

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ extern void nf_ct_frag6_output(unsigned int hooknum, struct sk_buff *skb, 
			       int (*okfn)(struct sk_buff *));



struct inet_frags_ctl;

extern struct inet_frags_ctl nf_frags_ctl;



#include <linux/sysctl.h>

extern struct ctl_table nf_ct_ipv6_sysctl_table[];



#endif /* _NF_CONNTRACK_IPV6_H*/

net/ipv4/ip_fragment.c

+72 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
 * as well. Or notify me, at least. --ANK

 */



int sysctl_ipfrag_max_dist __read_mostly = 64;

static int sysctl_ipfrag_max_dist __read_mostly = 64;



struct ipfrag_skb_cb

{
@@ -74,7 +74,7 @@ struct ipq { 
	struct inet_peer *peer;

};



struct inet_frags_ctl ip4_frags_ctl __read_mostly = {

static struct inet_frags_ctl ip4_frags_ctl __read_mostly = {

	/*

	 * Fragment cache limits. We will commit 256K at one time. Should we

	 * cross that limit we will prune down to 192K. This should cope with
@@ -607,8 +607,78 @@ int ip_defrag(struct sk_buff *skb, u32 user) 
	return -ENOMEM;

}



#ifdef CONFIG_SYSCTL

static int zero;



static struct ctl_table ip4_frags_ctl_table[] = {

	{

		.ctl_name	= NET_IPV4_IPFRAG_HIGH_THRESH,

		.procname	= "ipfrag_high_thresh",

		.data		= &ip4_frags_ctl.high_thresh,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= NET_IPV4_IPFRAG_LOW_THRESH,

		.procname	= "ipfrag_low_thresh",

		.data		= &ip4_frags_ctl.low_thresh,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= NET_IPV4_IPFRAG_TIME,

		.procname	= "ipfrag_time",

		.data		= &ip4_frags_ctl.timeout,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_jiffies,

		.strategy	= &sysctl_jiffies

	},

	{

		.ctl_name	= NET_IPV4_IPFRAG_SECRET_INTERVAL,

		.procname	= "ipfrag_secret_interval",

		.data		= &ip4_frags_ctl.secret_interval,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_jiffies,

		.strategy	= &sysctl_jiffies

	},

	{

		.procname	= "ipfrag_max_dist",

		.data		= &sysctl_ipfrag_max_dist,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.extra1		= &zero

	},

	{ }

};



static int ip4_frags_ctl_register(struct net *net)

{

	struct ctl_table_header *hdr;



	hdr = register_net_sysctl_table(net, net_ipv4_ctl_path,

			ip4_frags_ctl_table);

	return hdr == NULL ? -ENOMEM : 0;

}

#else

static inline int ip4_frags_ctl_register(struct net *net)

{

	return 0;

}

#endif



static int ipv4_frags_init_net(struct net *net)

{

	return ip4_frags_ctl_register(net);

}



void __init ipfrag_init(void)

{

	ipv4_frags_init_net(&init_net);

	ip4_frags.ctl = &ip4_frags_ctl;

	ip4_frags.hashfn = ip4_hashfn;

	ip4_frags.constructor = ip4_frag_init;

net/ipv4/sysctl_net_ipv4.c

+0 −42
Original line number Diff line number Diff line
@@ -283,22 +283,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= NET_IPV4_IPFRAG_HIGH_THRESH,

		.procname	= "ipfrag_high_thresh",

		.data		= &ip4_frags_ctl.high_thresh,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= NET_IPV4_IPFRAG_LOW_THRESH,

		.procname	= "ipfrag_low_thresh",

		.data		= &ip4_frags_ctl.low_thresh,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= NET_IPV4_DYNADDR,

		.procname	= "ip_dynaddr",
@@ -307,15 +291,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= NET_IPV4_IPFRAG_TIME,

		.procname	= "ipfrag_time",

		.data		= &ip4_frags_ctl.timeout,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_jiffies,

		.strategy	= &sysctl_jiffies

	},

	{

		.ctl_name	= NET_IPV4_TCP_KEEPALIVE_TIME,

		.procname	= "tcp_keepalive_time",
@@ -658,23 +633,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.proc_handler	= &proc_dointvec

	},

	{

		.ctl_name	= NET_IPV4_IPFRAG_SECRET_INTERVAL,

		.procname	= "ipfrag_secret_interval",

		.data		= &ip4_frags_ctl.secret_interval,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_jiffies,

		.strategy	= &sysctl_jiffies

	},

	{

		.procname	= "ipfrag_max_dist",

		.data		= &sysctl_ipfrag_max_dist,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec_minmax,

		.extra1		= &zero

	},

	{

		.ctl_name	= NET_TCP_NO_METRICS_SAVE,

		.procname	= "tcp_no_metrics_save",