2020-05-13 19:18:53

by Souptick Joarder

Subject: [PATCH] fpga: dfl: afu: Corrected error handling levels

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 <[email protected]>
---
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

2020-05-14 02:34:38

by Xu Yilun

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,
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 <[email protected]>
> ---
> 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

2020-05-14 06:08:12

by Wu Hao

Subject: RE: [PATCH] fpga: dfl: afu: Corrected error handling levels

> -----Original Message-----
> From: Xu, Yilun <[email protected]>
> Sent: Thursday, May 14, 2020 10:30 AM
> To: Souptick Joarder <[email protected]>
> Cc: Wu, Hao <[email protected]>; [email protected]; linux-
> [email protected]; [email protected]
> 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 <[email protected]>

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 <[email protected]>
> > ---
> > 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

2020-05-16 20:26:37

by Souptick Joarder

Subject: Re: [PATCH] fpga: dfl: afu: Corrected error handling levels

On Thu, May 14, 2020 at 11:36 AM Wu, Hao <[email protected]> wrote:
>
> > -----Original Message-----
> > From: Xu, Yilun <[email protected]>
> > Sent: Thursday, May 14, 2020 10:30 AM
> > To: Souptick Joarder <[email protected]>
> > Cc: Wu, Hao <[email protected]>; [email protected]; linux-
> > [email protected]; [email protected]
> > 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 <[email protected]>

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 <[email protected]>
> > > ---
> > > 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