fpga: dfl: afu: Corrected error handling levels
diff mbox series

Message ID 1589397725-29697-1-git-send-email-jrdr.linux@gmail.com
State New
Headers show
Series
  • fpga: dfl: afu: Corrected error handling levels
Related show

Commit Message

Souptick Joarder May 13, 2020, 7:22 p.m. UTC
Corrected error handling goto sequnece. Level put_pages should
be called when pinned pages >= 0 && pinned != npages. Level
free_pages should be called when pinned pages < 0.

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
---
 drivers/fpga/dfl-afu-dma-region.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Xu Yilun May 14, 2020, 2:29 a.m. UTC | #1
The patch looks good to me.

Maybe we could add the Fixes tag:
  Fixes: fa8dda1edef9 (fpga: dfl: afu: add DFL_FPGA_PORT_DMA_MAP/UNMAP ioctls support)

Thanks,
Yilun

On Thu, May 14, 2020 at 12:52:05AM +0530, Souptick Joarder wrote:
> Corrected error handling goto sequnece. Level put_pages should
> be called when pinned pages >= 0 && pinned != npages. Level
> free_pages should be called when pinned pages < 0.
> 
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> ---
>  drivers/fpga/dfl-afu-dma-region.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-region.c
> index 62f9244..5942343 100644
> --- a/drivers/fpga/dfl-afu-dma-region.c
> +++ b/drivers/fpga/dfl-afu-dma-region.c
> @@ -61,10 +61,10 @@ static int afu_dma_pin_pages(struct dfl_feature_platform_data *pdata,
>  				     region->pages);
>  	if (pinned < 0) {
>  		ret = pinned;
> -		goto put_pages;
> +		goto free_pages;
>  	} else if (pinned != npages) {
>  		ret = -EFAULT;
> -		goto free_pages;
> +		goto put_pages;
>  	}
>  
>  	dev_dbg(dev, "%d pages pinned\n", pinned);
> -- 
> 1.9.1
Wu, Hao May 14, 2020, 6:06 a.m. UTC | #2
> -----Original Message-----
> From: Xu, Yilun <yilun.xu@intel.com>
> Sent: Thursday, May 14, 2020 10:30 AM
> To: Souptick Joarder <jrdr.linux@gmail.com>
> Cc: Wu, Hao <hao.wu@intel.com>; mdf@kernel.org; linux-
> fpga@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: Re: [PATCH] fpga: dfl: afu: Corrected error handling levels
> 
> The patch looks good to me.
> 
> Maybe we could add the Fixes tag:
>   Fixes: fa8dda1edef9 (fpga: dfl: afu: add
> DFL_FPGA_PORT_DMA_MAP/UNMAP ioctls support)

Thanks for catching this problem.

With this line,
Acked-by: Wu Hao <hao.wu@intel.com>

Thanks!
Hao

> 
> Thanks,
> Yilun
> 
> On Thu, May 14, 2020 at 12:52:05AM +0530, Souptick Joarder wrote:
> > Corrected error handling goto sequnece. Level put_pages should
> > be called when pinned pages >= 0 && pinned != npages. Level
> > free_pages should be called when pinned pages < 0.
> >
> > Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> > ---
> >  drivers/fpga/dfl-afu-dma-region.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-
> region.c
> > index 62f9244..5942343 100644
> > --- a/drivers/fpga/dfl-afu-dma-region.c
> > +++ b/drivers/fpga/dfl-afu-dma-region.c
> > @@ -61,10 +61,10 @@ static int afu_dma_pin_pages(struct
> dfl_feature_platform_data *pdata,
> >  				     region->pages);
> >  	if (pinned < 0) {
> >  		ret = pinned;
> > -		goto put_pages;
> > +		goto free_pages;
> >  	} else if (pinned != npages) {
> >  		ret = -EFAULT;
> > -		goto free_pages;
> > +		goto put_pages;
> >  	}
> >
> >  	dev_dbg(dev, "%d pages pinned\n", pinned);
> > --
> > 1.9.1
Souptick Joarder May 16, 2020, 8:22 p.m. UTC | #3
On Thu, May 14, 2020 at 11:36 AM Wu, Hao <hao.wu@intel.com> wrote:
>
> > -----Original Message-----
> > From: Xu, Yilun <yilun.xu@intel.com>
> > Sent: Thursday, May 14, 2020 10:30 AM
> > To: Souptick Joarder <jrdr.linux@gmail.com>
> > Cc: Wu, Hao <hao.wu@intel.com>; mdf@kernel.org; linux-
> > fpga@vger.kernel.org; linux-kernel@vger.kernel.org
> > Subject: Re: [PATCH] fpga: dfl: afu: Corrected error handling levels
> >
> > The patch looks good to me.
> >
> > Maybe we could add the Fixes tag:
> >   Fixes: fa8dda1edef9 (fpga: dfl: afu: add
> > DFL_FPGA_PORT_DMA_MAP/UNMAP ioctls support)
>
> Thanks for catching this problem.
>
> With this line,
> Acked-by: Wu Hao <hao.wu@intel.com>

Thanks. Will post v2.

>
> Thanks!
> Hao
>
> >
> > Thanks,
> > Yilun
> >
> > On Thu, May 14, 2020 at 12:52:05AM +0530, Souptick Joarder wrote:
> > > Corrected error handling goto sequnece. Level put_pages should
> > > be called when pinned pages >= 0 && pinned != npages. Level
> > > free_pages should be called when pinned pages < 0.
> > >
> > > Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> > > ---
> > >  drivers/fpga/dfl-afu-dma-region.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-
> > region.c
> > > index 62f9244..5942343 100644
> > > --- a/drivers/fpga/dfl-afu-dma-region.c
> > > +++ b/drivers/fpga/dfl-afu-dma-region.c
> > > @@ -61,10 +61,10 @@ static int afu_dma_pin_pages(struct
> > dfl_feature_platform_data *pdata,
> > >                                  region->pages);
> > >     if (pinned < 0) {
> > >             ret = pinned;
> > > -           goto put_pages;
> > > +           goto free_pages;
> > >     } else if (pinned != npages) {
> > >             ret = -EFAULT;
> > > -           goto free_pages;
> > > +           goto put_pages;
> > >     }
> > >
> > >     dev_dbg(dev, "%d pages pinned\n", pinned);
> > > --
> > > 1.9.1

Patch
diff mbox series

diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-region.c
index 62f9244..5942343 100644
--- a/drivers/fpga/dfl-afu-dma-region.c
+++ b/drivers/fpga/dfl-afu-dma-region.c
@@ -61,10 +61,10 @@  static int afu_dma_pin_pages(struct dfl_feature_platform_data *pdata,
 				     region->pages);
 	if (pinned < 0) {
 		ret = pinned;
-		goto put_pages;
+		goto free_pages;
 	} else if (pinned != npages) {
 		ret = -EFAULT;
-		goto free_pages;
+		goto put_pages;
 	}
 
 	dev_dbg(dev, "%d pages pinned\n", pinned);