x86/alternative: Remove noinline from __ibt_endbr_seal[_end]() stubs
authorMiaohe Lin <linmiaohe@huawei.com>
Tue, 11 Oct 2022 11:38:03 +0000 (19:38 +0800)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 2 Dec 2022 11:54:43 +0000 (12:54 +0100)
Due to the explicit 'noinline' GCC-7.3 is not able to optimize away the
argument setup of:

apply_ibt_endbr(__ibt_endbr_seal, __ibt_enbr_seal_end);

even when X86_KERNEL_IBT=n and the function is an empty stub, which leads
to link errors due to missing __ibt_endbr_seal* symbols:

ld: arch/x86/kernel/alternative.o: in function `alternative_instructions':
alternative.c:(.init.text+0x15d): undefined reference to `__ibt_endbr_seal_end'
ld: alternative.c:(.init.text+0x164): undefined reference to `__ibt_endbr_seal'

Remove the explicit 'noinline' to help gcc optimize them away.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20221011113803.956808-1-linmiaohe@huawei.com
arch/x86/kernel/alternative.c

index 5cadcea035e044b47972675f0bd9792b8fc46fc0..beaf9fc44e2fb055b0d06b6bcb2bf82575dfbec0 100644 (file)
@@ -624,7 +624,7 @@ void __init_or_module noinline apply_ibt_endbr(s32 *start, s32 *end)
 
 #else
 
-void __init_or_module noinline apply_ibt_endbr(s32 *start, s32 *end) { }
+void __init_or_module apply_ibt_endbr(s32 *start, s32 *end) { }
 
 #endif /* CONFIG_X86_KERNEL_IBT */