OpenVZ Forum


Home » Mailing lists » Devel » [PATCH][net-2.6.25][NETNS] make netns cleanup to run in a separate workqueue
[PATCH][net-2.6.25][NETNS] make netns cleanup to run in a separate workqueue [message #23509] Mon, 19 November 2007 10:44 Go to next message
Daniel Lezcano is currently offline  Daniel Lezcano
Messages: 417
Registered: June 2006
Senior Member
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers
Re: [PATCH][net-2.6.25][NETNS] make netns cleanup to run in a separate workqueue [message #23510 is a reply to message #23509] Mon, 19 November 2007 11:01 Go to previous messageGo to next message
dev is currently offline  dev
Messages: 1693
Registered: September 2005
Location: Moscow
Senior Member

imho panic() is too much.
create_singlethread_workqueue() can fail e.g. due to out of memory...

Thanks,
Kirill


Daniel Lezcano wrote:
> Subject: make netns cleanup to run in a separate queue
> From: Benjamin Thery <benjamin.thery@bull.net>
> 
> 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: Daniel Lezcano <dlezcano@fr.ibm.com>
> Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
> Acked-by: Denis V. Lunev <den@openvz.org>
> ---
>  net/core/net_namespace.c |    9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> Index: net-2.6.25/net/core/net_namespace.c
> ===================================================================
> --- net-2.6.25.orig/net/core/net_namespace.c
> +++ net-2.6.25/net/core/net_namespace.c
> @@ -58,6 +58,7 @@ out_undo:
>  
>  #ifdef CONFIG_NET_NS
>  static struct kmem_cache *net_cachep;
> +static struct workqueue_struct *netns_wq;
>  
>  static struct net *net_alloc(void)
>  {
> @@ -149,7 +150,7 @@ void __put_net(struct net *net)
>  {
>  	/* Cleanup the network namespace in process context */
>  	INIT_WORK(&net->work, cleanup_net);
> -	schedule_work(&net->work);
> +	queue_work(netns_wq, &net->work);
>  }
>  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),
>  					SMP_CACHE_BYTES,
>  					SLAB_PANIC, NULL);
> +
> +	/* Create workqueue for cleanup */
> +	netns_wq = create_singlethread_workqueue("netns");
> +	if (!netns_wq)
> +		panic("Could not create netns workq");

>  #endif
> +
>  	mutex_lock(&net_mutex);
>  	err = setup_net(&init_net);
>  
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Containers mailing list
> Containers@lists.linux-foundation.org
> https://lists.linux-foundation.org/mailman/listinfo/containers

_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers
Re: [PATCH][net-2.6.25][NETNS] make netns cleanup to run in a separate workqueue [message #23511 is a reply to message #23510] Mon, 19 November 2007 11:07 Go to previous messageGo to next message
dev is currently offline  dev
Messages: 1693
Registered: September 2005
Location: Moscow
Senior Member

Ah, sorry. Didn't notice it's called only on boot.

Acked-By: Kirill Korotaev <dev@sw.ru>

Kirill Korotaev wrote:
> imho panic() is too much.
> create_singlethread_workqueue() can fail e.g. due to out of memory...
> 
> Thanks,
> Kirill
> 
> 
> Daniel Lezcano wrote:
> 
>>Subject: make netns cleanup to run in a separate queue
>>From: Benjamin Thery <benjamin.thery@bull.net>
>>
>>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: Daniel Lezcano <dlezcano@fr.ibm.com>
>>Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
>>Acked-by: Denis V. Lunev <den@openvz.org>
>>---
>> net/core/net_namespace.c |    9 ++++++++-
>> 1 file changed, 8 insertions(+), 1 deletion(-)
>>
>>Index: net-2.6.25/net/core/net_namespace.c
>>===================================================================
>>--- net-2.6.25.orig/net/core/net_namespace.c
>>+++ net-2.6.25/net/core/net_namespace.c
>>@@ -58,6 +58,7 @@ out_undo:
>> 
>> #ifdef CONFIG_NET_NS
>> static struct kmem_cache *net_cachep;
>>+static struct workqueue_struct *netns_wq;
>> 
>> static struct net *net_alloc(void)
>> {
>>@@ -149,7 +150,7 @@ void __put_net(struct net *net)
>> {
>> 	/* Cleanup the network namespace in process context */
>> 	INIT_WORK(&net->work, cleanup_net);
>>-	schedule_work(&net->work);
>>+	queue_work(netns_wq, &net->work);
>> }
>> 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),
>> 					SMP_CACHE_BYTES,
>> 					SLAB_PANIC, NULL);
>>+
>>+	/* Create workqueue for cleanup */
>>+	netns_wq = create_singlethread_workqueue("netns");
>>+	if (!netns_wq)
>>+		panic("Could not create netns workq");
> 
> 
>> #endif
>>+
>> 	mutex_lock(&net_mutex);
>> 	err = setup_net(&init_net);
>> 
>>
>>
>>------------------------------------------------------------------------
>>
>>_______________________________________________
>>Containers mailing list
>>Containers@lists.linux-foundation.org
>>https://lists.linux-foundation.org/mailman/listinfo/containers
> 
> 
> _______________________________________________
> Containers mailing list
> Containers@lists.linux-foundation.org
> https://lists.linux-foundation.org/mailman/listinfo/containers
> 

_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers
Re: [PATCH][net-2.6.25][NETNS] make netns cleanup to run in a separate workqueue [message #23545 is a reply to message #23511] Tue, 20 November 2007 07:18 Go to previous message
davem is currently offline  davem
Messages: 463
Registered: February 2006
Senior Member
From: Kirill Korotaev <dev@sw.ru>
Date: Mon, 19 Nov 2007 14:08:49 +0300

> Acked-By: Kirill Korotaev <dev@sw.ru>

I've applied this patch, thanks everyone.
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers
Previous Topic: [PATCH][IPVS] Relax the module get/put in ip_vs_app.c
Next Topic: [PATCH] Compact sk_stream_mem_schedule() code
Goto Forum:
  


Current Time: Tue Jul 23 15:16:56 GMT 2024

Total time taken to generate the page: 0.02446 seconds