dmaengine: ti: Fix runtime PM imbalance on error

[PATCH] dmaengine: ti: Fix runtime PM imbalance on error

Posted by Yongzhi Liu 4 years, 5 months ago

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code, thus a matching decrement is needed on
the error handling path to keep the counter balanced.

Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
---
 drivers/dma/ti/edma.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c
index 08e47f4..a73f779 100644
--- a/drivers/dma/ti/edma.c
+++ b/drivers/dma/ti/edma.c
@@ -2398,9 +2398,9 @@ static int edma_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, ecc);
 
 	pm_runtime_enable(dev);
-	ret = pm_runtime_get_sync(dev);
+	ret = pm_runtime_resume_and_get(dev);
 	if (ret < 0) {
-		dev_err(dev, "pm_runtime_get_sync() failed\n");
+		dev_err(dev, "pm_runtime_resume_and_get() failed\n");
 		pm_runtime_disable(dev);
 		return ret;
 	}
-- 
2.7.4

Re: [PATCH] dmaengine: ti: Fix runtime PM imbalance on error

Posted by Péter Ujfalusi 4 years, 5 months ago


On 1/16/22 13:31, Yongzhi Liu wrote:
> pm_runtime_get_sync() increments the runtime PM usage counter even
> when it returns an error code, thus a matching decrement is needed on
> the error handling path to keep the counter balanced.

The patch is correct, however the commit message is a bit incorrect.

We are not adding any visible matching decrement, we are switching to
pm_runtime_resume_and_get() which only increments the usage counter if
pm_runtime_resume() is successful.
Granted internally it does a pm_runtime_put_noidle() if resume call fails.

Switch to pm_runtime_resume_and_get() to keep the device's use caunt
balanced?

> 
> Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
> ---
>  drivers/dma/ti/edma.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c
> index 08e47f4..a73f779 100644
> --- a/drivers/dma/ti/edma.c
> +++ b/drivers/dma/ti/edma.c
> @@ -2398,9 +2398,9 @@ static int edma_probe(struct platform_device *pdev)
>  	platform_set_drvdata(pdev, ecc);
>  
>  	pm_runtime_enable(dev);
> -	ret = pm_runtime_get_sync(dev);
> +	ret = pm_runtime_resume_and_get(dev);
>  	if (ret < 0) {
> -		dev_err(dev, "pm_runtime_get_sync() failed\n");
> +		dev_err(dev, "pm_runtime_resume_and_get() failed\n");
>  		pm_runtime_disable(dev);
>  		return ret;
>  	}

-- 
Péter

Re: [PATCH] dmaengine: ti: Fix runtime PM imbalance on error

Posted by 刘永志 4 years, 5 months ago

> -----原始邮件-----
> 发件人: "Péter Ujfalusi" <peter.ujfalusi@gmail.com>
> 发送时间: 2022-01-22 16:09:53 (星期六)
> 收件人: "Yongzhi Liu" <lyz_cs@pku.edu.cn>, vkoul@kernel.org
> 抄送: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org
> 主题: Re: [PATCH] dmaengine: ti: Fix runtime PM imbalance on error
> 
> 
> 
> On 1/16/22 13:31, Yongzhi Liu wrote:
> > pm_runtime_get_sync() increments the runtime PM usage counter even
> > when it returns an error code, thus a matching decrement is needed on
> > the error handling path to keep the counter balanced.
> 
> The patch is correct, however the commit message is a bit incorrect.
> 
> We are not adding any visible matching decrement, we are switching to
> pm_runtime_resume_and_get() which only increments the usage counter if
> pm_runtime_resume() is successful.
> Granted internally it does a pm_runtime_put_noidle() if resume call fails.
> 
> Switch to pm_runtime_resume_and_get() to keep the device's use caunt
> balanced?
> 

Thanks for your reply. I agree with your change and rewrite the commit message as follows.

[why]
pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code, however pm_runtime_resume_and_get() 
only increments the usage counter if pm_runtime_resume() is successful,
which granted internally does a pm_runtime_put_noidle() if resume call fails.

[how]
Fix this by switching to pm_runtime_resume_and_get() to keep the device's use count
balanced.


> > 
> > Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn>
> > ---
> >  drivers/dma/ti/edma.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/dma/ti/edma.c b/drivers/dma/ti/edma.c
> > index 08e47f4..a73f779 100644
> > --- a/drivers/dma/ti/edma.c
> > +++ b/drivers/dma/ti/edma.c
> > @@ -2398,9 +2398,9 @@ static int edma_probe(struct platform_device *pdev)
> >  	platform_set_drvdata(pdev, ecc);
> >  
> >  	pm_runtime_enable(dev);
> > -	ret = pm_runtime_get_sync(dev);
> > +	ret = pm_runtime_resume_and_get(dev);
> >  	if (ret < 0) {
> > -		dev_err(dev, "pm_runtime_get_sync() failed\n");
> > +		dev_err(dev, "pm_runtime_resume_and_get() failed\n");
> >  		pm_runtime_disable(dev);
> >  		return ret;
> >  	}
> 
> -- 
> Péter