drm/panfrost: fix ref count leak in panfrost_job_hw_submit
Subsystems (3)
PATCH 1/1 drm/panfrost: fix ref count leak in panfrost_job_hw_submit
in panfrost_job_hw_submit, 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.
--- drivers/gpu/drm/panfrost/panfrost_job.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/panfrost/panfrost_job.c +5 -3
@@ -147,11 +147,10 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) ret =pm_runtime_get_sync (pfdev->dev);if (ret <0 ) -return ; + goto out;if (WARN_ON (job_read (pfdev,JS_COMMAND_NEXT (js)))) { -pm_runtime_put_sync_autosuspend (pfdev->dev); -return ; + goto out; } cfg =panfrost_mmu_as_get (pfdev, &job->file_priv->mmu);
@@ -184,6 +183,9 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) job, js, jc_head);job_write (pfdev,JS_COMMAND_NEXT (js),JS_COMMAND_START ); +out: +pm_runtime_put_sync_autosuspend (pfdev->dev); +return ; } static void panfrost_acquire_object_fences(struct drm_gem_object **bos,
Signature · 1 line
2.17.1
Quoted 40 lines · Navid Emamdoost
in
panfrost_job_hw_submit,pm_runtime_get_syncis 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 <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_job.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/panfrost/panfrost_job.c +5
-3@@ -147,11 +147,10 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) ret =pm_runtime_get_sync (pfdev->dev);if (ret <0 ) -return ; + goto out;if (WARN_ON (job_read (pfdev,JS_COMMAND_NEXT (js)))) { -pm_runtime_put_sync_autosuspend (pfdev->dev); -return ; + goto out; } cfg =panfrost_mmu_as_get (pfdev, &job->file_priv->mmu);@@ -184,6 +183,9 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) job, js, jc_head);job_write (pfdev,JS_COMMAND_NEXT (js),JS_COMMAND_START ); +out: +pm_runtime_put_sync_autosuspend (pfdev->dev); +return ; } static void panfrost_acquire_object_fences(struct drm_gem_object **bos,Signature · 1 line
2.17.1
Rob Herring
maintainerQuoted 15 lines · Navid Emamdoost
in
panfrost_job_hw_submit,pm_runtime_get_syncis 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 <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_job.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/panfrost/panfrost_job.c +0
-0
drivers/gpu/drm/panfrost/panfrost_job.c static void panfrost_job_hw_submit(struct panfrost_job *job, int js) · line 150
Quoted 5 lines
drivers/gpu/drm/panfrost/panfrost_job.c +1
-1@@ -147,11 +147,10 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) ret =pm_runtime_get_sync (pfdev->dev);if (ret <0 ) -return ; + goto out;
If the get failed, I don't think we want to do a put.
drivers/gpu/drm/panfrost/panfrost_job.c static void panfrost_job_hw_submit(struct panfrost_job *job, int js) · line 185
Quoted 12 lines
drivers/gpu/drm/panfrost/panfrost_job.c +1
-2if (WARN_ON (job_read (pfdev,JS_COMMAND_NEXT (js)))) { -pm_runtime_put_sync_autosuspend (pfdev->dev); -return ; + goto out; } cfg =panfrost_mmu_as_get (pfdev, &job->file_priv->mmu);@@ -184,6 +183,9 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) job, js, jc_head);job_write (pfdev,JS_COMMAND_NEXT (js),JS_COMMAND_START );
So we start the job here and then...
drivers/gpu/drm/panfrost/panfrost_job.c static void panfrost_job_hw_submit(struct panfrost_job *job, int js) · line 187
Quoted 2 lines
drivers/gpu/drm/panfrost/panfrost_job.c +2
-0+out: +pm_runtime_put_sync_autosuspend (pfdev->dev);
...turn off clocks/power here. Typically, you'd be fine as autosuspend has a delay by default, but userspace is free to change the delay to 0.
Quoted 7 lines
drivers/gpu/drm/panfrost/panfrost_job.c +1
-1+return ; } static void panfrost_acquire_object_fences(struct drm_gem_object **bos, --2.17.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Steven Price
maintainerQuoted 18 lines · Rob Herring
Quoted 16 lines · Navid Emamdoost
in
panfrost_job_hw_submit,pm_runtime_get_syncis 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 <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_job.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/panfrost/panfrost_job.c +0
-0@@ -147,11 +147,10 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js)
Quoted 6 lines
drivers/gpu/drm/panfrost/panfrost_job.c static void panfrost_job_hw_submit(struct panfrost_job *job, int js) · line 150
Quoted 4 lines
drivers/gpu/drm/panfrost/panfrost_job.c +1
-1ret =pm_runtime_get_sync (pfdev->dev);if (ret <0 ) -return ; + goto out;If the get failed, I don't think we want to do a put.
The pm_runtime_get_sync() does actually always increment the reference (even when returning a failure), but actually I don't think we want it here anyway, as I think I explained before[1].
[1]
https://lore.kernel.org/dri-devel/[email protected]
Quoted 4 lines
drivers/gpu/drm/panfrost/panfrost_job.c static void panfrost_job_hw_submit(struct panfrost_job *job, int js) · line 153
Quoted 4 lines
drivers/gpu/drm/panfrost/panfrost_job.c +0
-1if (WARN_ON (job_read (pfdev,JS_COMMAND_NEXT (js)))) { -pm_runtime_put_sync_autosuspend (pfdev->dev);
This is a correct change - we don't want the put here. (Although this should never happen).
Quoted 12 lines
drivers/gpu/drm/panfrost/panfrost_job.c static void panfrost_job_hw_submit(struct panfrost_job *job, int js) · line 185
Quoted 9 lines
drivers/gpu/drm/panfrost/panfrost_job.c +1
-1-return ; + goto out; } cfg =panfrost_mmu_as_get (pfdev, &job->file_priv->mmu);@@ -184,6 +183,9 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) job, js, jc_head);job_write (pfdev,JS_COMMAND_NEXT (js),JS_COMMAND_START );So we start the job here and then...
Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_job.c static void panfrost_job_hw_submit(struct panfrost_job *job, int js) · line 187
Quoted 2 lines
drivers/gpu/drm/panfrost/panfrost_job.c +2
-0+out: +pm_runtime_put_sync_autosuspend (pfdev->dev);...turn off clocks/power here. Typically, you'd be fine as autosuspend has a delay by default, but userspace is free to change the delay to 0.
Quoted 1 line
drivers/gpu/drm/panfrost/panfrost_job.c +1
-0+return ;
A return at the end of the function with no argument is pointless.
Steve
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/panfrost/panfrost_job.c +0
-1} static void panfrost_acquire_object_fences(struct drm_gem_object **bos, --2.17.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel