[PATCH] nes: handling failed allocation when creating workqueue

[PATCH] nes: handling failed allocation when creating workqueue

[Insu Yun]

Since create_singlethread_workqueue uses kzalloc internally, 
it can be failed in memory pressure, so need to handle it.

Signed-off-by: Insu Yun <wuninsu@gmail.com>
---
 drivers/infiniband/hw/nes/nes_cm.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index cb9f0f2..23afad6 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -2833,7 +2833,7 @@ static struct nes_cm_core *nes_cm_alloc_core(void)
 	/* alloc top level core control structure */
 	cm_core = kzalloc(sizeof(*cm_core), GFP_KERNEL);
 	if (!cm_core)
-		return NULL;
+		goto enomem_3;
 
 	INIT_LIST_HEAD(&cm_core->connected_nodes);
 	init_timer(&cm_core->tcp_timer);
@@ -2856,12 +2856,23 @@ static struct nes_cm_core *nes_cm_alloc_core(void)
 
 	nes_debug(NES_DBG_CM, "Enable QUEUE EVENTS\n");
 	cm_core->event_wq = create_singlethread_workqueue("nesewq");
+	if (!cm_core->event_wq)
+		goto enomem_2;
 	cm_core->post_event = nes_cm_post_event;
 	nes_debug(NES_DBG_CM, "Enable QUEUE DISCONNECTS\n");
 	cm_core->disconn_wq = create_singlethread_workqueue("nesdwq");
+	if (!cm_core->disconn_wq)
+		goto enomem_1;
 
 	print_core(cm_core);
 	return cm_core;
+
+enomem_1:
+	destroy_workqueue(cm_core->event_wq);
+enomem_2:
+	kfree(cm_core);
+enomem_3:
+	return NULL;
 }
 
 
-- 
1.9.1

Re: [PATCH] nes: handling failed allocation when creating workqueue

[Leon Romanovsky]

Please see my minor comments below.
Reviewed-by: Leon Romanovsky <leon@leon.nu>

On Wed, Feb 17, 2016 at 01:06:33PM -0500, Insu Yun wrote:
> Since create_singlethread_workqueue uses kzalloc internally, 
> it can be failed in memory pressure, so need to handle it.

s/can be failed/can fail/

> 
> Signed-off-by: Insu Yun <wuninsu@gmail.com>
> ---
>  drivers/infiniband/hw/nes/nes_cm.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
> index cb9f0f2..23afad6 100644
> --- a/drivers/infiniband/hw/nes/nes_cm.c
> +++ b/drivers/infiniband/hw/nes/nes_cm.c
> @@ -2833,7 +2833,7 @@ static struct nes_cm_core *nes_cm_alloc_core(void)
>  	/* alloc top level core control structure */
>  	cm_core = kzalloc(sizeof(*cm_core), GFP_KERNEL);
>  	if (!cm_core)
> -		return NULL;
> +		goto enomem_3;

IMHO, there is no need to define goto label for one return.

>  
>  	INIT_LIST_HEAD(&cm_core->connected_nodes);
>  	init_timer(&cm_core->tcp_timer);
> @@ -2856,12 +2856,23 @@ static struct nes_cm_core *nes_cm_alloc_core(void)
>  
>  	nes_debug(NES_DBG_CM, "Enable QUEUE EVENTS\n");
>  	cm_core->event_wq = create_singlethread_workqueue("nesewq");
> +	if (!cm_core->event_wq)
> +		goto enomem_2;
>  	cm_core->post_event = nes_cm_post_event;
>  	nes_debug(NES_DBG_CM, "Enable QUEUE DISCONNECTS\n");
>  	cm_core->disconn_wq = create_singlethread_workqueue("nesdwq");
> +	if (!cm_core->disconn_wq)
> +		goto enomem_1;
>  
>  	print_core(cm_core);
>  	return cm_core;
> +
> +enomem_1:
> +	destroy_workqueue(cm_core->event_wq);
> +enomem_2:
> +	kfree(cm_core);
> +enomem_3:
> +	return NULL;
>  }
>  
>  
> -- 
> 1.9.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] nes: handling failed allocation when creating workqueue

[Doug Ledford]

[-- Attachment #1: Type: text/plain, Size: 1165 bytes --]

On 2/17/2016 11:59 PM, Leon Romanovsky wrote:
> Please see my minor comments below.
> Reviewed-by: Leon Romanovsky <leon@leon.nu>
> 
> On Wed, Feb 17, 2016 at 01:06:33PM -0500, Insu Yun wrote:
>> Since create_singlethread_workqueue uses kzalloc internally, 
>> it can be failed in memory pressure, so need to handle it.
> 
> s/can be failed/can fail/
> 
>>
>> Signed-off-by: Insu Yun <wuninsu@gmail.com>
>> ---
>>  drivers/infiniband/hw/nes/nes_cm.c | 13 ++++++++++++-
>>  1 file changed, 12 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
>> index cb9f0f2..23afad6 100644
>> --- a/drivers/infiniband/hw/nes/nes_cm.c
>> +++ b/drivers/infiniband/hw/nes/nes_cm.c
>> @@ -2833,7 +2833,7 @@ static struct nes_cm_core *nes_cm_alloc_core(void)
>>  	/* alloc top level core control structure */
>>  	cm_core = kzalloc(sizeof(*cm_core), GFP_KERNEL);
>>  	if (!cm_core)
>> -		return NULL;
>> +		goto enomem_3;
> 
> IMHO, there is no need to define goto label for one return.

I made the touchups Leon suggested, and a touchup of my own, but it is
now applied, thanks.



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]