On Fri, Sep 12, 2025 at 2:04 AM Prike Liang <prike.li...@amd.com> wrote:
>
> It requires validating the userq VA whether is mapped before
> trying to resume the queue.
>
> Signed-off-by: Prike Liang <prike.li...@amd.com>
> Reviewed-by: Christian König <christian.koe...@amd.com>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 24 +++++++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 1 +
> 2 files changed, 25 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> index 957b26ca2eb7..a13f186f0a8a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
> @@ -115,6 +115,23 @@ bool amdgpu_userq_buffer_va_mapped(struct amdgpu_vm *vm,
> u64 addr)
> return r;
> }
>
> +bool amdgpu_userq_buffer_vas_mapped(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_mapped(queue->vm,
> va_cursor->gpu_addr);
> + dev_dbg(queue->userq_mgr->adev->dev, "validate the userq
> mapping: %p va:%llx r:%d\n",
> + queue, va_cursor->gpu_addr, r);
> + }
> +
> + if (r != 0)
> + return true;
> +
> + return false;
> +}
> +
> int amdgpu_userq_buffer_va_put(struct amdgpu_vm *vm,
> u64 addr)
> {
> @@ -772,6 +789,13 @@ amdgpu_userq_restore_all(struct amdgpu_userq_mgr *uq_mgr)
>
> /* Resume all the queues for this process */
> idr_for_each_entry(&uq_mgr->userq_idr, queue, queue_id) {
> +
> + if (!amdgpu_userq_buffer_vas_mapped(queue)) {
> + drm_file_err(uq_mgr->file, "trying restore queue
> without va mappping\n");
> + queue->state = AMDGPU_USERQ_STATE_INVALID_VA;
> + continue;
> + }
> +
> r = amdgpu_userq_map_helper(uq_mgr, queue);
> if (r)
> ret = r;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> index b71fff65a896..8cd307be7256 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h
> @@ -156,4 +156,5 @@ 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);
> +bool amdgpu_userq_buffer_vas_mapped(struct amdgpu_usermode_queue *queue);
> #endif
> --
> 2.34.1
>
