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

Commit b27aeadb authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

netns xfrm: per-netns sysctls 



Make
	net.core.xfrm_aevent_etime
	net.core.xfrm_acq_expires
	net.core.xfrm_aevent_rseqth
	net.core.xfrm_larval_drop

sysctls per-netns.

For that make net_core_path[] global, register it to prevent two
/proc/net/core antries and change initcall position -- xfrm_init() is called
from fs_initcall, so this one should be fs_initcall at least.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c68cd1a0

include/net/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ extern void inet_get_local_port_range(int *low, int *high); 
extern int sysctl_ip_default_ttl;

extern int sysctl_ip_nonlocal_bind;



extern struct ctl_path net_core_path[];

extern struct ctl_path net_ipv4_ctl_path[];



/* From inetpeer.c */

include/net/netns/xfrm.h

+10 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#include <linux/workqueue.h>

#include <linux/xfrm.h>



struct ctl_table_header;



struct xfrm_policy_hash {

	struct hlist_head	*table;

	unsigned int		hmask;
@@ -41,6 +43,14 @@ struct netns_xfrm { 
	struct work_struct	policy_hash_work;



	struct sock		*nlsk;



	u32			sysctl_aevent_etime;

	u32			sysctl_aevent_rseqth;

	int			sysctl_larval_drop;

	u32			sysctl_acq_expires;

#ifdef CONFIG_SYSCTL

	struct ctl_table_header	*sysctl_hdr;

#endif

};



#endif

include/net/xfrm.h

+9 −5
Original line number Diff line number Diff line
@@ -47,11 +47,6 @@ 
#define XFRM_INC_STATS_USER(net, field)	((void)(net))

#endif



extern u32 sysctl_xfrm_aevent_etime;

extern u32 sysctl_xfrm_aevent_rseqth;

extern int sysctl_xfrm_larval_drop;

extern u32 sysctl_xfrm_acq_expires;



extern struct mutex xfrm_cfg_mutex;



/* Organization of SPD aka "XFRM rules"
@@ -1310,6 +1305,15 @@ extern int xfrm_proc_init(struct net *net); 
extern void xfrm_proc_fini(struct net *net);

#endif



extern int xfrm_sysctl_init(struct net *net);

#ifdef CONFIG_SYSCTL

extern void xfrm_sysctl_fini(struct net *net);

#else

static inline void xfrm_sysctl_fini(struct net *net)

{

}

#endif



extern void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto);

extern int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,

			   int (*func)(struct xfrm_state *, int, void*), void *);

net/core/sysctl_net_core.c

+5 −37
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/netdevice.h>

#include <linux/init.h>

#include <net/sock.h>

#include <net/xfrm.h>



static struct ctl_table net_core_table[] = {

#ifdef CONFIG_NET
@@ -89,40 +88,6 @@ static struct ctl_table net_core_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

#ifdef CONFIG_XFRM

	{

		.ctl_name	= NET_CORE_AEVENT_ETIME,

		.procname	= "xfrm_aevent_etime",

		.data		= &sysctl_xfrm_aevent_etime,

		.maxlen		= sizeof(u32),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.ctl_name	= NET_CORE_AEVENT_RSEQTH,

		.procname	= "xfrm_aevent_rseqth",

		.data		= &sysctl_xfrm_aevent_rseqth,

		.maxlen		= sizeof(u32),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "xfrm_larval_drop",

		.data		= &sysctl_xfrm_larval_drop,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "xfrm_acq_expires",

		.data		= &sysctl_xfrm_acq_expires,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

#endif /* CONFIG_XFRM */

#endif /* CONFIG_NET */

	{

		.ctl_name	= NET_CORE_BUDGET,
@@ -155,7 +120,7 @@ static struct ctl_table netns_core_table[] = { 
	{ .ctl_name = 0 }

};



static __net_initdata struct ctl_path net_core_path[] = {

__net_initdata struct ctl_path net_core_path[] = {

	{ .procname = "net", .ctl_name = CTL_NET, },

	{ .procname = "core", .ctl_name = NET_CORE, },

	{ },
@@ -207,8 +172,11 @@ static __net_initdata struct pernet_operations sysctl_core_ops = { 


static __init int sysctl_core_init(void)

{

	static struct ctl_table empty[1];



	register_sysctl_paths(net_core_path, empty);

	register_net_sysctl_rotable(net_core_path, net_core_table);

	return register_pernet_subsys(&sysctl_core_ops);

}



__initcall(sysctl_core_init);
 
fs_initcall(sysctl_core_init);

net/xfrm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
#



obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_hash.o \

		      xfrm_input.o xfrm_output.o xfrm_algo.o

		      xfrm_input.o xfrm_output.o xfrm_algo.o \

		      xfrm_sysctl.o

obj-$(CONFIG_XFRM_STATISTICS) += xfrm_proc.o

obj-$(CONFIG_XFRM_USER) += xfrm_user.o

obj-$(CONFIG_XFRM_IPCOMP) += xfrm_ipcomp.o