[v1] objtool: Add bch2_trans_unlocked_or_in_restart_error() to bcachefs noreturns

[PATCH] objtool: Add bch2_trans_unlocked_or_in_restart_error() to bcachefs noreturns

Posted by Youling Tang 10 months ago

From: Youling Tang <tangyouling@kylinos.cn>

Fix the following objtool warning during build time:
fs/bcachefs/btree_cache.o: warning: objtool: btree_node_lock.constprop.0() falls through to next function bch2_recalc_btree_reserve()
fs/bcachefs/btree_update.o: warning: objtool: bch2_trans_update_get_key_cache() falls through to next function need_whiteout_for_snapshot()

bch2_trans_unlocked_or_in_restart_error() is an Obviously Correct (tm)
panic() wrapper, add it to the list of known noreturns.

Fixes: b318882022a8 ("bcachefs: bch2_trans_verify_not_unlocked_or_in_restart()")
Reported-by: k2ci<kernel-bot@kylinos.cn>
Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
---
 tools/objtool/noreturns.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h
index b2174894f9f7..6bb7edda3094 100644
--- a/tools/objtool/noreturns.h
+++ b/tools/objtool/noreturns.h
@@ -19,7 +19,7 @@ NORETURN(__x64_sys_exit_group)
 NORETURN(arch_cpu_idle_dead)
 NORETURN(bch2_trans_in_restart_error)
 NORETURN(bch2_trans_restart_error)
-NORETURN(bch2_trans_unlocked_error)
+NORETURN(bch2_trans_unlocked_or_in_restart_error)
 NORETURN(cpu_bringup_and_idle)
 NORETURN(cpu_startup_entry)
 NORETURN(do_exit)
-- 
2.34.1

Re: [PATCH] objtool: Add bch2_trans_unlocked_or_in_restart_error() to bcachefs noreturns

Posted by Kent Overstreet 10 months ago

On Tue, Feb 18, 2025 at 02:42:30PM +0800, Youling Tang wrote:
> From: Youling Tang <tangyouling@kylinos.cn>
> 
> Fix the following objtool warning during build time:
> fs/bcachefs/btree_cache.o: warning: objtool: btree_node_lock.constprop.0() falls through to next function bch2_recalc_btree_reserve()
> fs/bcachefs/btree_update.o: warning: objtool: bch2_trans_update_get_key_cache() falls through to next function need_whiteout_for_snapshot()
> 
> bch2_trans_unlocked_or_in_restart_error() is an Obviously Correct (tm)
> panic() wrapper, add it to the list of known noreturns.
> 
> Fixes: b318882022a8 ("bcachefs: bch2_trans_verify_not_unlocked_or_in_restart()")
> Reported-by: k2ci<kernel-bot@kylinos.cn>
> Signed-off-by: Youling Tang <tangyouling@kylinos.cn>

Reviewed-by: Kent Overstreet <kent.overstreet@linux.dev>

> ---
>  tools/objtool/noreturns.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h
> index b2174894f9f7..6bb7edda3094 100644
> --- a/tools/objtool/noreturns.h
> +++ b/tools/objtool/noreturns.h
> @@ -19,7 +19,7 @@ NORETURN(__x64_sys_exit_group)
>  NORETURN(arch_cpu_idle_dead)
>  NORETURN(bch2_trans_in_restart_error)
>  NORETURN(bch2_trans_restart_error)
> -NORETURN(bch2_trans_unlocked_error)
> +NORETURN(bch2_trans_unlocked_or_in_restart_error)
>  NORETURN(cpu_bringup_and_idle)
>  NORETURN(cpu_startup_entry)
>  NORETURN(do_exit)
> -- 
> 2.34.1
>

Re: [PATCH] objtool: Add bch2_trans_unlocked_or_in_restart_error() to bcachefs noreturns

Posted by Josh Poimboeuf 10 months ago

On Tue, Feb 18, 2025 at 02:42:30PM +0800, Youling Tang wrote:
> From: Youling Tang <tangyouling@kylinos.cn>
> 
> Fix the following objtool warning during build time:
> fs/bcachefs/btree_cache.o: warning: objtool: btree_node_lock.constprop.0() falls through to next function bch2_recalc_btree_reserve()
> fs/bcachefs/btree_update.o: warning: objtool: bch2_trans_update_get_key_cache() falls through to next function need_whiteout_for_snapshot()
> 
> bch2_trans_unlocked_or_in_restart_error() is an Obviously Correct (tm)
> panic() wrapper, add it to the list of known noreturns.
> 
> Fixes: b318882022a8 ("bcachefs: bch2_trans_verify_not_unlocked_or_in_restart()")
> Reported-by: k2ci<kernel-bot@kylinos.cn>
> Signed-off-by: Youling Tang <tangyouling@kylinos.cn>

Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>

Peter, can you take this one?

-- 
Josh

[tip: objtool/urgent] objtool: Add bch2_trans_unlocked_or_in_restart_error() to bcachefs noreturns

Posted by tip-bot2 for Youling Tang 9 months, 3 weeks ago

The following commit has been merged into the objtool/urgent branch of tip:

Commit-ID:     b4ae43b053537ec28f430c0ddb9b916ab296dbe5
Gitweb:        https://git.kernel.org/tip/b4ae43b053537ec28f430c0ddb9b916ab296dbe5
Author:        Youling Tang <tangyouling@kylinos.cn>
AuthorDate:    Tue, 18 Feb 2025 14:42:30 +08:00
Committer:     Josh Poimboeuf <jpoimboe@kernel.org>
CommitterDate: Tue, 25 Feb 2025 10:16:31 -08:00

objtool: Add bch2_trans_unlocked_or_in_restart_error() to bcachefs noreturns

Fix the following objtool warning during build time:

  fs/bcachefs/btree_cache.o: warning: objtool: btree_node_lock.constprop.0() falls through to next function bch2_recalc_btree_reserve()
  fs/bcachefs/btree_update.o: warning: objtool: bch2_trans_update_get_key_cache() falls through to next function need_whiteout_for_snapshot()

bch2_trans_unlocked_or_in_restart_error() is an Obviously Correct (tm)
panic() wrapper, add it to the list of known noreturns.

Fixes: b318882022a8 ("bcachefs: bch2_trans_verify_not_unlocked_or_in_restart()")
Reported-by: k2ci <kernel-bot@kylinos.cn>
Signed-off-by: Youling Tang <tangyouling@kylinos.cn>
Reviewed-by: Kent Overstreet <kent.overstreet@linux.dev>
Link: https://lore.kernel.org/r/20250218064230.219997-1-youling.tang@linux.dev
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
 tools/objtool/noreturns.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h
index b217489..6bb7edd 100644
--- a/tools/objtool/noreturns.h
+++ b/tools/objtool/noreturns.h
@@ -19,7 +19,7 @@ NORETURN(__x64_sys_exit_group)
 NORETURN(arch_cpu_idle_dead)
 NORETURN(bch2_trans_in_restart_error)
 NORETURN(bch2_trans_restart_error)
-NORETURN(bch2_trans_unlocked_error)
+NORETURN(bch2_trans_unlocked_or_in_restart_error)
 NORETURN(cpu_bringup_and_idle)
 NORETURN(cpu_startup_entry)
 NORETURN(do_exit)