x86/srso: Fix return thunks in generated code

[platform/kernel/linux-starfive.git] / arch / x86 / kernel / cpu / bugs.c

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index d4109eb..7314a6b 100644 (file)
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -2297,6 +2297,12 @@ static void __init srso_select_mitigation(void)
 
        case SRSO_CMD_SAFE_RET:
                if (IS_ENABLED(CONFIG_CPU_SRSO)) {
+                       /*
+                        * Enable the return thunk for generated code
+                        * like ftrace, static_call, etc.
+                        */
+                       setup_force_cpu_cap(X86_FEATURE_RETHUNK);
+
                        if (boot_cpu_data.x86 == 0x19)
                                setup_force_cpu_cap(X86_FEATURE_SRSO_ALIAS);
                        else