From: Alex Deucher <[email protected]> Query the status of the user queue, currently whether the queue is hung and whether or not VRAM is lost.
v2: Misc cleanups Reviewed-by: Prike Liang <[email protected]> Reviewed-by: Sunil Khatri <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Prike Liang <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 37 ++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 1 + include/uapi/drm/amdgpu_drm.h | 2 ++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c index d7cda252cae9..f477e2270724 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c @@ -610,6 +610,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) queue->queue_type = args->in.ip_type; queue->vm = &fpriv->vm; queue->priority = priority; + queue->generation = amdgpu_vm_generation(adev, &fpriv->vm); db_info.queue_type = queue->queue_type; db_info.doorbell_handle = queue->doorbell_handle; @@ -699,6 +700,36 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) return r; } +static int +amdgpu_userq_query_status(struct drm_file *filp, union drm_amdgpu_userq *args) +{ + struct amdgpu_fpriv *fpriv = filp->driver_priv; + struct amdgpu_userq_mgr *uq_mgr = &fpriv->userq_mgr; + struct amdgpu_device *adev = uq_mgr->adev; + struct amdgpu_usermode_queue *queue; + int queue_id = args->in.queue_id; + + mutex_lock(&uq_mgr->userq_mutex); + + queue = amdgpu_userq_find(uq_mgr, queue_id); + if (!queue) { + dev_dbg(adev->dev, "Invalid queue id to query\n"); + mutex_unlock(&uq_mgr->userq_mutex); + return -EINVAL; + } + args->out_qs.flags = 0; + if (queue->state == AMDGPU_USERQ_STATE_HUNG) + args->out_qs.flags |= AMDGPU_USERQ_QUERY_STATUS_FLAGS_HUNG; + if (queue->generation != amdgpu_vm_generation(adev, &fpriv->vm)) + args->out_qs.flags |= AMDGPU_USERQ_QUERY_STATUS_FLAGS_VRAMLOST; + + if (queue->state == AMDGPU_USERQ_STATE_INVALID_VA) + args->out_qs.flags |= AMDGPU_USERQ_QUERY_STATUS_FLAGS_INVALID_VA; + mutex_unlock(&uq_mgr->userq_mutex); + + return 0; +} + static int amdgpu_userq_input_args_validate(struct drm_device *dev, union drm_amdgpu_userq *args, struct drm_file *filp) @@ -779,7 +810,11 @@ int amdgpu_userq_ioctl(struct drm_device *dev, void *data, if (r) drm_file_err(filp, "Failed to destroy usermode queue\n"); break; - + case AMDGPU_USERQ_OP_QUERY_STATUS: + r = amdgpu_userq_query_status(filp, args); + if (r) + drm_file_err(filp, "Failed to query usermode queue status\n"); + break; default: drm_dbg_driver(dev, "Invalid user queue op specified: %d\n", args->in.op); return -EINVAL; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h index 7bbbb5988fc7..e0ca466681f3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h @@ -74,6 +74,7 @@ struct amdgpu_usermode_queue { struct dentry *debugfs_queue; struct list_head userq_va_list; + uint64_t generation; }; struct amdgpu_userq_funcs { diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h index 871e0f56d61e..100ccee37d5c 100644 --- a/include/uapi/drm/amdgpu_drm.h +++ b/include/uapi/drm/amdgpu_drm.h @@ -352,6 +352,8 @@ union drm_amdgpu_ctx { #define AMDGPU_USERQ_QUERY_STATUS_FLAGS_HUNG (1 << 0) /* indicate vram lost since queue was created */ #define AMDGPU_USERQ_QUERY_STATUS_FLAGS_VRAMLOST (1 << 1) +/* the invalid userq VA unmapped */ +#define AMDGPU_USERQ_QUERY_STATUS_FLAGS_INVALID_VA (1 << 2) /* * This structure is a container to pass input configuration -- 2.34.1
