From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965592AbdCXJ1B (ORCPT ); Fri, 24 Mar 2017 05:27:01 -0400 Received: from terminus.zytor.com ([65.50.211.136]:58447 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935201AbdCXJZP (ORCPT ); Fri, 24 Mar 2017 05:25:15 -0400 Date: Fri, 24 Mar 2017 02:20:36 -0700 From: "tip-bot for Steven Rostedt (VMware)" Message-ID: Cc: jpoimboe@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com, mhiramat@kernel.org, akpm@linux-foundation.org, tglx@linutronix.de, rostedt@goodmis.org, mingo@kernel.org, luto@amacapital.net, torvalds@linux-foundation.org Reply-To: tglx@linutronix.de, rostedt@goodmis.org, akpm@linux-foundation.org, mhiramat@kernel.org, hpa@zytor.com, peterz@infradead.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, torvalds@linux-foundation.org, luto@amacapital.net, mingo@kernel.org In-Reply-To: <20170323143445.771707773@goodmis.org> References: <20170323143445.771707773@goodmis.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/ftrace: Add stack frame pointer to ftrace_caller Git-Commit-ID: e6928e58d4d4a02f88838945f792c107623314ac X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e6928e58d4d4a02f88838945f792c107623314ac Gitweb: http://git.kernel.org/tip/e6928e58d4d4a02f88838945f792c107623314ac Author: Steven Rostedt (VMware) AuthorDate: Thu, 23 Mar 2017 10:33:50 -0400 Committer: Thomas Gleixner CommitDate: Fri, 24 Mar 2017 10:14:07 +0100 x86/ftrace: Add stack frame pointer to ftrace_caller The function hook ftrace_caller does not create its own stack frame, and this causes the ftrace stack trace to miss the first function when doing stack traces. # echo schedule:stacktrace > /sys/kernel/tracing/set_ftrace_filter Before: -0 [002] .N.. 29.865807: => cpu_startup_entry => start_secondary => startup_32_smp <...>-7 [001] .... 29.866509: => kthread => ret_from_fork <...>-1 [000] .... 29.865377: => poll_schedule_timeout => do_select => core_sys_select => SyS_select => do_fast_syscall_32 => entry_SYSENTER_32 After: -0 [002] .N.. 31.234853: => do_idle => cpu_startup_entry => start_secondary => startup_32_smp <...>-7 [003] .... 31.235140: => rcu_gp_kthread => kthread => ret_from_fork <...>-1819 [000] .... 31.264172: => schedule_hrtimeout_range => poll_schedule_timeout => do_sys_poll => SyS_ppoll => do_fast_syscall_32 => entry_SYSENTER_32 Signed-off-by: Steven Rostedt (VMware) Reviewed-by: Josh Poimboeuf Reviewed-by: Masami Hiramatsu Reviewed-by: Ingo Molnar Cc: Peter Zijlstra Cc: Andy Lutomirski Cc: Andrew Morton Cc: Linus Torvalds Link: http://lkml.kernel.org/r/20170323143445.771707773@goodmis.org Signed-off-by: Thomas Gleixner --- arch/x86/kernel/ftrace_32.S | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S index 2b160f2..a4e2872 100644 --- a/arch/x86/kernel/ftrace_32.S +++ b/arch/x86/kernel/ftrace_32.S @@ -16,12 +16,19 @@ ENTRY(mcount) END(mcount) ENTRY(ftrace_caller) + + pushl %ebp + movl %esp, %ebp + pushl %eax pushl %ecx pushl %edx pushl $0 /* Pass NULL as regs pointer */ - movl 4*4(%esp), %eax - movl 0x4(%ebp), %edx + movl 5*4(%esp), %eax + /* Copy original ebp into %edx */ + movl 4*4(%esp), %edx + /* Get the parent ip */ + movl 0x4(%edx), %edx movl function_trace_op, %ecx subl $MCOUNT_INSN_SIZE, %eax @@ -33,6 +40,7 @@ ftrace_call: popl %edx popl %ecx popl %eax + popl %ebp .Lftrace_ret: #ifdef CONFIG_FUNCTION_GRAPH_TRACER .globl ftrace_graph_call