Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: c641cfb5c157 ("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/

authored by

Kai Huang and committed by
Ingo Molnar
518755a7 7b804135

+4 -1
+3 -1
arch/x86/include/asm/shared/tdx.h
··· 56 56 57 57 #ifndef __ASSEMBLY__ 58 58 59 + #include <linux/compiler_attributes.h> 60 + 59 61 /* 60 62 * Used in __tdcall*() to gather the input/output registers' values of the 61 63 * TDCALL instruction when requesting services from the TDX module. This is a ··· 110 108 111 109 112 110 /* Called from __tdx_hypercall() for unrecoverable failure */ 113 - void __tdx_hypercall_failed(void); 111 + void __noreturn __tdx_hypercall_failed(void); 114 112 115 113 bool tdx_accept_memory(phys_addr_t start, phys_addr_t end); 116 114
+1
tools/objtool/noreturns.h
··· 11 11 NORETURN(__module_put_and_kthread_exit) 12 12 NORETURN(__reiserfs_panic) 13 13 NORETURN(__stack_chk_fail) 14 + NORETURN(__tdx_hypercall_failed) 14 15 NORETURN(__ubsan_handle_builtin_unreachable) 15 16 NORETURN(arch_call_rest_init) 16 17 NORETURN(arch_cpu_idle_dead)