drm/amdgpu: reject mapping a reserved doorbell to a new queue
Subsystems (2)
PATCH 1/1 drm/amdgpu: reject mapping a reserved doorbell to a new queue
When creating an user-queue, the user space provides a doorbell BO handle and an offset within the bo to obtain a doorbell.
However current implementation using xa_store_irq() to store a doorbell, which allows a later queue created with the same BO and offset parameters to overwrite an existing queue and doorbell mapping.
This can cause problems like misrouting fence IRQ processing to a wrong queue, and mislead the cleanup process of one queue erasing the mapping of another queue.
This commit fixes this issue by replacing xa_store_irq with xa_insert_irq, which rejects mapping a reserved doorbell to a newly created queue
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +2 -2
@@ -704,8 +704,8 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)/* Update VM owner at userq submit-time for page-fault attribution. */ amdgpu_vm_set_task_info (&fpriv->vm); - r =xa_err (xa_store_irq (&adev->userq_doorbell_xa, index, queue, -GFP_KERNEL )); + r =xa_insert_irq (&adev->userq_doorbell_xa, index, queue, +GFP_KERNEL );if (r) goto clean_mqd;
Signature · 1 line
2.54.0
Quoted 13 lines · Zhu Lingshan
When creating an user-queue, the user space provides a doorbell BO handle and an offset within the bo to obtain a doorbell.
However current implementation using
xa_store_irq()to store a doorbell, which allows a later queue created with the same BO and offset parameters to overwrite an existing queue and doorbell mapping.This can cause problems like misrouting fence IRQ processing to a wrong queue, and mislead the cleanup process of one queue erasing the mapping of another queue.
Quoted 5 lines
This commit fixes this issue by replacing
xa_store_irqwithxa_insert_irq, which rejects mapping a reserved doorbell to a newly created queueSigned-off-by Zhu Lingshan <[email protected]>
Quoted 19 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +2
-2@@ -704,8 +704,8 @@ amdgpu_userq_create(struct drm_file *filp, union drm_amdgpu_userq *args)/* Update VM owner at userq submit-time for page-fault attribution. */ amdgpu_vm_set_task_info (&fpriv->vm); - r =xa_err (xa_store_irq (&adev->userq_doorbell_xa, index, queue, -GFP_KERNEL )); + r =xa_insert_irq (&adev->userq_doorbell_xa, index, queue, +GFP_KERNEL );if (r) goto clean_mqd;