On Fri, Sep 12, 2025 at 2:04 AM Prike Liang <prike.li...@amd.com> wrote:
>
> Track the userq obj for its life time, and reference and
> dereference the buffer flag at its creating and destroying
> period.
>
> Suggested-by: Alex Deucher <alexander.deuc...@amd.com>
> Signed-off-by: Prike Liang <prike.li...@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 18 ++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 2 ++
> 2 files changed, 20 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> index 19a400bd4be1..cdcab71248d6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> @@ -138,6 +138,22 @@ int amdgpu_userq_buffer_va_put(struct amdgpu_vm *vm,
> return -EINVAL;
> }
>
> +int amdgpu_userq_buffer_vas_put(struct amdgpu_device *adev,
This can be static as it's not used outside this file. Additionally,
I think the name is confusing. It's just cleaning up the list. I'd
suggest either renaming it to amdgpu_userq_buffer_vas_list_cleanup()
or just open coding it directly in the caller.
Alex
> + struct amdgpu_usermode_queue *queue)
> +{
> + struct amdgpu_userq_va_cursor *va_cursor, *tmp;
> + int r;
> +
> + list_for_each_entry_safe(va_cursor, tmp, &queue->userq_va_list, list)
> {
> + r += amdgpu_userq_buffer_va_put(queue->vm,
> va_cursor->gpu_addr);
> + dev_dbg(adev->dev, "put the userq:%p va:%llx r:%d\n",
> + queue, va_cursor->gpu_addr, r);
> + list_del(&va_cursor->list);
> + kfree(va_cursor);
> + }
> + return r;
> +}
> +
> static int
> amdgpu_userq_unmap_helper(struct amdgpu_userq_mgr *uq_mgr,
> struct amdgpu_usermode_queue *queue)
> @@ -200,6 +216,8 @@ amdgpu_userq_cleanup(struct amdgpu_userq_mgr *uq_mgr,
> struct amdgpu_device *adev = uq_mgr->adev;
> const struct amdgpu_userq_funcs *uq_funcs =
> adev->userq_funcs[queue->queue_type];
>
> + /* Drop the userq reference. */
> + amdgpu_userq_buffer_vas_put(adev, queue);
> uq_funcs->mqd_destroy(uq_mgr, queue);
> amdgpu_userq_fence_driver_free(queue);
> idr_remove(&uq_mgr->userq_idr, queue_id);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> index e4c2d7cabd15..b71fff65a896 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> @@ -154,4 +154,6 @@ int amdgpu_userq_buffer_va_get(struct
> amdgpu_usermode_queue *queue,
> struct amdgpu_bo_va_mapping *va_map, u64 addr);
> bool amdgpu_userq_buffer_va_mapped(struct amdgpu_vm *vm, u64 addr);
> int amdgpu_userq_buffer_va_put(struct amdgpu_vm *vm, u64 addr);
> +int amdgpu_userq_buffer_vas_put(struct amdgpu_device *adev,
> + struct amdgpu_usermode_queue *queue);
> #endif
> --
> 2.34.1
>
