Commit-ID: b404b2c4a1f98ad34c33f45a254c31d4fca9d91d Gitweb: http://git.kernel.org/tip/b404b2c4a1f98ad34c33f45a254c31d4fca9d91d Author: Josh Poimboeuf <jpoim...@redhat.com> AuthorDate: Thu, 21 Jan 2016 16:49:20 -0600 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Tue, 23 Feb 2016 09:03:57 +0100
x86/asm/entry: Create stack frames in thunk functions Thunk functions are callable non-leaf functions that don't honor CONFIG_FRAME_POINTER, which can result in bad stack traces. Also they aren't annotated as ELF callable functions which can confuse tooling. Create stack frames for them when CONFIG_FRAME_POINTER is enabled and add the ELF function type. Signed-off-by: Josh Poimboeuf <jpoim...@redhat.com> Reviewed-by: Borislav Petkov <b...@suse.de> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Andy Lutomirski <l...@amacapital.net> Cc: Andy Lutomirski <l...@kernel.org> Cc: Arnaldo Carvalho de Melo <a...@kernel.org> Cc: Bernd Petrovitsch <be...@petrovitsch.priv.at> Cc: Borislav Petkov <b...@alien8.de> Cc: Brian Gerst <brge...@gmail.com> Cc: Chris J Arges <chris.j.ar...@canonical.com> Cc: Denys Vlasenko <dvlas...@redhat.com> Cc: H. Peter Anvin <h...@zytor.com> Cc: Jiri Slaby <jsl...@suse.cz> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Michal Marek <mma...@suse.cz> Cc: Namhyung Kim <namhy...@gmail.com> Cc: Pedro Alves <pal...@redhat.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: live-patch...@vger.kernel.org Link: http://lkml.kernel.org/r/4373e5bff459b9fd66ce5d45bfcc881a5c202643.1453405861.git.jpoim...@redhat.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/entry/thunk_64.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S index efb2b93..98df1fa 100644 --- a/arch/x86/entry/thunk_64.S +++ b/arch/x86/entry/thunk_64.S @@ -8,11 +8,14 @@ #include <linux/linkage.h> #include "calling.h" #include <asm/asm.h> +#include <asm/frame.h> /* rdi: arg1 ... normal C conventions. rax is saved/restored. */ .macro THUNK name, func, put_ret_addr_in_rdi=0 .globl \name + .type \name, @function \name: + FRAME_BEGIN /* this one pushes 9 elems, the next one would be %rIP */ pushq %rdi @@ -62,6 +65,7 @@ restore: popq %rdx popq %rsi popq %rdi + FRAME_END ret _ASM_NOKPROBE(restore) #endif
