drm/msm: Fix objtool warning in submit_lock_objects()
PATCH 1/1 drm/msm: Fix objtool warning in submit_lock_objects()
Restructure submit_lock_objects() to use a single loop with break statements 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.
--- drivers/gpu/drm/msm/msm_gem_submit.c | 43 ++++++++++++---------------- 1 file changed, 19 insertions(+), 24 deletions(-)
drivers/gpu/drm/msm/msm_gem_submit.c +19 -24
@@ -276,46 +276,41 @@ static int submit_lock_objects(struct msm_gem_submit *submit) {unsigned flags =DRM_EXEC_INTERRUPTIBLE_WAIT ;struct drm_exec *exec = &submit->exec; -int ret; +int ret =0 ; -if (msm_context_is_vmbind (submit->queue->ctx)) { +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) { + drm_exec_until_all_locked (&submit->exec) { +if (msm_context_is_vmbind (submit->queue->ctx)) { ret =drm_gpuvm_prepare_vm (submit->vm, exec,1 );drm_exec_retry_on_contention (exec);if (ret) -return ret; +break ; ret =drm_gpuvm_prepare_objects (submit->vm, exec,1 );drm_exec_retry_on_contention (exec);if (ret) -return ret; - } - -return 0 ; - } - -drm_exec_init (&submit->exec, flags, submit->nr_bos); - - drm_exec_until_all_locked (&submit->exec) { - ret =drm_exec_lock_obj (&submit->exec, -drm_gpuvm_resv_obj (submit->vm)); -drm_exec_retry_on_contention (&submit->exec); -if (ret) -return ret; -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 ); +break ; + }else { + ret =drm_exec_lock_obj (&submit->exec, +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) +break ; + } } } -return 0 ; +return ret; }static int submit_fence_sync (struct msm_gem_submit *submit)
Signature · 1 line
2.39.5
Quoted 4 lines · Sasha Levin
Restructure
submit_lock_objects()to use a single loop with break statements to fix objtool warning:
Quoted 8 lines
drivers/gpu/drm/msm/msm.o: warning: objtool:submit_lock_objects+0x451:
sibling call from callable instruction with modified stack frameThe
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.
Maybe we should instead just split out a separate submit_lock_objects_vmbind() and restore the error path 'goto error' instead of returning from within the loop? Ie. basically revert submit_lock_objects to the way it was before commit 92395af63a99 ("drm/msm: Add VM_BIND submitqueue"), and then move the rest into a new fxn (with 'goto error' instead of 'return ret'? In retrospect the vmbind case is kinda just shoehorned into the existing fxn.
I can type up this version if you have better things to do.
BR,
-R
Quoted 79 lines
Fixes 92395af63a99 ("drm/msm: Add VM_BIND submitqueue")Signed-off-by Sasha Levin <[email protected]>--- drivers/gpu/drm/msm/msm_gem_submit.c | 43 ++++++++++++---------------- 1 file changed, 19 insertions(+), 24 deletions(-)drivers/gpu/drm/msm/msm_gem_submit.c +19
-25@@ -276,46 +276,41 @@ static int submit_lock_objects(struct msm_gem_submit *submit) {unsigned flags =DRM_EXEC_INTERRUPTIBLE_WAIT ;struct drm_exec *exec = &submit->exec; -int ret; +int ret =0 ; -if (msm_context_is_vmbind (submit->queue->ctx)) { +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) { + drm_exec_until_all_locked (&submit->exec) { +if (msm_context_is_vmbind (submit->queue->ctx)) { ret =drm_gpuvm_prepare_vm (submit->vm, exec,1 );drm_exec_retry_on_contention (exec);if (ret) -return ret; +break ; ret =drm_gpuvm_prepare_objects (submit->vm, exec,1 );drm_exec_retry_on_contention (exec);if (ret) -return ret; - } - -return 0 ; - } - -drm_exec_init (&submit->exec, flags, submit->nr_bos); - - drm_exec_until_all_locked (&submit->exec) { - ret =drm_exec_lock_obj (&submit->exec, -drm_gpuvm_resv_obj (submit->vm)); -drm_exec_retry_on_contention (&submit->exec); -if (ret) -return ret; -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 ); +break ; + }else { + ret =drm_exec_lock_obj (&submit->exec, +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) +break ; + } } } -return 0 ; +return ret; }static int submit_fence_sync (struct msm_gem_submit *submit) --2.39.5
Quoted 22 lines · Rob Clark
Quoted 4 lines · Sasha Levin
Restructure
submit_lock_objects()to use a single loop with break statements to fix objtool warning:Quoted 8 lines
drivers/gpu/drm/msm/msm.o: warning: objtool:submit_lock_objects+0x451:
sibling call from callable instruction with modified stack frameThe
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.Maybe we should instead just split out a separate
submit_lock_objects_vmbind()and restore the error path 'goto error' instead of returning from within the loop? Ie. basically revertsubmit_lock_objectsto the way it was before commit92395af63a99("drm/msm: AddVM_BINDsubmitqueue"), and then move the rest into a new fxn (with 'goto error' instead of 'return ret'? In retrospect the vmbind case is kinda just shoehorned into the existing fxn.
Quoted 1 line
I can type up this version if you have better things to do.
I'll send it out :)
Signature · 2 lines
Thanks, Sasha