Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[NET]: Make netns cleanup to run in a separate queue

Browse source 
This patch adds a separate workqueue for cleaning up a network
namespace. If we use the keventd workqueue to execute cleanup_net(),
there is a problem to unregister devices in IPv6. Indeed the code
that cleans up also schedule work in keventd: as long as cleanup_net()
hasn't return, dst_gc_task() cannot run and as long as dst_gc_task() has
not run, there are still some references pending on the net devices and
cleanup_net() can not unregister and exit the keventd workqueue.

Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Acked-by: Denis V. Lunev <den@openvz.org>
Acked-By: Kirill Korotaev <dev@sw.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Benjamin Thery 2007-11-19 23:18:16 -08:00 committed by David S. Miller
parent 85b606800b
commit 3ef1355dcb
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/core/net_namespace.c
View file

@ -58,6 +58,7 @@ static __net_init int setup_net(struct net *net)
#ifdef CONFIG_NET_NS #ifdef CONFIG_NET_NS
static struct kmem_cache *net_cachep; static struct kmem_cache *net_cachep;
static struct workqueue_struct *netns_wq;
static struct net *net_alloc(void) static struct net *net_alloc(void)
{ {
@ -149,7 +150,7 @@ void __put_net(struct net *net)
{ {
/* Cleanup the network namespace in process context */ /* Cleanup the network namespace in process context */
INIT_WORK(&net->work, cleanup_net); INIT_WORK(&net->work, cleanup_net);
schedule_work(&net->work); queue_work(netns_wq, &net->work);
} }
EXPORT_SYMBOL_GPL(__put_net); EXPORT_SYMBOL_GPL(__put_net);
@ -171,7 +172,13 @@ static int __init net_ns_init(void)
net_cachep = kmem_cache_create("net_namespace", sizeof(struct net), net_cachep = kmem_cache_create("net_namespace", sizeof(struct net),
SMP_CACHE_BYTES, SMP_CACHE_BYTES,
SLAB_PANIC, NULL); SLAB_PANIC, NULL);
/* Create workqueue for cleanup */
netns_wq = create_singlethread_workqueue("netns");
if (!netns_wq)
panic("Could not create netns workq");
#endif #endif
mutex_lock(&net_mutex); mutex_lock(&net_mutex);
err = setup_net(&init_net); err = setup_net(&init_net);