diff mbox series

objtool: Add __kunit_abort() to noreturns

Message ID 20230602175453.swsn3ehyochtwkhy@treble
State New
Headers
Series objtool: Add __kunit_abort() to noreturns |

Commit Message

Josh Poimboeuf June 2, 2023, 5:54 p.m. UTC 
  Fixes a bunch of warnings like:

  drivers/input/tests/input_test.o: warning: objtool: input_test_init+0x1cb: stack state mismatch: cfa1=4+64 cfa2=4+56
  lib/kunit/kunit-test.o: warning: objtool: kunit_log_newline_test+0xfb: return with modified stack frame
  ...

Fixes: 260755184cbd ("kunit: Move kunit_abort() call out of kunit_do_failed_assertion()")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
 tools/objtool/noreturns.h | 1 +
 1 file changed, 1 insertion(+)

Comments

David Gow June 6, 2023, 5:41 a.m. UTC | #1 
On Sat, 3 Jun 2023 at 01:54, Josh Poimboeuf <jpoimboe@kernel.org> wrote:
>
> Fixes a bunch of warnings like:
>
>   drivers/input/tests/input_test.o: warning: objtool: input_test_init+0x1cb: stack state mismatch: cfa1=4+64 cfa2=4+56
>   lib/kunit/kunit-test.o: warning: objtool: kunit_log_newline_test+0xfb: return with modified stack frame
>   ...
>
> Fixes: 260755184cbd ("kunit: Move kunit_abort() call out of kunit_do_failed_assertion()")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
> ---

Thanks for fixing this. Let me know if we need to find a way to put it
in the kselftest/kunit branch as well, but I suspect it's better off
staying with the objtool one.

Reviewed-by: David Gow <davidgow@google.com>

Cheers,
-- David


>  tools/objtool/noreturns.h | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h
> index cede6068ddf6..1514e84d5cc4 100644
> --- a/tools/objtool/noreturns.h
> +++ b/tools/objtool/noreturns.h
> @@ -7,6 +7,7 @@
>   * Yes, this is unfortunate.  A better solution is in the works.
>   */
>  NORETURN(__invalid_creds)
> +NORETURN(__kunit_abort)
>  NORETURN(__module_put_and_kthread_exit)
>  NORETURN(__reiserfs_panic)
>  NORETURN(__stack_chk_fail)
> --
> 2.40.1
>
diff mbox series

Patch

diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h
index cede6068ddf6..1514e84d5cc4 100644
--- a/tools/objtool/noreturns.h
+++ b/tools/objtool/noreturns.h
@@ -7,6 +7,7 @@ 
  * Yes, this is unfortunate.  A better solution is in the works.
  */
 NORETURN(__invalid_creds)
+NORETURN(__kunit_abort)
 NORETURN(__module_put_and_kthread_exit)
 NORETURN(__reiserfs_panic)
 NORETURN(__stack_chk_fail)