[PATCH v5 6/9] drm/amdgpu: track the userq bo va for its obj management

[Prike Liang]

The user queue object destroy requires ensuring its
VA keeps mapping prior to the queue being destroyed.
Otherwise, it seems a bug in the user space or VA
freed wrongly, and the kernel driver should report an
invalidated error to the user IOCLT request.

Signed-off-by: Prike Liang <prike.li...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index 9841a0b09fde..25a35ab7395b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -515,12 +515,24 @@ amdgpu_userq_destroy(struct drm_file *filp, int queue_id)
                amdgpu_bo_unpin(queue->db_obj.obj);
                amdgpu_bo_unreserve(queue->db_obj.obj);
        }
+
+       /*
+        * At this point the userq obj va should be mapped,
+        * otherwise will return error to user.
+        */
+       if (!amdgpu_userq_buffer_vas_mapped(&fpriv->vm, queue)) {
+               drm_warn(adev_to_drm(uq_mgr->adev), "the userq obj va shouldn't 
be umapped here\n");
+               r = -EINVAL;
+       }
+
        r = amdgpu_userq_unmap_helper(uq_mgr, queue);
        /*TODO: It requires a reset for userq hw unmap error*/
        if (unlikely(r != AMDGPU_USERQ_STATE_UNMAPPED)) {
                drm_warn(adev_to_drm(uq_mgr->adev), "trying to destroy a HW 
mapping userq\n");
                r = -ETIMEDOUT;
        }
+
+       amdgpu_userq_buffer_vas_put(&fpriv->vm, queue);
        amdgpu_userq_cleanup(uq_mgr, queue, queue_id);
        mutex_unlock(&uq_mgr->userq_mutex);
 
@@ -641,6 +653,9 @@ amdgpu_userq_create(struct drm_file *filp, union 
drm_amdgpu_userq *args)
                goto unlock;
        }
 
+       /* refer to the userq objects vm bo*/
+       amdgpu_userq_buffer_vas_get(queue->vm, queue);
+
        qid = idr_alloc(&uq_mgr->userq_idr, queue, 1, AMDGPU_MAX_USERQ_COUNT, 
GFP_KERNEL);
        if (qid < 0) {
                drm_file_err(uq_mgr->file, "Failed to allocate a queue id\n");
-- 
2.34.1