From: tip-bot for Josh Poimboeuf <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:x86/asm] perf/x86: Convert perf_callchain_kernel() to use the new unwinder
Date: Tue, 20 Sep 2016 07:59:37 -0700 [thread overview]
Message-ID: <tip-35f4d9b32527c08c3da3982aedae5198dc663ce8@git.kernel.org> (raw)
In-Reply-To: <a2df0c4f09b3d438e11b41681f10b0775a819a7f.1474045023.git.jpoimboe@redhat.com>
Commit-ID: 35f4d9b32527c08c3da3982aedae5198dc663ce8
Gitweb: http://git.kernel.org/tip/35f4d9b32527c08c3da3982aedae5198dc663ce8
Author: Josh Poimboeuf <jpoimboe@redhat.com>
AuthorDate: Fri, 16 Sep 2016 14:18:13 -0500
Committer: Ingo Molnar <mingo@kernel.org>
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 <jpoimboe@redhat.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Byungchul Park <byungchul.park@lge.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nilay Vaish <nilayvaish@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/a2df0c4f09b3d438e11b41681f10b0775a819a7f.1474045023.git.jpoimboe@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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 <asm/timer.h>
#include <asm/desc.h>
#include <asm/ldt.h>
+#include <asm/unwind.h>
#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
next prev parent reply other threads:[~2016-09-20 15:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-16 19:18 [PATCH v2 0/6] x86/dumpstack: replace dump_trace() with a new unwinder Josh Poimboeuf
2016-09-16 19:18 ` [PATCH v2 1/6] x86/unwind: add new unwind interface and implementations Josh Poimboeuf
2016-09-20 14:59 ` [tip:x86/asm] x86/unwind: Add " tip-bot for Josh Poimboeuf
2016-09-16 19:18 ` [PATCH v2 2/6] perf/x86: convert perf_callchain_kernel() to use the new unwinder Josh Poimboeuf
2016-09-20 14:59 ` tip-bot for Josh Poimboeuf [this message]
2016-09-16 19:18 ` [PATCH v2 3/6] x86/stacktrace: convert save_stack_trace_*() " Josh Poimboeuf
2016-09-20 15:00 ` [tip:x86/asm] x86/stacktrace: Convert " tip-bot for Josh Poimboeuf
2016-09-16 19:18 ` [PATCH v2 4/6] oprofile/x86: convert x86_backtrace() " Josh Poimboeuf
2016-09-20 15:00 ` [tip:x86/asm] oprofile/x86: Convert " tip-bot for Josh Poimboeuf
2016-09-16 19:18 ` [PATCH v2 5/6] x86/dumpstack: convert show_trace_log_lvl() " Josh Poimboeuf
2016-09-20 15:01 ` [tip:x86/asm] x86/dumpstack: Convert " tip-bot for Josh Poimboeuf
2016-09-20 15:53 ` [PATCH] x86/dumpstack: fix show_stack() task pointer regression Josh Poimboeuf
2016-09-20 21:48 ` [tip:x86/asm] x86/dumpstack: Fix " tip-bot for Josh Poimboeuf
2016-09-16 19:18 ` [PATCH v2 6/6] x86/dumpstack: remove dump_trace() and related callbacks Josh Poimboeuf
2016-09-20 15:01 ` [tip:x86/asm] x86/dumpstack: Remove " tip-bot for Josh Poimboeuf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-35f4d9b32527c08c3da3982aedae5198dc663ce8@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=byungchul.park@lge.com \
--cc=dvlasenk@redhat.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jpoimboe@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=nilayvaish@gmail.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox