Commit 4b274063 authored by Arunpravin Paneer Selvam's avatar Arunpravin Paneer Selvam Committed by Alex Deucher
Browse files

drm/amdgpu: Add queue id support to the user queue wait IOCTL 

Add queue id support to the user queue wait IOCTL
drm_amdgpu_userq_wait structure.

This is required to retrieve the wait user queue and maintain
the fence driver references in it so that the user queue in
the same context releases their reference to the fence drivers
at some point before queue destruction.

Otherwise, we would gather those references until we
don't have any more space left and crash.

v2: Modify the UAPI comment as per the mesa and libdrm UAPI comment.

Libdrm MR: https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/408
Mesa MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34493



Signed-off-by: default avatarArunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4ec2141d

drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c

+12 −8
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ int amdgpu_userq_fence_driver_alloc(struct amdgpu_device *adev, 
	spin_lock_init(&fence_drv->fence_list_lock);



	fence_drv->adev = adev;

	fence_drv->fence_drv_xa_ptr = &userq->fence_drv_xa;

	fence_drv->context = dma_fence_context_alloc(1);

	get_task_comm(fence_drv->timeline_name, current);
@@ -611,6 +610,9 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void *data, 
	u32 num_syncobj, num_read_bo_handles, num_write_bo_handles;

	struct drm_amdgpu_userq_fence_info *fence_info = NULL;

	struct drm_amdgpu_userq_wait *wait_info = data;

	struct amdgpu_fpriv *fpriv = filp->driver_priv;

	struct amdgpu_userq_mgr *userq_mgr = &fpriv->userq_mgr;

	struct amdgpu_usermode_queue *waitq;

	struct drm_gem_object **gobj_write;

	struct drm_gem_object **gobj_read;

	struct dma_fence **fences = NULL;
@@ -860,6 +862,10 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void *data, 
			fences[num_fences++] = fence;

		}



		waitq = idr_find(&userq_mgr->userq_idr, wait_info->waitq_id);

		if (!waitq)

			goto free_fences;



		for (i = 0, cnt = 0; i < num_fences; i++) {

			struct amdgpu_userq_fence_driver *fence_drv;

			struct amdgpu_userq_fence *userq_fence;
@@ -888,14 +894,12 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void *data, 
			 * Otherwise, we would gather those references until we don't

			 * have any more space left and crash.

			 */

			if (fence_drv->fence_drv_xa_ptr) {

				r = xa_alloc(fence_drv->fence_drv_xa_ptr, &index, fence_drv,

			r = xa_alloc(&waitq->fence_drv_xa, &index, fence_drv,

				     xa_limit_32b, GFP_KERNEL);

			if (r)

				goto free_fences;



			amdgpu_userq_fence_driver_get(fence_drv);

			}



			/* Store drm syncobj's gpu va address and value */

			fence_info[cnt].va = fence_drv->va;

drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.h

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ struct amdgpu_userq_fence_driver { 
	spinlock_t fence_list_lock;

	struct list_head fences;

	struct amdgpu_device *adev;

	struct xarray *fence_drv_xa_ptr;

	char timeline_name[TASK_COMM_LEN];

};

drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ amdgpu_userqueue_cleanup(struct amdgpu_userq_mgr *uq_mgr, 
	}



	uq_funcs->mqd_destroy(uq_mgr, queue);

	queue->fence_drv->fence_drv_xa_ptr = NULL;

	amdgpu_userq_fence_driver_free(queue);

	idr_remove(&uq_mgr->userq_idr, queue_id);

	kfree(queue);

include/uapi/drm/amdgpu_drm.h

+6 −0
Original line number Diff line number Diff line
@@ -515,6 +515,12 @@ struct drm_amdgpu_userq_fence_info { 
};



struct drm_amdgpu_userq_wait {

	/**

	 * @waitq_id: Queue handle used by the userq wait IOCTL to retrieve the

	 * wait queue and maintain the fence driver references in it.

	 */

	__u32	waitq_id;

	__u32	pad;

	/**

	 * @syncobj_handles: The list of syncobj handles submitted by the user queue

	 * job to get the va/value pairs.