Re: [PATCH] drm/radeon/ttm: Fix memory leak userptr pages

Alex Deucher
2021-03-19T02:58:47Z

Applied. Thanks!

Alex

On Thu, Mar 18, 2021 at 5:00 AM Koenig, Christian
<Christian.Koenig@amd.com> wrote:
>
> Reviewed-by: Christian König <christian.koenig@amd.com>
> ________________________________
> Von: Daniel Gomez <daniel@qtec.com>
> Gesendet: Donnerstag, 18. März 2021 09:32
> Cc: dagmcr@gmail.com <dagmcr@gmail.com>; Daniel Gomez <daniel@qtec.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com>; David Airlie <airlied@linux.ie>; Daniel Vetter <daniel@ffwll.ch>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>; linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
> Betreff: [PATCH] drm/radeon/ttm: Fix memory leak userptr pages
>
> If userptr pages have been pinned but not bounded,
> they remain uncleared.
>
> Signed-off-by: Daniel Gomez <daniel@qtec.com>
> ---
> drivers/gpu/drm/radeon/radeon_ttm.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index e8c66d10478f..bbcc6264d48f 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -485,13 +485,14 @@ static void radeon_ttm_backend_unbind(struct ttm_bo_device *bdev, struct ttm_tt
> struct radeon_ttm_tt *gtt = (void *)ttm;
> struct radeon_device *rdev = radeon_get_rdev(bdev);
>
> + if (gtt->userptr)
> + radeon_ttm_tt_unpin_userptr(bdev, ttm);
> +
> if (!gtt->bound)
> return;
>
> radeon_gart_unbind(rdev, gtt->offset, ttm->num_pages);
>
> - if (gtt->userptr)
> - radeon_ttm_tt_unpin_userptr(bdev, ttm);
> gtt->bound = false;
> }
>
> --
> 2.30.2
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel