drm/amdkfd: Fix sdma queue allocate race condition

SDMA queue allocation requires the dqm lock as it modify
the global dqm members. Enclose it in the dqm_lock.

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reviewed-by: Philip Yang <philip.yang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index b75ec379425c5b636994efc79a15ceec5323bd00..3528590ae90b91f10edcc818261eb77a38d76028 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -1144,7 +1144,9 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
 
        if (q->properties.type == KFD_QUEUE_TYPE_SDMA ||
                q->properties.type == KFD_QUEUE_TYPE_SDMA_XGMI) {
+               dqm_lock(dqm);
                retval = allocate_sdma_queue(dqm, q);
+               dqm_unlock(dqm);
                if (retval)
                        goto out;
        }
@@ -1203,8 +1205,11 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
        deallocate_doorbell(qpd, q);
 out_deallocate_sdma_queue:
        if (q->properties.type == KFD_QUEUE_TYPE_SDMA ||
-               q->properties.type == KFD_QUEUE_TYPE_SDMA_XGMI)
+               q->properties.type == KFD_QUEUE_TYPE_SDMA_XGMI) {
+               dqm_lock(dqm);
                deallocate_sdma_queue(dqm, q);
+               dqm_unlock(dqm);
+       }
 out:
        return retval;
 }