drm/msm: Switch idr_lock to spinlock

[ Upstream commit e4f020c6a05db73eac49b7c3b3650251be374200 ]

Needed to idr_preload() which returns with preemption disabled.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/527846/
Link: https://lore.kernel.org/r/20230320144356.803762-11-robdclark@gmail.com
Stable-dep-of: 1b5d0ddcb34a ("drm/msm: Disallow submit with fence id 0")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index ac3d1d492a48c9033eb74d08dc9671b160fbdc71..f982a827be7ca085b3cb911d90c0c1f629142810 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -932,13 +932,11 @@ static int wait_fence(struct msm_gpu_submitqueue *queue, uint32_t fence_id,
         * retired, so if the fence is not found it means there is nothing
         * to wait for
         */
-       ret = mutex_lock_interruptible(&queue->idr_lock);
-       if (ret)
-               return ret;
+       spin_lock(&queue->idr_lock);
        fence = idr_find(&queue->fence_idr, fence_id);
        if (fence)
                fence = dma_fence_get_rcu(fence);
-       mutex_unlock(&queue->idr_lock);
+       spin_unlock(&queue->idr_lock);
 
        if (!fence)
                return 0;

diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index d6162561141c56cb7e606069153bf04a10089dec..5668860f0182761f573a8f5b66beeb64a7cdcac9 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -72,9 +72,9 @@ void __msm_gem_submit_destroy(struct kref *kref)
        unsigned i;
 
        if (submit->fence_id) {
-               mutex_lock(&submit->queue->idr_lock);
+               spin_lock(&submit->queue->idr_lock);
                idr_remove(&submit->queue->fence_idr, submit->fence_id);
-               mutex_unlock(&submit->queue->idr_lock);
+               spin_unlock(&submit->queue->idr_lock);
        }
 
        dma_fence_put(submit->user_fence);
@@ -866,7 +866,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
 
        submit->nr_cmds = i;
 
-       mutex_lock(&queue->idr_lock);
+       spin_lock(&queue->idr_lock);
 
        /*
         * If using userspace provided seqno fence, validate that the id
@@ -876,7 +876,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
         */
        if ((args->flags & MSM_SUBMIT_FENCE_SN_IN) &&
                        idr_find(&queue->fence_idr, args->fence)) {
-               mutex_unlock(&queue->idr_lock);
+               spin_unlock(&queue->idr_lock);
                ret = -EINVAL;
                goto out;
        }
@@ -910,7 +910,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
                                                    INT_MAX, GFP_KERNEL);
        }
 
-       mutex_unlock(&queue->idr_lock);
+       spin_unlock(&queue->idr_lock);
 
        if (submit->fence_id < 0) {
                ret = submit->fence_id;

diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h
index 732295e2568345f1fc5a6d4e62da647e186ce104..b39cd332751dc8d92d75114eb20d4debe769c8c6 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gpu.h
+++ b/drivers/gpu/drm/msm/msm_gpu.h
@@ -500,7 +500,7 @@ struct msm_gpu_submitqueue {
        struct msm_file_private *ctx;
        struct list_head node;
        struct idr fence_idr;
-       struct mutex idr_lock;
+       struct spinlock idr_lock;
        struct mutex lock;
        struct kref ref;
        struct drm_sched_entity *entity;

diff --git a/drivers/gpu/drm/msm/msm_submitqueue.c b/drivers/gpu/drm/msm/msm_submitqueue.c
index c6929e205b511e923e122e88e6fa32eabce9ab0a..0e803125a325aa67639406ef413aaeb6a9f08cee 100644 (file)
--- a/drivers/gpu/drm/msm/msm_submitqueue.c
+++ b/drivers/gpu/drm/msm/msm_submitqueue.c
@@ -200,7 +200,7 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx,
                *id = queue->id;
 
        idr_init(&queue->fence_idr);
-       mutex_init(&queue->idr_lock);
+       spin_lock_init(&queue->idr_lock);
        mutex_init(&queue->lock);
 
        list_add_tail(&queue->node, &ctx->submitqueues);