lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netns: make rt_secret_rebuild timer per namespace

Browse Source 
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev
2008-07-05 19:02:59 -07:00
committed by David S. Miller
parent 39a23e7508
commit 9f5e97e536
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,5 +46,7 @@ struct netns_ipv4 {
int sysctl_icmp_ratelimit; int sysctl_icmp_ratelimit;
int sysctl_icmp_ratemask; int sysctl_icmp_ratemask;
int sysctl_icmp_errors_use_inbound_ifaddr; int sysctl_icmp_errors_use_inbound_ifaddr;
struct timer_list rt_secret_timer;
}; };
#endif #endif

40
net/ipv4/route.c
View File

@@ -132,7 +132,6 @@ static int ip_rt_secret_interval __read_mostly = 10 * 60 * HZ;
static void rt_worker_func(struct work_struct *work); static void rt_worker_func(struct work_struct *work);
static DECLARE_DELAYED_WORK(expires_work, rt_worker_func); static DECLARE_DELAYED_WORK(expires_work, rt_worker_func);
static struct timer_list rt_secret_timer;
/* /*
* Interface to generic destination cache. * Interface to generic destination cache.
@@ -801,10 +800,11 @@ void rt_cache_flush(struct net *net, int delay)
/* /*
* We change rt_genid and let gc do the cleanup * We change rt_genid and let gc do the cleanup
*/ */
static void rt_secret_rebuild(unsigned long dummy) static void rt_secret_rebuild(unsigned long __net)
{ {
struct net *net = (struct net *)__net;
rt_cache_invalidate(); rt_cache_invalidate();
mod_timer(&rt_secret_timer, jiffies + ip_rt_secret_interval); mod_timer(&net->ipv4.rt_secret_timer, jiffies + ip_rt_secret_interval);
} }
/* /*
@@ -3072,6 +3072,31 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
}; };
#endif #endif
static __net_init int rt_secret_timer_init(struct net *net)
{
net->ipv4.rt_secret_timer.function = rt_secret_rebuild;
net->ipv4.rt_secret_timer.data = (unsigned long)net;
init_timer_deferrable(&net->ipv4.rt_secret_timer);
net->ipv4.rt_secret_timer.expires =
jiffies + net_random() % ip_rt_secret_interval +
ip_rt_secret_interval;
add_timer(&net->ipv4.rt_secret_timer);
return 0;
}
static __net_exit void rt_secret_timer_exit(struct net *net)
{
del_timer_sync(&net->ipv4.rt_secret_timer);
}
static __net_initdata struct pernet_operations rt_secret_timer_ops = {
.init = rt_secret_timer_init,
.exit = rt_secret_timer_exit,
};
#ifdef CONFIG_NET_CLS_ROUTE #ifdef CONFIG_NET_CLS_ROUTE
struct ip_rt_acct *ip_rt_acct __read_mostly; struct ip_rt_acct *ip_rt_acct __read_mostly;
#endif /* CONFIG_NET_CLS_ROUTE */ #endif /* CONFIG_NET_CLS_ROUTE */
@@ -3124,19 +3149,14 @@ int __init ip_rt_init(void)
devinet_init(); devinet_init();
ip_fib_init(); ip_fib_init();
rt_secret_timer.function = rt_secret_rebuild;
rt_secret_timer.data = 0;
init_timer_deferrable(&rt_secret_timer);
/* All the timers, started at system startup tend /* All the timers, started at system startup tend
to synchronize. Perturb it a bit. to synchronize. Perturb it a bit.
*/ */
schedule_delayed_work(&expires_work, schedule_delayed_work(&expires_work,
net_random() % ip_rt_gc_interval + ip_rt_gc_interval); net_random() % ip_rt_gc_interval + ip_rt_gc_interval);
rt_secret_timer.expires = jiffies + net_random() % ip_rt_secret_interval + if (register_pernet_subsys(&rt_secret_timer_ops))
ip_rt_secret_interval; printk(KERN_ERR "Unable to setup rt_secret_timer\n");
add_timer(&rt_secret_timer);
if (ip_rt_proc_init()) if (ip_rt_proc_init())
printk(KERN_ERR "Unable to create route proc files\n"); printk(KERN_ERR "Unable to create route proc files\n");