This is a note to let you know that I've just added the patch titled
x86/ftrace: Add UNWIND_HINT_FUNC annotation for ftrace_stub
to the 5.10-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-ftrace-add-unwind_hint_func-annotation-for-ftrace_stub.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 18660698a3d30868524cefb60dcd4e0e297f71bb Mon Sep 17 00:00:00 2001
From: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
Date: Thu, 21 Jan 2021 15:29:21 -0600
Subject: x86/ftrace: Add UNWIND_HINT_FUNC annotation for ftrace_stub
From: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
commit 18660698a3d30868524cefb60dcd4e0e297f71bb upstream.
Prevent an unreachable objtool warning after the sibling call detection
gets improved. ftrace_stub() is basically a function, annotate it as
such.
Acked-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
Link: https://lore.kernel.org/r/6845e1b2fb0723a95740c6674e548ba38c5ea489.1611263461.git.jpoimboe@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/ftrace_64.S | 1 +
1 file changed, 1 insertion(+)
--- a/arch/x86/kernel/ftrace_64.S
+++ b/arch/x86/kernel/ftrace_64.S
@@ -173,6 +173,7 @@ SYM_INNER_LABEL(ftrace_graph_call, SYM_L
* It is also used to copy the RET for trampolines.
*/
SYM_INNER_LABEL_ALIGN(ftrace_stub, SYM_L_WEAK)
+ UNWIND_HINT_FUNC
RET
SYM_FUNC_END(ftrace_epilogue)
Patches currently in stable-queue which might be from jpoimboe@xxxxxxxxxx are
queue-5.10/x86-bugs-enable-stibp-for-jmp2ret.patch
queue-5.10/objtool-assume-only-elf-functions-do-sibling-calls.patch
queue-5.10/objtool-support-retpoline-jump-detection-for-vmlinux.o.patch
queue-5.10/x86-xen-support-objtool-vmlinux.o-validation-in-xen-head.s.patch
queue-5.10/objtool-x86-replace-alternatives-with-.retpoline_sites.patch
queue-5.10/objtool-don-t-make-.altinstructions-writable.patch
queue-5.10/x86-alternative-handle-jcc-__x86_indirect_thunk_-reg.patch
queue-5.10/x86-xen-support-objtool-validation-in-xen-asm.s.patch
queue-5.10/x86-retpoline-remove-unused-replacement-symbols.patch
queue-5.10/objtool-support-stack-layout-changes-in-alternatives.patch
queue-5.10/bpf-x86-respect-x86_feature_retpoline.patch
queue-5.10/objtool-fix-type-of-reloc-addend.patch
queue-5.10/x86-ftrace-add-unwind_hint_func-annotation-for-ftrace_stub.patch
queue-5.10/x86-retpoline-create-a-retpoline-thunk-array.patch
queue-5.10/x86-asm-fix-register-order.patch
queue-5.10/objtool-make-.altinstructions-section-entry-size-consistent.patch
queue-5.10/bpf-x86-simplify-computing-label-offsets.patch
queue-5.10/objtool-refactor-orc-section-generation.patch
queue-5.10/objtool-fix-code-relocs-vs-weak-symbols.patch
queue-5.10/objtool-combine-unwind_hint_ret_offset-and-unwind_hint_func.patch
queue-5.10/x86-asm-fixup-odd-gen-for-each-reg.h-usage.patch
queue-5.10/x86-alternative-add-debug-prints-to-apply_retpolines.patch
queue-5.10/objtool-remove-reloc-symbol-type-checks-in-get_alt_entry.patch
queue-5.10/objtool-classify-symbols.patch
queue-5.10/objtool-add-alt_group-struct.patch
queue-5.10/x86-retpoline-move-the-retpoline-thunk-declarations-to-nospec-branch.h.patch
queue-5.10/objtool-support-asm-jump-tables.patch
queue-5.10/x86-alternative-implement-.retpoline_sites-support.patch
queue-5.10/x86-alternative-try-inline-spectre_v2-retpoline-amd.patch
queue-5.10/objtool-explicitly-avoid-self-modifying-code-in-.altinstr_replacement.patch
queue-5.10/objtool-create-reloc-sections-implicitly.patch
queue-5.10/objtool-default-ignore-int3-for-unreachable.patch
queue-5.10/objtool-teach-get_alt_entry-about-more-relocation-types.patch
