Re: [PATCH 3/4 v2] firmware: stratix10-svc: Fix some error handling paths in 'stratix10_svc_drv_probe()'

[Christophe JAILLET]

Le 05/05/2020 Ã 16:02, Richard Gong a ÃcritÂ:
> Hi,
>
> Similarly we need add error handling for controller and chans, 
> something like below:
>
> @@ -997,13 +997,17 @@ static int stratix10_svc_drv_probe(struct 
> platform_device *pdev)
>
> ÂÂÂÂÂÂÂ /* allocate service controller and supporting channel */
> ÂÂÂÂÂÂÂ controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL);
> -ÂÂÂÂÂÂ if (!controller)
> -ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ return -ENOMEM;
> +ÂÂÂÂÂÂ if (!controller) {
> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ ret = -ENOMEM;
> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ goto err_destroy_pool;
> +ÂÂÂÂÂÂ }
>
> ÂÂÂÂÂÂÂ chans = devm_kmalloc_array(dev, SVC_NUM_CHANNEL,
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ sizeof(*chans), GFP_KERNEL | 
> __GFP_ZERO);
> -ÂÂÂÂÂÂ if (!chans)
> -ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ return -ENOMEM;
> +ÂÂÂÂÂÂ if (!chans) {
> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ ret = -ENOMEM;
> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ goto err_destroy_pool;
> +ÂÂÂÂÂÂ }
>
> ÂÂÂÂÂÂÂ controller->dev = dev;
> ÂÂÂÂÂÂÂ controller->num_chans = SVC_NUM_CHANNEL;
Hi,

This is addressed in patch 1/4.
It moves 'svc_create_memory_pool' after these 2 allocations in order to 
avoid the goto.

I'll send a V3 in only 1 patch, as you proposed, it will ease review.

CJ


> On 4/29/20 1:52 AM, Christophe JAILLET wrote:
> > If an error occurs after calling 'svc_create_memory_pool()', the 
> > allocated
> > genpool should be destroyed with 'gen_pool_destroy()', as already 
> > done in
> > the remove function.
> >
> > If an error occurs after calling 'kfifo_alloc()', the allocated memory
> > should be freed with 'kfifo_free()', as already done in the remove
> > function.
> >
> > While at it, also move a 'platform_device_put()' call to the error 
> > handling
> > path.
> >
> > Fixes: b5dc75c915cd ("firmware: stratix10-svc: extend svc to support 
> > new RSU features")
> > Fixes: 7ca5ce896524 ("firmware: add Intel Stratix10 service layer 
> > driver")
> > Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
> > ---
> > Â drivers/firmware/stratix10-svc.c | 26 ++++++++++++++++++--------
> > Â 1 file changed, 18 insertions(+), 8 deletions(-)
> I am fine with below changes.
>
> > diff --git a/drivers/firmware/stratix10-svc.c 
> > b/drivers/firmware/stratix10-svc.c
> > index de5870f76c5e..739004398877 100644
> > --- a/drivers/firmware/stratix10-svc.c
> > +++ b/drivers/firmware/stratix10-svc.c
> > @@ -1024,7 +1024,7 @@ static int stratix10_svc_drv_probe(struct 
> > platform_device *pdev)
> > ÂÂÂÂÂ ret = kfifo_alloc(&controller->svc_fifo, fifo_size, GFP_KERNEL);
> > ÂÂÂÂÂ if (ret) {
> > ÂÂÂÂÂÂÂÂÂ dev_err(dev, "failed to allocate FIFO\n");
> > -ÂÂÂÂÂÂÂ return ret;
> > +ÂÂÂÂÂÂÂ goto err_destroy_pool;
> > ÂÂÂÂÂ }
> > ÂÂÂÂÂ spin_lock_init(&controller->svc_fifo_lock);
> > Â @@ -1043,24 +1043,34 @@ static int stratix10_svc_drv_probe(struct 
> > platform_device *pdev)
> > Â ÂÂÂÂÂ /* add svc client device(s) */
> > ÂÂÂÂÂ svc = devm_kzalloc(dev, sizeof(*svc), GFP_KERNEL);
> > -ÂÂÂ if (!svc)
> > -ÂÂÂÂÂÂÂ return -ENOMEM;
> > +ÂÂÂ if (!svc) {
> > +ÂÂÂÂÂÂÂ ret = -ENOMEM;
> > +ÂÂÂÂÂÂÂ goto err_free_kfifo;
> > +ÂÂÂ }
> > Â ÂÂÂÂÂ svc->stratix10_svc_rsu = platform_device_alloc(STRATIX10_RSU, 
> > 0);
> > ÂÂÂÂÂ if (!svc->stratix10_svc_rsu) {
> > ÂÂÂÂÂÂÂÂÂ dev_err(dev, "failed to allocate %s device\n", STRATIX10_RSU);
> > -ÂÂÂÂÂÂÂ return -ENOMEM;
> > +ÂÂÂÂÂÂÂ ret = -ENOMEM;
> > +ÂÂÂÂÂÂÂ goto err_free_kfifo;
> > ÂÂÂÂÂ }
> > Â ÂÂÂÂÂ ret = platform_device_add(svc->stratix10_svc_rsu);
> > -ÂÂÂ if (ret) {
> > -ÂÂÂÂÂÂÂ platform_device_put(svc->stratix10_svc_rsu);
> > -ÂÂÂÂÂÂÂ return ret;
> > -ÂÂÂ }
> > +ÂÂÂ if (ret)
> > +ÂÂÂÂÂÂÂ goto put_platform;
> > +
> > ÂÂÂÂÂ dev_set_drvdata(dev, svc);
> > Â ÂÂÂÂÂ pr_info("Intel Service Layer Driver Initialized\n");
> > Â +ÂÂÂ return 0;
> > +
> > +put_platform:
> > +ÂÂÂ platform_device_put(svc->stratix10_svc_rsu);
> > +err_free_kfifo:
> > +ÂÂÂ kfifo_free(&controller->svc_fifo);
> > +err_destroy_pool:
> > +ÂÂÂ gen_pool_destroy(genpool);
> > ÂÂÂÂÂ return ret;
> > Â }
> Regards,
> Richard