drm/msm: Fix objtool warning in submit_lock_objects()

Split the vmbind case into a separate helper function
submit_lock_objects_vmbind() to fix objtool warning:

  drivers/gpu/drm/msm/msm.o: warning: objtool: submit_lock_objects+0x451:
  sibling call from callable instruction with modified stack frame

The drm_exec_until_all_locked() macro uses computed gotos internally
for its retry loop. Having return statements inside this macro, or
immediately after it in certain code paths, confuses objtool's static
analysis of stack frames, causing it to incorrectly flag tail call
optimizations.

Fixes: 92395af63a99 ("drm/msm: Add VM_BIND submitqueue")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Patchwork: https://patchwork.freedesktop.org/patch/667539/
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index bfea19baf6d9a479b934b2a16705eb2aa0e9bb26..3ab3b27134f93b01236fec5833a18a6e2ad2cf5e 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -271,32 +271,37 @@ out:
        return ret;
 }
 
-/* This is where we make sure all the bo's are reserved and pin'd: */
-static int submit_lock_objects(struct msm_gem_submit *submit)
+static int submit_lock_objects_vmbind(struct msm_gem_submit *submit)
 {
-       unsigned flags = DRM_EXEC_INTERRUPTIBLE_WAIT;
+       unsigned flags = DRM_EXEC_INTERRUPTIBLE_WAIT | DRM_EXEC_IGNORE_DUPLICATES;
        struct drm_exec *exec = &submit->exec;
-       int ret;
+       int ret = 0;
 
-       if (msm_context_is_vmbind(submit->queue->ctx)) {
-               flags |= DRM_EXEC_IGNORE_DUPLICATES;
+       drm_exec_init(&submit->exec, flags, submit->nr_bos);
 
-               drm_exec_init(&submit->exec, flags, submit->nr_bos);
+       drm_exec_until_all_locked (&submit->exec) {
+               ret = drm_gpuvm_prepare_vm(submit->vm, exec, 1);
+               drm_exec_retry_on_contention(exec);
+               if (ret)
+                       break;
 
-               drm_exec_until_all_locked (&submit->exec) {
-                       ret = drm_gpuvm_prepare_vm(submit->vm, exec, 1);
-                       drm_exec_retry_on_contention(exec);
-                       if (ret)
-                               return ret;
+               ret = drm_gpuvm_prepare_objects(submit->vm, exec, 1);
+               drm_exec_retry_on_contention(exec);
+               if (ret)
+                       break;
+       }
 
-                       ret = drm_gpuvm_prepare_objects(submit->vm, exec, 1);
-                       drm_exec_retry_on_contention(exec);
-                       if (ret)
-                               return ret;
-               }
+       return ret;
+}
 
-               return 0;
-       }
+/* This is where we make sure all the bo's are reserved and pin'd: */
+static int submit_lock_objects(struct msm_gem_submit *submit)
+{
+       unsigned flags = DRM_EXEC_INTERRUPTIBLE_WAIT;
+       int ret = 0;
+
+       if (msm_context_is_vmbind(submit->queue->ctx))
+               return submit_lock_objects_vmbind(submit);
 
        drm_exec_init(&submit->exec, flags, submit->nr_bos);
 
@@ -305,17 +310,17 @@ static int submit_lock_objects(struct msm_gem_submit *submit)
                                        drm_gpuvm_resv_obj(submit->vm));
                drm_exec_retry_on_contention(&submit->exec);
                if (ret)
-                       return ret;
+                       break;
                for (unsigned i = 0; i < submit->nr_bos; i++) {
                        struct drm_gem_object *obj = submit->bos[i].obj;
                        ret = drm_exec_prepare_obj(&submit->exec, obj, 1);
                        drm_exec_retry_on_contention(&submit->exec);
                        if (ret)
-                               return ret;
+                               break;
                }
        }
 
-       return 0;
+       return ret;
 }
 
 static int submit_fence_sync(struct msm_gem_submit *submit)