* [PATCH] drm/panfrost: perfcnt: fix ref count leak in panfrost_perfcnt_enable_locked
@ 2020-06-14 6:36 Navid Emamdoost
2020-07-07 2:31 ` Alyssa Rosenzweig
2020-08-07 16:41 ` Rob Herring
0 siblings, 2 replies; 3+ messages in thread
From: Navid Emamdoost @ 2020-06-14 6:36 UTC (permalink / raw)
To: Rob Herring, Tomeu Vizoso, Steven Price, Alyssa Rosenzweig,
David Airlie, Daniel Vetter, dri-devel, linux-kernel
Cc: mccamant, emamd001, kjlu, wu000273, Navid Emamdoost
in panfrost_perfcnt_enable_locked, pm_runtime_get_sync is called which
increments the counter even in case of failure, leading to incorrect
ref count. In case of failure, decrement the ref count before returning.
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
index 6913578d5aa7..92c64b20eb29 100644
--- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
+++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
@@ -83,11 +83,13 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
ret = pm_runtime_get_sync(pfdev->dev);
if (ret < 0)
- return ret;
+ goto err_put_pm;
bo = drm_gem_shmem_create(pfdev->ddev, perfcnt->bosize);
- if (IS_ERR(bo))
- return PTR_ERR(bo);
+ if (IS_ERR(bo)) {
+ ret = PTR_ERR(bo);
+ goto err_put_pm;
+ }
/* Map the perfcnt buf in the address space attached to file_priv. */
ret = panfrost_gem_open(&bo->base, file_priv);
@@ -168,6 +170,8 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
panfrost_gem_close(&bo->base, file_priv);
err_put_bo:
drm_gem_object_put_unlocked(&bo->base);
+err_put_pm:
+ pm_runtime_put(pfdev->dev);
return ret;
}
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/panfrost: perfcnt: fix ref count leak in panfrost_perfcnt_enable_locked
2020-06-14 6:36 [PATCH] drm/panfrost: perfcnt: fix ref count leak in panfrost_perfcnt_enable_locked Navid Emamdoost
@ 2020-07-07 2:31 ` Alyssa Rosenzweig
2020-08-07 16:41 ` Rob Herring
1 sibling, 0 replies; 3+ messages in thread
From: Alyssa Rosenzweig @ 2020-07-07 2:31 UTC (permalink / raw)
To: Navid Emamdoost
Cc: wu000273, Tomeu Vizoso, David Airlie, kjlu, linux-kernel,
dri-devel, Steven Price, mccamant, emamd001
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
On Sun, Jun 14, 2020 at 01:36:19AM -0500, Navid Emamdoost wrote:
> in panfrost_perfcnt_enable_locked, pm_runtime_get_sync is called which
> increments the counter even in case of failure, leading to incorrect
> ref count. In case of failure, decrement the ref count before returning.
>
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
> ---
> drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> index 6913578d5aa7..92c64b20eb29 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
> @@ -83,11 +83,13 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
>
> ret = pm_runtime_get_sync(pfdev->dev);
> if (ret < 0)
> - return ret;
> + goto err_put_pm;
>
> bo = drm_gem_shmem_create(pfdev->ddev, perfcnt->bosize);
> - if (IS_ERR(bo))
> - return PTR_ERR(bo);
> + if (IS_ERR(bo)) {
> + ret = PTR_ERR(bo);
> + goto err_put_pm;
> + }
>
> /* Map the perfcnt buf in the address space attached to file_priv. */
> ret = panfrost_gem_open(&bo->base, file_priv);
> @@ -168,6 +170,8 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
> panfrost_gem_close(&bo->base, file_priv);
> err_put_bo:
> drm_gem_object_put_unlocked(&bo->base);
> +err_put_pm:
> + pm_runtime_put(pfdev->dev);
> return ret;
> }
>
> --
> 2.17.1
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/panfrost: perfcnt: fix ref count leak in panfrost_perfcnt_enable_locked
2020-06-14 6:36 [PATCH] drm/panfrost: perfcnt: fix ref count leak in panfrost_perfcnt_enable_locked Navid Emamdoost
2020-07-07 2:31 ` Alyssa Rosenzweig
@ 2020-08-07 16:41 ` Rob Herring
1 sibling, 0 replies; 3+ messages in thread
From: Rob Herring @ 2020-08-07 16:41 UTC (permalink / raw)
To: Navid Emamdoost
Cc: wu000273, Tomeu Vizoso, David Airlie, kjlu,
linux-kernel@vger.kernel.org, dri-devel, Steven Price, mccamant,
Navid Emamdoost, Alyssa Rosenzweig
On Sun, Jun 14, 2020 at 12:36 AM Navid Emamdoost
<navid.emamdoost@gmail.com> wrote:
>
> in panfrost_perfcnt_enable_locked, pm_runtime_get_sync is called which
> increments the counter even in case of failure, leading to incorrect
> ref count. In case of failure, decrement the ref count before returning.
>
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
> ---
> drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
Applied.
Rob
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-07 16:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-14 6:36 [PATCH] drm/panfrost: perfcnt: fix ref count leak in panfrost_perfcnt_enable_locked Navid Emamdoost
2020-07-07 2:31 ` Alyssa Rosenzweig
2020-08-07 16:41 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox