From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932927AbcITPCN (ORCPT ); Tue, 20 Sep 2016 11:02:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57948 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932865AbcITPCI (ORCPT ); Tue, 20 Sep 2016 11:02:08 -0400 Date: Tue, 20 Sep 2016 08:00:36 -0700 From: tip-bot for Josh Poimboeuf Message-ID: Cc: brgerst@gmail.com, torvalds@linux-foundation.org, luto@kernel.org, nilayvaish@gmail.com, mingo@kernel.org, bp@alien8.de, byungchul.park@lge.com, peterz@infradead.org, tglx@linutronix.de, jpoimboe@redhat.com, fweisbec@gmail.com, keescook@chromium.org, dvlasenk@redhat.com, luto@amacapital.net, hpa@zytor.com, rostedt@goodmis.org, rric@kernel.org, linux-kernel@vger.kernel.org Reply-To: rric@kernel.org, hpa@zytor.com, rostedt@goodmis.org, luto@amacapital.net, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, byungchul.park@lge.com, bp@alien8.de, mingo@kernel.org, luto@kernel.org, nilayvaish@gmail.com, torvalds@linux-foundation.org, brgerst@gmail.com, keescook@chromium.org, jpoimboe@redhat.com, fweisbec@gmail.com, peterz@infradead.org, tglx@linutronix.de In-Reply-To: <412df8927705795e8ea60cffcf89a79e010713b1.1474045023.git.jpoimboe@redhat.com> References: <412df8927705795e8ea60cffcf89a79e010713b1.1474045023.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] oprofile/x86: Convert x86_backtrace() to use the new unwinder Git-Commit-ID: ec2ad9ccf12dc965cad2d367a4063f68d6561a6b 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: ec2ad9ccf12dc965cad2d367a4063f68d6561a6b Gitweb: http://git.kernel.org/tip/ec2ad9ccf12dc965cad2d367a4063f68d6561a6b Author: Josh Poimboeuf AuthorDate: Fri, 16 Sep 2016 14:18:15 -0500 Committer: Ingo Molnar CommitDate: Tue, 20 Sep 2016 08:29:34 +0200 oprofile/x86: Convert x86_backtrace() to use the new unwinder Convert oprofile's x86_backtrace() to use the new unwinder. dump_trace() has been deprecated. Signed-off-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Byungchul Park Cc: Denys Vlasenko Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Nilay Vaish Cc: Peter Zijlstra Cc: Robert Richter Cc: Steven Rostedt Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/412df8927705795e8ea60cffcf89a79e010713b1.1474045023.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/oprofile/backtrace.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c index 7539148..a2488b6 100644 --- a/arch/x86/oprofile/backtrace.c +++ b/arch/x86/oprofile/backtrace.c @@ -16,27 +16,7 @@ #include #include - -static int backtrace_stack(void *data, const char *name) -{ - /* Yes, we want all stacks */ - return 0; -} - -static int backtrace_address(void *data, unsigned long addr, int reliable) -{ - unsigned int *depth = data; - - if ((*depth)--) - oprofile_add_trace(addr); - return 0; -} - -static struct stacktrace_ops backtrace_ops = { - .stack = backtrace_stack, - .address = backtrace_address, - .walk_stack = print_context_stack, -}; +#include #ifdef CONFIG_COMPAT static struct stack_frame_ia32 * @@ -113,14 +93,29 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth) struct stack_frame *head = (struct stack_frame *)frame_pointer(regs); if (!user_mode(regs)) { + struct unwind_state state; + unsigned long addr; + if (!depth) return; oprofile_add_trace(regs->ip); + if (!--depth) return; - dump_trace(NULL, regs, NULL, 0, &backtrace_ops, &depth); + for (unwind_start(&state, current, regs, NULL); + !unwind_done(&state); unwind_next_frame(&state)) { + addr = unwind_get_return_address(&state); + if (!addr) + break; + + oprofile_add_trace(addr); + + if (!--depth) + break; + } + return; }