Skip to content

Commit c2cbae6

Browse files
kaihuangpopcornmix
authored andcommitted
x86/virt/tdx: Avoid indirect calls to TDX assembly functions
commit 0b3bc01 upstream. Two 'static inline' TDX helper functions (sc_retry() and sc_retry_prerr()) take function pointer arguments which refer to assembly functions. Normally, the compiler inlines the TDX helper, realizes that the function pointer targets are completely static -- thus can be resolved at compile time -- and generates direct call instructions. But, other times (like when CONFIG_CC_OPTIMIZE_FOR_SIZE=y), the compiler declines to inline the helpers and will instead generate indirect call instructions. Indirect calls to assembly functions require special annotation (for various Control Flow Integrity mechanisms). But TDX assembly functions lack the special annotations and can only be called directly. Annotate both the helpers as '__always_inline' to prod the compiler into maintaining the direct calls. There is no guarantee here, but Peter has volunteered to report the compiler bug if this assumption ever breaks[1]. Fixes: 1e66a7e ("x86/virt/tdx: Handle SEAMCALL no entropy error in common code") Fixes: df01f5a ("x86/virt/tdx: Add SEAMCALL error printing for module initialization") Signed-off-by: Kai Huang <kai.huang@intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/lkml/20250605145914.GW39944@noisy.programming.kicks-ass.net/ [1] Link: https://lore.kernel.org/all/20250606130737.30713-1-kai.huang%40intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2ccaaa6 commit c2cbae6

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

arch/x86/include/asm/tdx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void tdx_init(void);
9797

9898
typedef u64 (*sc_func_t)(u64 fn, struct tdx_module_args *args);
9999

100-
static inline u64 sc_retry(sc_func_t func, u64 fn,
100+
static __always_inline u64 sc_retry(sc_func_t func, u64 fn,
101101
struct tdx_module_args *args)
102102
{
103103
int retry = RDRAND_RETRY_LOOPS;

arch/x86/virt/vmx/tdx/tdx.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ static inline void seamcall_err_ret(u64 fn, u64 err,
6969
args->r9, args->r10, args->r11);
7070
}
7171

72-
static inline int sc_retry_prerr(sc_func_t func, sc_err_func_t err_func,
73-
u64 fn, struct tdx_module_args *args)
72+
static __always_inline int sc_retry_prerr(sc_func_t func,
73+
sc_err_func_t err_func,
74+
u64 fn, struct tdx_module_args *args)
7475
{
7576
u64 sret = sc_retry(func, fn, args);
7677

0 commit comments

Comments
 (0)