From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932786AbcITPBV (ORCPT ); Tue, 20 Sep 2016 11:01:21 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57856 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932698AbcITPBR (ORCPT ); Tue, 20 Sep 2016 11:01:17 -0400 Date: Tue, 20 Sep 2016 07:59:37 -0700 From: tip-bot for Josh Poimboeuf Message-ID: Cc: luto@kernel.org, peterz@infradead.org, brgerst@gmail.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, jpoimboe@redhat.com, mingo@kernel.org, nilayvaish@gmail.com, fweisbec@gmail.com, rostedt@goodmis.org, tglx@linutronix.de, keescook@chromium.org, bp@alien8.de, hpa@zytor.com, luto@amacapital.net, byungchul.park@lge.com Reply-To: brgerst@gmail.com, torvalds@linux-foundation.org, peterz@infradead.org, luto@kernel.org, luto@amacapital.net, hpa@zytor.com, byungchul.park@lge.com, bp@alien8.de, tglx@linutronix.de, keescook@chromium.org, rostedt@goodmis.org, nilayvaish@gmail.com, fweisbec@gmail.com, jpoimboe@redhat.com, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] perf/x86: Convert perf_callchain_kernel() to use the new unwinder Git-Commit-ID: 35f4d9b32527c08c3da3982aedae5198dc663ce8 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: 35f4d9b32527c08c3da3982aedae5198dc663ce8 Gitweb: http://git.kernel.org/tip/35f4d9b32527c08c3da3982aedae5198dc663ce8 Author: Josh Poimboeuf AuthorDate: Fri, 16 Sep 2016 14:18:13 -0500 Committer: Ingo Molnar CommitDate: Tue, 20 Sep 2016 08:29:33 +0200 perf/x86: Convert perf_callchain_kernel() to use the new unwinder Convert perf_callchain_kernel() 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: Steven Rostedt Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/a2df0c4f09b3d438e11b41681f10b0775a819a7f.1474045023.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/events/core.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 477dc38..0a8bd7f 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "perf_event.h" @@ -2247,31 +2248,12 @@ void arch_perf_update_userpage(struct perf_event *event, cyc2ns_read_end(data); } -/* - * callchain support - */ - -static int backtrace_stack(void *data, const char *name) -{ - return 0; -} - -static int backtrace_address(void *data, unsigned long addr, int reliable) -{ - struct perf_callchain_entry_ctx *entry = data; - - return perf_callchain_store(entry, addr); -} - -static const struct stacktrace_ops backtrace_ops = { - .stack = backtrace_stack, - .address = backtrace_address, - .walk_stack = print_context_stack_bp, -}; - void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs) { + struct unwind_state state; + unsigned long addr; + if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) { /* TODO: We don't support guest os callchain now */ return; @@ -2280,7 +2262,12 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re if (perf_callchain_store(entry, regs->ip)) return; - dump_trace(NULL, regs, NULL, 0, &backtrace_ops, entry); + for (unwind_start(&state, current, regs, NULL); !unwind_done(&state); + unwind_next_frame(&state)) { + addr = unwind_get_return_address(&state); + if (!addr || perf_callchain_store(entry, addr)) + return; + } } static inline int