Never take root bo reservation locks with
Subsystems (2)
v2 cover Never take root bo reservation locks with
v1: Fixes the locks issue in all the places where userq_mutex is taken and then vm->root.bo reservation lock is next.
v2: Fix the minor comment on the patches.
Sunil Khatri (4):
drm/amdgpu/userq: dont look root bo with userq_mutex held drm/amdgpu/userq: create_mqd does not need userq_mutex drm/amdgpu/userq: caller to take reserv lock for
amdgpu_userq_buffer_vas_list_cleanup
drm/amdgpu/userq: hold reservation lock in caller of
amdgpu_userq_input_va_validate
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 77 +++++++++++++--------- drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 23 +++++++ 2 files changed, 69 insertions(+), 31 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/4 drm/amdgpu/userq: dont lock root bo with userq_mutex held
Do not hold reservation lock for root bo if userq_mutex is already held in the call flow this cause a lock issue with ttm_bo_delayed_delete.
Its better to lock the vm->root.bo first and then go ahead with userq_mutex so userq_mutex threads dont get stuck until the reservation lock is held.
In this case it helps in the function amdgpu_userq_buffer_vas_mapped for each queue during restore_all.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +8 -3
@@ -270,15 +270,13 @@ static bool amdgpu_userq_buffer_va_mapped(struct amdgpu_vm *vm, u64 addr)struct amdgpu_bo_va_mapping *mapping;bool r; -if (amdgpu_bo_reserve (vm->root.bo, false)) -return false; +dma_resv_assert_held (vm->root.bo->tbo.base.resv); mapping =amdgpu_vm_bo_lookup_mapping (vm, addr);if (!IS_ERR_OR_NULL (mapping) &&atomic_read (&mapping->bo_va->userq_va_mapped)) r = true;else r = false; -amdgpu_bo_unreserve (vm->root.bo);return r; }
@@ -991,10 +989,16 @@ int amdgpu_userq_ioctl(struct drm_device *dev, void *data,static int amdgpu_userq_restore_all (struct amdgpu_userq_mgr *uq_mgr) { +struct amdgpu_fpriv *fpriv =uq_mgr_to_fpriv (uq_mgr); +struct amdgpu_vm *vm = &fpriv->vm;struct amdgpu_usermode_queue *queue;unsigned long queue_id;int ret =0 , r; + +if (amdgpu_bo_reserve (vm->root.bo, false)) +return false; +mutex_lock (&uq_mgr->userq_mutex);/* Resume all the queues for this process */ xa_for_each (&uq_mgr->userq_xa, queue_id, queue) {
@@ -1012,6 +1016,7 @@ amdgpu_userq_restore_all(struct amdgpu_userq_mgr *uq_mgr) }mutex_unlock (&uq_mgr->userq_mutex); +amdgpu_bo_unreserve (vm->root.bo);if (ret) drm_file_err(uq_mgr->file,
Signature · 1 line
2.34.1
PATCH v2 2/4 drm/amdgpu/userq: create_mqd does not need userq_mutex
In reply to Sunil KhatriReshuffle the code to run create_mqd outside the mutex. code here is mostly setting up software structure init before actually registering the userqueue in the xa and to the driver.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +7 -9
@@ -793,14 +793,14 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) goto clean_mapping; } -amdgpu_userq_ensure_ev_fence (&fpriv->userq_mgr, &fpriv->evf_mgr); - r = uq_funcs->mqd_create (queue, &args->in);if (r) {drm_file_err (uq_mgr->file,"Failed to create Queue\n" ); goto clean_fence_driver; } +amdgpu_userq_ensure_ev_fence (&fpriv->userq_mgr, &fpriv->evf_mgr); +/* don't map the queue if scheduling is halted */ if (adev->userq_halt_for_enforce_isolation && ((queue->queue_type == AMDGPU_HW_IP_GFX) ||
@@ -812,7 +812,6 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) r =amdgpu_userq_map_helper (queue);if (r) {drm_file_err (uq_mgr->file,"Failed to map Queue\n" ); -down_read (&adev->reset_domain->sem); goto clean_mqd; } }
@@ -828,9 +827,8 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)if (r) {if (!skip_map_queue)amdgpu_userq_unmap_helper (queue); - r = -ENOMEM ; - goto clean_mqd; + goto clean_reset_domain; } r =xa_err (xa_store_irq (&adev->userq_doorbell_xa, index, queue,GFP_KERNEL ));
@@ -838,8 +836,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)xa_erase (&uq_mgr->userq_xa, qid);if (!skip_map_queue)amdgpu_userq_unmap_helper (queue); - - goto clean_mqd; + goto clean_reset_domain; }up_read (&adev->reset_domain->sem);
@@ -851,12 +848,13 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)mutex_unlock (&uq_mgr->userq_mutex);return 0 ; +clean_reset_domain: +up_read (&adev->reset_domain->sem); clean_mqd: +mutex_unlock (&uq_mgr->userq_mutex); uq_funcs->mqd_destroy (queue); -up_read (&adev->reset_domain->sem); clean_fence_driver:amdgpu_userq_fence_driver_free (queue); -mutex_unlock (&uq_mgr->userq_mutex); clean_mapping:amdgpu_userq_buffer_vas_list_cleanup (adev, queue);kfree (queue);
Signature · 1 line
2.34.1
PATCH v2 3/4 drm/amdgpu/userq: caller to take reserv lock for vas_list_cleanup
In reply to Sunil KhatriIn function amdgpu_userq_buffer_vas_list_cleanup, remove the reservation lock for vm and caller should make sure it's taken before locking userq_mutex.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 30 ++++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +18 -12
@@ -312,25 +312,21 @@ static int amdgpu_userq_buffer_vas_list_cleanup(struct amdgpu_device *adev, {struct amdgpu_userq_va_cursor *va_cursor, *tmp;struct amdgpu_bo_va_mapping *mapping; -int r; - r =amdgpu_bo_reserve (queue->vm->root.bo, false); -if (r) -return r; +/* Caller must hold vm->root.bo reservation */ +dma_resv_assert_held (queue->vm->root.bo->tbo.base.resv);list_for_each_entry_safe (va_cursor, tmp, &queue->userq_va_list, list) { mapping =amdgpu_vm_bo_lookup_mapping (queue->vm, va_cursor->gpu_addr);if (!mapping) { - r = -EINVAL ; - goto err; +return -EINVAL ; }dev_dbg (adev->dev,"delete the userq:%p va:%llx\n" , queue, va_cursor->gpu_addr);amdgpu_userq_buffer_va_list_del (mapping, va_cursor); } -err: -amdgpu_bo_unreserve (queue->vm->root.bo); -return r; + +return 0 ; }static int amdgpu_userq_preempt_helper (struct amdgpu_usermode_queue *queue)
@@ -444,8 +440,6 @@ static void amdgpu_userq_cleanup(struct amdgpu_usermode_queue *queue)/* Wait for mode-1 reset to complete */ down_read (&adev->reset_domain->sem); -/* Drop the userq reference. */ -amdgpu_userq_buffer_vas_list_cleanup (adev, queue); uq_funcs->mqd_destroy (queue);/* Use interrupt-safe locking since IRQ handlers may access these XArrays */ xa_erase_irq (&adev->userq_doorbell_xa, queue->doorbell_index);
@@ -626,6 +620,9 @@ static int amdgpu_userq_destroy(struct amdgpu_userq_mgr *uq_mgr, struct amdgpu_usermode_queue *queue) { struct amdgpu_device *adev = uq_mgr->adev; +struct amdgpu_fpriv *fpriv =uq_mgr_to_fpriv (uq_mgr); +struct amdgpu_vm *vm = &fpriv->vm; +int r =0 ;cancel_delayed_work_sync (&uq_mgr->resume_work);
@@ -633,6 +630,14 @@ amdgpu_userq_destroy(struct amdgpu_userq_mgr *uq_mgr, struct amdgpu_usermode_que/* Cancel any pending hang detection work and cleanup */ cancel_delayed_work_sync (&queue->hang_detect_work); + r =amdgpu_bo_reserve (vm->root.bo, false); +if (r) { +drm_file_err (uq_mgr->file,"Failed to reserve root bo during userqueue destroy\n" ); +return r; + } +amdgpu_userq_buffer_vas_list_cleanup (adev, queue); +amdgpu_bo_unreserve (vm->root.bo); +mutex_lock (&uq_mgr->userq_mutex); queue->hang_detect_fence =NULL ;amdgpu_userq_wait_for_last_fence (queue);
@@ -664,7 +669,6 @@ amdgpu_userq_destroy(struct amdgpu_userq_mgr *uq_mgr, struct amdgpu_usermode_que }amdgpu_userq_cleanup (queue);mutex_unlock (&uq_mgr->userq_mutex); -pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);return r;
@@ -856,7 +860,9 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) clean_fence_driver:amdgpu_userq_fence_driver_free (queue); clean_mapping: +amdgpu_bo_reserve (fpriv->vm.root.bo, true);amdgpu_userq_buffer_vas_list_cleanup (adev, queue); +amdgpu_bo_unreserve (fpriv->vm.root.bo);kfree (queue);return r; }
Signature · 1 line
2.34.1
PATCH v2 4/4 drm/amdgpu/userq: hold root bo lock in caller of input_va_validate
In reply to Sunil KhatriCaller should hold the reservation lock for root.bo in func amdgpu_userq_input_va_validate.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 17 +++++++++++------ drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 21 +++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +11 -6
@@ -239,13 +239,12 @@ int amdgpu_userq_input_va_validate(struct amdgpu_device *adev,u64 size;int r =0 ; +/* Caller must hold vm->root.bo reservation */ +dma_resv_assert_held (queue->vm->root.bo->tbo.base.resv); + user_addr = (addr &AMDGPU_GMC_HOLE_MASK ) >>AMDGPU_GPU_PAGE_SHIFT ; size = expected_size >>AMDGPU_GPU_PAGE_SHIFT ; - r =amdgpu_bo_reserve (vm->root.bo, false); -if (r) -return r; - va_map =amdgpu_vm_bo_lookup_mapping (vm, user_addr);if (!va_map) { r = -EINVAL ;
@@ -255,13 +254,11 @@ int amdgpu_userq_input_va_validate(struct amdgpu_device *adev,if (user_addr >= va_map->start && va_map->last - user_addr +1 >= size) {amdgpu_userq_buffer_va_list_add (queue, va_map, user_addr); -amdgpu_bo_unreserve (vm->root.bo);return 0 ; } r = -EINVAL ; out_err: -amdgpu_bo_unreserve (vm->root.bo);return r; }
@@ -773,13 +770,20 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args) db_info.doorbell_offset = args->in.doorbell_offset; queue->userq_mgr = uq_mgr; +/* Validate the userq virtual address.*/ + r =amdgpu_bo_reserve (fpriv->vm.root.bo, false); +if (r) + goto free_queue; +if (amdgpu_userq_input_va_validate (adev, queue, args->in.queue_va, args->in.queue_size) ||amdgpu_userq_input_va_validate (adev, queue, args->in.rptr_va,AMDGPU_GPU_PAGE_SIZE ) ||amdgpu_userq_input_va_validate (adev, queue, args->in.wptr_va,AMDGPU_GPU_PAGE_SIZE )) { r = -EINVAL ; +amdgpu_bo_unreserve (fpriv->vm.root.bo); goto clean_mapping; } +amdgpu_bo_unreserve (fpriv->vm.root.bo);/* Convert relative doorbell offset into absolute doorbell index */ index =amdgpu_userq_get_doorbell_index (uq_mgr, &db_info, filp);
@@ -863,6 +867,7 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)amdgpu_bo_reserve (fpriv->vm.root.bo, true);amdgpu_userq_buffer_vas_list_cleanup (adev, queue);amdgpu_bo_unreserve (fpriv->vm.root.bo); +free_queue:kfree (queue);return r; }
drivers/gpu/drm/amd/amdgpu/mes_userqueue.c +21 -0
@@ -322,8 +322,14 @@ static int mes_userq_mqd_create(struct amdgpu_usermode_queue *queue, goto free_mqd; } + r =amdgpu_bo_reserve (queue->vm->root.bo, false); +if (r) { +kfree (compute_mqd); + goto free_mqd; + } r =amdgpu_userq_input_va_validate (adev, queue, compute_mqd->eop_va,2048 ); +amdgpu_bo_unreserve (queue->vm->root.bo);if (r) {kfree (compute_mqd); goto free_mqd;
@@ -365,14 +371,22 @@ static int mes_userq_mqd_create(struct amdgpu_usermode_queue *queue, userq_props->tmz_queue = mqd_user->flags &AMDGPU_USERQ_CREATE_FLAGS_QUEUE_SECURE ; + r =amdgpu_bo_reserve (queue->vm->root.bo, false); +if (r) { +kfree (mqd_gfx_v11); + goto free_mqd; + } r =amdgpu_userq_input_va_validate (adev, queue, mqd_gfx_v11->shadow_va, shadow_info.shadow_size);if (r) { +amdgpu_bo_unreserve (queue->vm->root.bo);kfree (mqd_gfx_v11); goto free_mqd; } + r =amdgpu_userq_input_va_validate (adev, queue, mqd_gfx_v11->csa_va, shadow_info.csa_size); +amdgpu_bo_unreserve (queue->vm->root.bo);if (r) {kfree (mqd_gfx_v11); goto free_mqd;
@@ -394,8 +408,15 @@ static int mes_userq_mqd_create(struct amdgpu_usermode_queue *queue, r = -ENOMEM ; goto free_mqd; } + + r =amdgpu_bo_reserve (queue->vm->root.bo, false); +if (r) { +kfree (mqd_sdma_v11); + goto free_mqd; + } r =amdgpu_userq_input_va_validate (adev, queue, mqd_sdma_v11->csa_va,32 ); +amdgpu_bo_unreserve (queue->vm->root.bo);if (r) {kfree (mqd_sdma_v11); goto free_mqd;
Signature · 1 line
2.34.1