Skip to content

Commit 518755a

Browse files
kaihuangIngo Molnar
authored andcommitted
x86/tdx: Fix __noreturn build warning around __tdx_hypercall_failed()
LKP reported below build warning: vmlinux.o: warning: objtool: __tdx_hypercall+0x128: __tdx_hypercall_failed() is missing a __noreturn annotation The __tdx_hypercall_failed() function definition already has __noreturn annotation, but it turns out the __noreturn must be annotated to the function declaration. PeterZ explains: "FWIW, the reason being that... The point of noreturn is that the caller should know to stop generating code. For that the declaration needs the attribute, because call sites typically do not have access to the function definition in C." Add __noreturn annotation to the declaration of __tdx_hypercall_failed() to fix. It's not a bad idea to document the __noreturn nature at the definition site either, so keep the annotation at the definition. Note <asm/shared/tdx.h> is also included by TDX related assembly files. Include <linux/compiler_attributes.h> only in case of !__ASSEMBLY__ otherwise compiling assembly file would trigger build error. Also, following the objtool documentation, add __tdx_hypercall_failed() to "tools/objtool/noreturns.h". Fixes: c641cfb ("x86/tdx: Make TDX_HYPERCALL asm similar to TDX_MODULE_CALL") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Kai Huang <kai.huang@intel.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/20230918041858.331234-1-kai.huang@intel.com Closes: https://lore.kernel.org/oe-kbuild-all/202309140828.9RdmlH2Z-lkp@intel.com/
1 parent 7b80413 commit 518755a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

arch/x86/include/asm/shared/tdx.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656

5757
#ifndef __ASSEMBLY__
5858

59+
#include <linux/compiler_attributes.h>
60+
5961
/*
6062
* Used in __tdcall*() to gather the input/output registers' values of the
6163
* TDCALL instruction when requesting services from the TDX module. This is a
@@ -108,7 +110,7 @@ static inline u64 _tdx_hypercall(u64 fn, u64 r12, u64 r13, u64 r14, u64 r15)
108110

109111

110112
/* Called from __tdx_hypercall() for unrecoverable failure */
111-
void __tdx_hypercall_failed(void);
113+
void __noreturn __tdx_hypercall_failed(void);
112114

113115
bool tdx_accept_memory(phys_addr_t start, phys_addr_t end);
114116

tools/objtool/noreturns.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ NORETURN(__kunit_abort)
1111
NORETURN(__module_put_and_kthread_exit)
1212
NORETURN(__reiserfs_panic)
1313
NORETURN(__stack_chk_fail)
14+
NORETURN(__tdx_hypercall_failed)
1415
NORETURN(__ubsan_handle_builtin_unreachable)
1516
NORETURN(arch_call_rest_init)
1617
NORETURN(arch_cpu_idle_dead)

0 commit comments

Comments
 (0)