From: "Christian König" <christian.koenig@amd.com>
To: Philip Yang <Philip.Yang@amd.com>, amd-gfx@lists.freedesktop.org
Cc: Felix.Kuehling@amd.com, Gang.Ba@amd.com
Subject: Re: [PATCH] drm/amdgpu: Don't clear PT after process killed
Date: Fri, 31 Oct 2025 08:42:10 +0100 [thread overview]
Message-ID: <a901ee14-81ce-4cfd-bdde-21eeb57fb965@amd.com> (raw)
In-Reply-To: <20251030190125.15969-1-Philip.Yang@amd.com>
On 10/30/25 20:01, Philip Yang wrote:
> Move amdgpu_vm_ready check to inside amdgpu_vm_clear_freed, this removes
> the duplicate code, also removes the error message "*ERROR* Trying to
> push to a killed entity" when KFD release wq unmap_bo_from_gpuvm to
> unmap outstanding BOs if using SDMA update page table.
In general good idea to have that fixed, but the ready check should stay outside of amdgpu_vm_clear_freed().
Background is that there are more operations than only clearling the freed covered by this check.
Regards,
Christian.
>
> Suggested-by: Christian König <christian.koenig@amd.com>
> Signed-off-by: Philip Yang <Philip.Yang@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 9 ++-------
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 ++
> 3 files changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index ecdfe6cb36cc..6e1a5b922eb1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -1116,9 +1116,6 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p)
> }
> }
>
> - if (!amdgpu_vm_ready(vm))
> - return -EINVAL;
> -
> r = amdgpu_vm_clear_freed(adev, vm, NULL);
> if (r)
> return r;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index ce073e894584..f6c297d62cfe 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -373,11 +373,9 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj,
>
> amdgpu_vm_bo_del(adev, bo_va);
> amdgpu_vm_bo_update_shared(bo);
> - if (!amdgpu_vm_ready(vm))
> - goto out_unlock;
>
> r = amdgpu_vm_clear_freed(adev, vm, &fence);
> - if (unlikely(r < 0))
> + if (unlikely(r < 0 && r != -EINVAL))
> dev_err(adev->dev, "failed to clear page "
> "tables on GEM object close (%ld)\n", r);
> if (r || !fence)
> @@ -387,7 +385,7 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj,
> dma_fence_put(fence);
>
> out_unlock:
> - if (r)
> + if (r && r != -EINVAL)
> dev_err(adev->dev, "leaking bo va (%ld)\n", r);
> drm_exec_fini(&exec);
> }
> @@ -766,9 +764,6 @@ amdgpu_gem_va_update_vm(struct amdgpu_device *adev,
> struct dma_fence *fence = dma_fence_get_stub();
> int r;
>
> - if (!amdgpu_vm_ready(vm))
> - return fence;
> -
> r = amdgpu_vm_clear_freed(adev, vm, &fence);
> if (r)
> goto error;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index db66b4232de0..febdd1b4286c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -1543,6 +1543,8 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev,
> struct amdgpu_sync sync;
> int r;
>
> + if (!amdgpu_vm_ready(vm))
> + return -EINVAL;
>
> /*
> * Implicitly sync to command submissions in the same VM before
next prev parent reply other threads:[~2025-10-31 7:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-30 19:01 [PATCH] drm/amdgpu: Don't clear PT after process killed Philip Yang
2025-10-31 7:42 ` Christian König [this message]
2025-10-31 13:33 ` Philip Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a901ee14-81ce-4cfd-bdde-21eeb57fb965@amd.com \
--to=christian.koenig@amd.com \
--cc=Felix.Kuehling@amd.com \
--cc=Gang.Ba@amd.com \
--cc=Philip.Yang@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox