* [PATCH] drm/ttm: Fix dma_fence refcnt leak when adding move fence
@ 2020-06-13 12:30 Xiyu Yang
2020-06-15 8:55 ` Christian König
0 siblings, 1 reply; 2+ messages in thread
From: Xiyu Yang @ 2020-06-13 12:30 UTC (permalink / raw)
To: Christian Koenig, Huang Rui, David Airlie, Daniel Vetter,
Sumit Semwal, dri-devel, linux-kernel, linux-media,
linaro-mm-sig
Cc: yuanxzhang, kjlu, Xiyu Yang, Xin Tan
ttm_bo_add_move_fence() invokes dma_fence_get(), which returns a
reference of the specified dma_fence object to "fence" with increased
refcnt.
When ttm_bo_add_move_fence() returns, local variable "fence" becomes
invalid, so the refcount should be decreased to keep refcount balanced.
The reference counting issue happens in one exception handling path of
ttm_bo_add_move_fence(). When no_wait_gpu flag is equals to true, the
function forgets to decrease the refcnt increased by dma_fence_get(),
causing a refcnt leak.
Fix this issue by calling dma_fence_put() when no_wait_gpu flag is
equals to true.
Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
---
drivers/gpu/drm/ttm/ttm_bo.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index f73b81c2576e..0f20e14a4cfd 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -883,8 +883,10 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,
if (!fence)
return 0;
- if (no_wait_gpu)
+ if (no_wait_gpu) {
+ dma_fence_put(fence);
return -EBUSY;
+ }
dma_resv_add_shared_fence(bo->base.resv, fence);
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/ttm: Fix dma_fence refcnt leak when adding move fence
2020-06-13 12:30 [PATCH] drm/ttm: Fix dma_fence refcnt leak when adding move fence Xiyu Yang
@ 2020-06-15 8:55 ` Christian König
0 siblings, 0 replies; 2+ messages in thread
From: Christian König @ 2020-06-15 8:55 UTC (permalink / raw)
To: Xiyu Yang, Huang Rui, David Airlie, Daniel Vetter, Sumit Semwal,
dri-devel, linux-kernel, linux-media, linaro-mm-sig
Cc: yuanxzhang, kjlu, Xin Tan
Am 13.06.20 um 14:30 schrieb Xiyu Yang:
> ttm_bo_add_move_fence() invokes dma_fence_get(), which returns a
> reference of the specified dma_fence object to "fence" with increased
> refcnt.
>
> When ttm_bo_add_move_fence() returns, local variable "fence" becomes
> invalid, so the refcount should be decreased to keep refcount balanced.
>
> The reference counting issue happens in one exception handling path of
> ttm_bo_add_move_fence(). When no_wait_gpu flag is equals to true, the
> function forgets to decrease the refcnt increased by dma_fence_get(),
> causing a refcnt leak.
>
> Fix this issue by calling dma_fence_put() when no_wait_gpu flag is
> equals to true.
>
> Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
> Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
Reviewed and pushed this one as well as the other ttm fix to drm-misc-fixes.
That should show up in Linus tree rather soon.
Thanks for the help,
Christian.
PS: Are you working on some new automated scripts to catch that stuff or
how did you stumbled over it?
> ---
> drivers/gpu/drm/ttm/ttm_bo.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index f73b81c2576e..0f20e14a4cfd 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -883,8 +883,10 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,
> if (!fence)
> return 0;
>
> - if (no_wait_gpu)
> + if (no_wait_gpu) {
> + dma_fence_put(fence);
> return -EBUSY;
> + }
>
> dma_resv_add_shared_fence(bo->base.resv, fence);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-15 8:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-13 12:30 [PATCH] drm/ttm: Fix dma_fence refcnt leak when adding move fence Xiyu Yang
2020-06-15 8:55 ` Christian König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).