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

[NETNS][IPV6] ip6_fib - add net to gc timer parameter

Browse Source 
The fib tables are now relative to the network namespace. When the
garbage collector timer expires, we must have a network namespace
parameter in order to retrieve the tables. For now this is the
init_net, but we should be able to have a timer per namespace and use
the timer callback parameter to pass the network namespace from the
expired timer.

The timer callback, fib6_run_gc, is actually used to be called
synchronously by some functions and asynchronously when the timer
expires.

When the timer expires, the delay specified for fib6_run_gc parameter
is always zero. So, I changed fib6_run_gc to not be a timer callback
but a function called by the timer callback and I added a timer
callback where its work is just to retrieve from the data arg of the
timer the network namespace and call fib6_run_gc with zero expiring
time and the network namespace parameters. That makes the code cleaner
for the fib6_run_gc callers.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Lezcano
2008-03-03 23:28:58 -08:00
committed by David S. Miller
parent f3db48517f
commit 5b7c931dff
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
net/ipv6/ip6_fib.c
View File

@@ -93,7 +93,10 @@ static int fib6_walk_continue(struct fib6_walker_t *w);
static __u32 rt_sernum;
static DEFINE_TIMER(ip6_fib_timer, fib6_run_gc, 0, 0);
static void fib6_gc_timer_cb(unsigned long arg);
static DEFINE_TIMER(ip6_fib_timer, fib6_gc_timer_cb, 0,
(unsigned long)&init_net);
static struct fib6_walker_t fib6_walker_list = {
.prev = &fib6_walker_list,
@@ -1432,12 +1435,12 @@ static int fib6_age(struct rt6_info *rt, void *arg)
static DEFINE_SPINLOCK(fib6_gc_lock);
void fib6_run_gc(unsigned long dummy)
void fib6_run_gc(unsigned long expires, struct net *net)
{
if (dummy != ~0UL) {
if (expires != ~0UL) {
spin_lock_bh(&fib6_gc_lock);
gc_args.timeout = dummy ? (int)dummy :
init_net.ipv6.sysctl.ip6_rt_gc_interval;
gc_args.timeout = expires ? (int)expires :
net->ipv6.sysctl.ip6_rt_gc_interval;
} else {
local_bh_disable();
if (!spin_trylock(&fib6_gc_lock)) {
@@ -1445,17 +1448,17 @@ void fib6_run_gc(unsigned long dummy)
local_bh_enable();
return;
}
gc_args.timeout = init_net.ipv6.sysctl.ip6_rt_gc_interval;
gc_args.timeout = net->ipv6.sysctl.ip6_rt_gc_interval;
}
gc_args.more = 0;
icmp6_dst_gc(&gc_args.more);
fib6_clean_all(&init_net, fib6_age, 0, NULL);
fib6_clean_all(net, fib6_age, 0, NULL);
if (gc_args.more)
mod_timer(&ip6_fib_timer, jiffies +
init_net.ipv6.sysctl.ip6_rt_gc_interval);
net->ipv6.sysctl.ip6_rt_gc_interval);
else {
del_timer(&ip6_fib_timer);
ip6_fib_timer.expires = 0;
@@ -1463,6 +1466,11 @@ void fib6_run_gc(unsigned long dummy)
spin_unlock_bh(&fib6_gc_lock);
}
static void fib6_gc_timer_cb(unsigned long arg)
{
fib6_run_gc(0, (struct net *)arg);
}
static int fib6_net_init(struct net *net)
{
int ret;