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: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
c68cd1a01b
commit
b27aeadb59
85
net/xfrm/xfrm_sysctl.c
Normal file
85
net/xfrm/xfrm_sysctl.c
Normal file
@@ -0,0 +1,85 @@
|
||||
#include <linux/sysctl.h>
|
||||
#include <net/net_namespace.h>
|
||||
#include <net/xfrm.h>
|
||||
|
||||
static void __xfrm_sysctl_init(struct net *net)
|
||||
{
|
||||
net->xfrm.sysctl_aevent_etime = XFRM_AE_ETIME;
|
||||
net->xfrm.sysctl_aevent_rseqth = XFRM_AE_SEQT_SIZE;
|
||||
net->xfrm.sysctl_larval_drop = 1;
|
||||
net->xfrm.sysctl_acq_expires = 30;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SYSCTL
|
||||
static struct ctl_table xfrm_table[] = {
|
||||
{
|
||||
.ctl_name = NET_CORE_AEVENT_ETIME,
|
||||
.procname = "xfrm_aevent_etime",
|
||||
.maxlen = sizeof(u32),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{
|
||||
.ctl_name = NET_CORE_AEVENT_RSEQTH,
|
||||
.procname = "xfrm_aevent_rseqth",
|
||||
.maxlen = sizeof(u32),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{
|
||||
.ctl_name = CTL_UNNUMBERED,
|
||||
.procname = "xfrm_larval_drop",
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{
|
||||
.ctl_name = CTL_UNNUMBERED,
|
||||
.procname = "xfrm_acq_expires",
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = proc_dointvec
|
||||
},
|
||||
{}
|
||||
};
|
||||
|
||||
int __net_init xfrm_sysctl_init(struct net *net)
|
||||
{
|
||||
struct ctl_table *table;
|
||||
|
||||
__xfrm_sysctl_init(net);
|
||||
|
||||
table = kmemdup(xfrm_table, sizeof(xfrm_table), GFP_KERNEL);
|
||||
if (!table)
|
||||
goto out_kmemdup;
|
||||
table[0].data = &net->xfrm.sysctl_aevent_etime;
|
||||
table[1].data = &net->xfrm.sysctl_aevent_rseqth;
|
||||
table[2].data = &net->xfrm.sysctl_larval_drop;
|
||||
table[3].data = &net->xfrm.sysctl_acq_expires;
|
||||
|
||||
net->xfrm.sysctl_hdr = register_net_sysctl_table(net, net_core_path, table);
|
||||
if (!net->xfrm.sysctl_hdr)
|
||||
goto out_register;
|
||||
return 0;
|
||||
|
||||
out_register:
|
||||
kfree(table);
|
||||
out_kmemdup:
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
void xfrm_sysctl_fini(struct net *net)
|
||||
{
|
||||
struct ctl_table *table;
|
||||
|
||||
table = net->xfrm.sysctl_hdr->ctl_table_arg;
|
||||
unregister_net_sysctl_table(net->xfrm.sysctl_hdr);
|
||||
kfree(table);
|
||||
}
|
||||
#else
|
||||
int __net_init xfrm_sysctl_init(struct net *net)
|
||||
{
|
||||
__xfrm_sysctl_init(net);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
Reference in New Issue
Block a user