Skip to contentSkip to conversation

drm/amdgpu/userq: unmap queues amdgpu_userq_mgr_fini()

PATCH In review Alex Deucher 2 participants 3 messages Apr 16, 2025 – Apr 17, 2025

Subsystems (2)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

PATCH 1/2 drm/amdgpu/userq: unmap queues amdgpu_userq_mgr_fini()

This was missed when the map and unmap were split out of the mqd create and destroy functions.

Fixes 5b1163621548 ("drm/amdgpu/userq: rework front end call sequence")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c +3 -1
index 4f102837ac45b..b449c685302e1 100644
@@ -817,8 +817,10 @@ void amdgpu_userq_mgr_fini(struct amdgpu_userq_mgr *userq_mgr)
 	cancel_delayed_work(&userq_mgr->resume_work);
 
 	mutex_lock(&userq_mgr->userq_mutex);
-	idr_for_each_entry(&userq_mgr->userq_idr, queue, queue_id)
+	idr_for_each_entry(&userq_mgr->userq_idr, queue, queue_id) {
+		amdgpu_userqueue_unmap_helper(userq_mgr, queue);
 		amdgpu_userqueue_cleanup(userq_mgr, queue, queue_id);
+	}
 	mutex_lock(&adev->userq_mutex);
 	list_for_each_entry_safe(uqm, tmp, &adev->userq_mgr_list, list) {
 		if (uqm == userq_mgr) {
Signature · 1 line
2.49.0
author maintainer
#1 lore raw

PATCH 2/2 drm/amdgpu/userq: move waiting for last fence before umap

Need to wait for the last fence before unmapping. This also fixes a memory leak in amdgpu_userqueue_cleanup() when the fence isn't signalled.

Fixes 5b1163621548 ("drm/amdgpu/userq: rework front end call sequence")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c +15 -8
index b449c685302e1..06e41023a04ba 100644
@@ -109,22 +109,27 @@ amdgpu_userqueue_map_helper(struct amdgpu_userq_mgr *uq_mgr,
 }
 
 static void
-amdgpu_userqueue_cleanup(struct amdgpu_userq_mgr *uq_mgr,
-			 struct amdgpu_usermode_queue *queue,
-			 int queue_id)
+amdgpu_userqueue_wait_for_last_fence(struct amdgpu_userq_mgr *uq_mgr,
+				     struct amdgpu_usermode_queue *queue)
 {
 	struct amdgpu_device *adev = uq_mgr->adev;
-	const struct amdgpu_userq_funcs *uq_funcs = adev->userq_funcs[queue->queue_type];
 	struct dma_fence *f = queue->last_fence;
 	int ret;
 
 	if (f && !dma_fence_is_signaled(f)) {
 		ret = dma_fence_wait_timeout(f, true, msecs_to_jiffies(100));
-		if (ret <= 0) {
-			DRM_ERROR("Timed out waiting for fence f=%p\n", f);
-			return;
-		}
+		if (ret <= 0)
+			dev_err(adev->dev, "Timed out waiting for fence f=%p\n", f);
 	}
+}
+
+static void
+amdgpu_userqueue_cleanup(struct amdgpu_userq_mgr *uq_mgr,
+			 struct amdgpu_usermode_queue *queue,
+			 int queue_id)
+{
+	struct amdgpu_device *adev = uq_mgr->adev;
+	const struct amdgpu_userq_funcs *uq_funcs = adev->userq_funcs[queue->queue_type];
 
 	uq_funcs->mqd_destroy(uq_mgr, queue);
 	queue->fence_drv->fence_drv_xa_ptr = NULL;
@@ -330,6 +335,7 @@ amdgpu_userqueue_destroy(struct drm_file *filp, int queue_id)
 		mutex_unlock(&uq_mgr->userq_mutex);
 		return -EINVAL;
 	}
+	amdgpu_userqueue_wait_for_last_fence(uq_mgr, queue);
 	r = amdgpu_userqueue_unmap_helper(uq_mgr, queue);
 	amdgpu_bo_unpin(queue->db_obj.obj);
 	amdgpu_bo_unref(&queue->db_obj.obj);
@@ -818,6 +824,7 @@ void amdgpu_userq_mgr_fini(struct amdgpu_userq_mgr *userq_mgr)
 
 	mutex_lock(&userq_mgr->userq_mutex);
 	idr_for_each_entry(&userq_mgr->userq_idr, queue, queue_id) {
+		amdgpu_userqueue_wait_for_last_fence(userq_mgr, queue);
 		amdgpu_userqueue_unmap_helper(userq_mgr, queue);
 		amdgpu_userqueue_cleanup(userq_mgr, queue, queue_id);
 	}
Signature · 1 line
2.49.0
#2 lore raw

RE: [PATCH 2/2] drm/amdgpu/userq: move waiting for last fence before umap

[Public]

Series is Reviewed-by: Prike Liang <[email protected]>

Regards,
Prike

Quoted 79 lines

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Thursday, April 17, 2025 2:47 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu/userq: move waiting for last fence before umap

Need to wait for the last fence before unmapping. This also fixes a memory leak in amdgpu_userqueue_cleanup() when the fence isn't signalled.

Fixes 5b1163621548 ("drm/amdgpu/userq: rework front end call sequence")
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c +14 -8
index b449c685302e1..06e41023a04ba 100644
@@ -109,22 +109,27 @@ amdgpu_userqueue_map_helper(struct
 amdgpu_userq_mgr *uq_mgr,  }
 
 static void
-amdgpu_userqueue_cleanup(struct amdgpu_userq_mgr *uq_mgr,
-                      struct amdgpu_usermode_queue *queue,
-                      int queue_id)
+amdgpu_userqueue_wait_for_last_fence(struct amdgpu_userq_mgr *uq_mgr,
+                                  struct amdgpu_usermode_queue *queue)
 {
      struct amdgpu_device *adev = uq_mgr->adev;
-     const struct amdgpu_userq_funcs *uq_funcs = adev->userq_funcs[queue-
 >queue_type];
      struct dma_fence *f = queue->last_fence;
      int ret;
 
      if (f && !dma_fence_is_signaled(f)) {
              ret = dma_fence_wait_timeout(f, true, msecs_to_jiffies(100));
-             if (ret <= 0) {
-                     DRM_ERROR("Timed out waiting for fence f=%p\n", f);
-                     return;
-             }
+             if (ret <= 0)
+                     dev_err(adev->dev, "Timed out waiting for fence f=%p\n", f);
      }
+}
+
+static void
+amdgpu_userqueue_cleanup(struct amdgpu_userq_mgr *uq_mgr,
+                      struct amdgpu_usermode_queue *queue,
+                      int queue_id)
+{
+     struct amdgpu_device *adev = uq_mgr->adev;
+     const struct amdgpu_userq_funcs *uq_funcs =
+adev->userq_funcs[queue->queue_type];
 
      uq_funcs->mqd_destroy(uq_mgr, queue);
      queue->fence_drv->fence_drv_xa_ptr = NULL; @@ -330,6 +335,7 @@

amdgpu_userqueue_destroy(struct drm_file *filp, int queue_id)

              mutex_unlock(&uq_mgr->userq_mutex);
              return -EINVAL;
      }
drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c +2 -0
+     amdgpu_userqueue_wait_for_last_fence(uq_mgr, queue);
      r = amdgpu_userqueue_unmap_helper(uq_mgr, queue);
      amdgpu_bo_unpin(queue->db_obj.obj);
      amdgpu_bo_unref(&queue->db_obj.obj);
@@ -818,6 +824,7 @@ void amdgpu_userq_mgr_fini(struct amdgpu_userq_mgr
 *userq_mgr)
 
      mutex_lock(&userq_mgr->userq_mutex);
      idr_for_each_entry(&userq_mgr->userq_idr, queue, queue_id) {
+             amdgpu_userqueue_wait_for_last_fence(userq_mgr, queue);
              amdgpu_userqueue_unmap_helper(userq_mgr, queue);
              amdgpu_userqueue_cleanup(userq_mgr, queue, queue_id);
      }

--
2.49.0