Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210317160840.36019-1-daniel@qtec.com>
In-Reply-To: <20210317160840.36019-1-daniel@qtec.com>
From:   Alex Deucher <alexdeucher@gmail.com>
Date:   Thu, 18 Mar 2021 22:56:53 -0400
Message-ID: <CADnq5_MRskiOaMw-p4Xdq3i3Z2fJ=J2u+8LYFk0EydhRBPeafQ@mail.gmail.com>
Subject: Re: [PATCH] drm/amdgpu/ttm: Fix memory leak userptr pages
To:     Daniel Gomez <daniel@qtec.com>
Cc:     Maling list - DRI developers <dri-devel@lists.freedesktop.org>,
        David Airlie <airlied@linux.ie>,
        Felix Kuehling <Felix.Kuehling@amd.com>,
        LKML <linux-kernel@vger.kernel.org>,
        amd-gfx list <amd-gfx@lists.freedesktop.org>,
        Likun Gao <Likun.Gao@amd.com>, dagmcr@gmail.com,
        Alex Deucher <alexander.deucher@amd.com>,
        Dave Airlie <airlied@redhat.com>,
        =?UTF-8?Q?Christian_K=C3=B6nig?= <christian.koenig@amd.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Applied.  Thanks!

Alex

On Wed, Mar 17, 2021 at 12:09 PM Daniel Gomez <daniel@qtec.com> wrote:
>
> If userptr pages have been pinned but not bounded,
> they remain uncleared.
>
> Signed-off-by: Daniel Gomez <daniel@qtec.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 9fd2157b133a..50c2b4827c13 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1162,13 +1162,13 @@ static void amdgpu_ttm_backend_unbind(struct ttm_bo_device *bdev,
>         struct amdgpu_ttm_tt *gtt = (void *)ttm;
>         int r;
>
> -       if (!gtt->bound)
> -               return;
> -
>         /* if the pages have userptr pinning then clear that first */
>         if (gtt->userptr)
>                 amdgpu_ttm_tt_unpin_userptr(bdev, ttm);
>
> +       if (!gtt->bound)
> +               return;
> +
>         if (gtt->offset == AMDGPU_BO_INVALID_OFFSET)
>                 return;
>
> --
> 2.30.2
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel