This is a note to let you know that I've just added the patch titled x86: Use return-thunk in asm code to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-use-return-thunk-in-asm-code.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Tue Jul 12 05:06:57 PM CEST 2022 From: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Date: Tue, 14 Jun 2022 23:15:45 +0200 Subject: x86: Use return-thunk in asm code From: Peter Zijlstra <peterz@xxxxxxxxxxxxx> commit aa3d480315ba6c3025a60958e1981072ea37c3df upstream. Use the return thunk in asm code. If the thunk isn't needed, it will get patched into a RET instruction during boot by apply_returns(). Since alternatives can't handle relocations outside of the first instruction, putting a 'jmp __x86_return_thunk' in one is not valid, therefore carve out the memmove ERMS path into a separate label and jump to it. Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Reviewed-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> [cascardo: no RANDSTRUCT_CFLAGS] Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/x86/entry/vdso/Makefile | 1 + arch/x86/include/asm/linkage.h | 8 ++++++++ arch/x86/lib/memmove_64.S | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-) --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -92,6 +92,7 @@ endif endif $(vobjs): KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_LTO) $(GCC_PLUGINS_CFLAGS) $(RETPOLINE_CFLAGS),$(KBUILD_CFLAGS)) $(CFL) +$(vobjs): KBUILD_AFLAGS += -DBUILD_VDSO # # vDSO code runs in userspace and -pg doesn't help with profiling anyway. --- a/arch/x86/include/asm/linkage.h +++ b/arch/x86/include/asm/linkage.h @@ -18,19 +18,27 @@ #define __ALIGN_STR __stringify(__ALIGN) #endif +#if defined(CONFIG_RETPOLINE) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO) +#define RET jmp __x86_return_thunk +#else /* CONFIG_RETPOLINE */ #ifdef CONFIG_SLS #define RET ret; int3 #else #define RET ret #endif +#endif /* CONFIG_RETPOLINE */ #else /* __ASSEMBLY__ */ +#if defined(CONFIG_RETPOLINE) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO) +#define ASM_RET "jmp __x86_return_thunk\n\t" +#else /* CONFIG_RETPOLINE */ #ifdef CONFIG_SLS #define ASM_RET "ret; int3\n\t" #else #define ASM_RET "ret\n\t" #endif +#endif /* CONFIG_RETPOLINE */ #endif /* __ASSEMBLY__ */ --- a/arch/x86/lib/memmove_64.S +++ b/arch/x86/lib/memmove_64.S @@ -40,7 +40,7 @@ SYM_FUNC_START(__memmove) /* FSRM implies ERMS => no length checks, do the copy directly */ .Lmemmove_begin_forward: ALTERNATIVE "cmp $0x20, %rdx; jb 1f", "", X86_FEATURE_FSRM - ALTERNATIVE "", __stringify(movq %rdx, %rcx; rep movsb; RET), X86_FEATURE_ERMS + ALTERNATIVE "", "jmp .Lmemmove_erms", X86_FEATURE_ERMS /* * movsq instruction have many startup latency @@ -206,6 +206,11 @@ SYM_FUNC_START(__memmove) movb %r11b, (%rdi) 13: RET + +.Lmemmove_erms: + movq %rdx, %rcx + rep movsb + RET SYM_FUNC_END(__memmove) SYM_FUNC_END_ALIAS(memmove) EXPORT_SYMBOL(__memmove) Patches currently in stable-queue which might be from peterz@xxxxxxxxxxxxx are queue-5.15/x86-sev-avoid-using-__x86_return_thunk.patch queue-5.15/x86-ftrace-use-alternative-ret-encoding.patch queue-5.15/objtool-re-add-unwind_hint_-save_restore.patch queue-5.15/x86-bugs-add-retbleed-ibpb.patch queue-5.15/x86-bugs-enable-stibp-for-jmp2ret.patch queue-5.15/x86-retpoline-cleanup-some-ifdefery.patch queue-5.15/kvm-vmx-flatten-__vmx_vcpu_run.patch queue-5.15/x86-kvm-vmx-make-noinstr-clean.patch queue-5.15/objtool-x86-replace-alternatives-with-.retpoline_sites.patch queue-5.15/x86-retbleed-add-fine-grained-kconfig-knobs.patch queue-5.15/x86-cpu-amd-add-spectral-chicken.patch queue-5.15/kvm-vmx-fix-ibrs-handling-after-vmexit.patch queue-5.15/kvm-vmx-prevent-guest-rsb-poisoning-attacks-with-eibrs.patch queue-5.15/x86-vsyscall_emu-64-don-t-use-ret-in-vsyscall-emulation.patch queue-5.15/x86-add-magic-amd-return-thunk.patch queue-5.15/x86-bugs-keep-a-per-cpu-ia32_spec_ctrl-value.patch queue-5.15/x86-objtool-create-.return_sites.patch queue-5.15/x86-alternative-handle-jcc-__x86_indirect_thunk_-reg.patch queue-5.15/x86-kvm-fix-setcc-emulation-for-return-thunks.patch queue-5.15/x86-retpoline-swizzle-retpoline-thunk.patch queue-5.15/x86-speculation-fix-firmware-entry-spec_ctrl-handling.patch queue-5.15/x86-retpoline-remove-unused-replacement-symbols.patch queue-5.15/x86-speculation-add-spectre_v2-ibrs-option-to-support-kernel-ibrs.patch queue-5.15/x86-xen-add-untrain_ret.patch queue-5.15/bpf-x86-respect-x86_feature_retpoline.patch queue-5.15/x86-undo-return-thunk-damage.patch queue-5.15/x86-entry-avoid-very-early-ret.patch queue-5.15/x86-entry-move-push_and_clear_regs-back-into-error_entry.patch queue-5.15/x86-retpoline-create-a-retpoline-thunk-array.patch queue-5.15/x86-asm-fix-register-order.patch queue-5.15/x86-speculation-fill-rsb-on-vmexit-for-ibrs.patch queue-5.15/objtool-add-entry-unret-validation.patch queue-5.15/objtool-shrink-struct-instruction.patch queue-5.15/kvm-vmx-convert-launched-argument-to-flags.patch queue-5.15/x86-bpf-use-alternative-ret-encoding.patch queue-5.15/x86-common-stamp-out-the-stepping-madness.patch queue-5.15/x86-bugs-split-spectre_v2_select_mitigation-and-spectre_v2_user_select_mitigation.patch queue-5.15/x86-bugs-report-intel-retbleed-vulnerability.patch queue-5.15/bpf-x86-simplify-computing-label-offsets.patch queue-5.15/x86-cpufeatures-move-retpoline-flags-to-word-11.patch queue-5.15/x86-speculation-fix-spec_ctrl-write-on-smt-state-change.patch queue-5.15/x86-retpoline-use-mfunction-return.patch queue-5.15/x86-xen-rename-sys-entry-points.patch queue-5.15/x86-bugs-optimize-spec_ctrl-msr-writes.patch queue-5.15/x86-bugs-report-amd-retbleed-vulnerability.patch queue-5.15/x86-static_call-use-alternative-ret-encoding.patch queue-5.15/x86-speculation-fix-rsb-filling-with-config_retpoline-n.patch queue-5.15/x86-asm-fixup-odd-gen-for-each-reg.h-usage.patch queue-5.15/x86-alternative-add-debug-prints-to-apply_retpolines.patch queue-5.15/x86-use-return-thunk-in-asm-code.patch queue-5.15/objtool-classify-symbols.patch queue-5.15/intel_idle-disable-ibrs-during-long-idle.patch queue-5.15/x86-retpoline-move-the-retpoline-thunk-declarations-to-nospec-branch.h.patch queue-5.15/x86-alternative-implement-.retpoline_sites-support.patch queue-5.15/x86-alternative-try-inline-spectre_v2-retpoline-amd.patch queue-5.15/x86-entry-remove-skip_r11rcx.patch queue-5.15/objtool-explicitly-avoid-self-modifying-code-in-.altinstr_replacement.patch queue-5.15/x86-speculation-use-cached-host-spec_ctrl-value-for-guest-entry-exit.patch queue-5.15/x86-bugs-add-amd-retbleed-boot-parameter.patch queue-5.15/x86-entry-add-kernel-ibrs-implementation.patch queue-5.15/objtool-treat-.text.__x86.-as-noinstr.patch queue-5.15/objtool-introduce-cfi-hash.patch queue-5.15/objtool-default-ignore-int3-for-unreachable.patch queue-5.15/objtool-update-retpoline-validation.patch