From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Borislav Petkov <bp@alien8.de>, "H . Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Leo Yan <leo.yan@linaro.org>, Jiri Olsa <jolsa@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH V7 08/15] ftrace: Add perf text poke events for ftrace trampolines
Date: Tue, 12 May 2020 15:19:15 +0300 [thread overview]
Message-ID: <20200512121922.8997-9-adrian.hunter@intel.com> (raw)
In-Reply-To: <20200512121922.8997-1-adrian.hunter@intel.com>
Add perf text poke events for ftrace trampolines when created and when
freed.
There can be 3 text_poke events for ftrace trampolines:
1. NULL -> trampoline
By ftrace_update_trampoline() when !ops->trampoline
Trampoline created
2. [e.g. on x86] CALL rel32 -> CALL rel32
By arch_ftrace_update_trampoline() when ops->trampoline and
ops->flags & FTRACE_OPS_FL_ALLOC_TRAMP
[e.g. on x86] via text_poke_bp() which generates text poke events
Trampoline-called function target updated
3. trampoline -> NULL
By ftrace_trampoline_free() when ops->trampoline and
ops->flags & FTRACE_OPS_FL_ALLOC_TRAMP
Trampoline freed
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
kernel/trace/ftrace.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 1103a8fcf142..abdf8f415a6e 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2802,6 +2802,13 @@ static void ftrace_trampoline_free(struct ftrace_ops *ops)
{
if (ops && (ops->flags & FTRACE_OPS_FL_ALLOC_TRAMP) &&
ops->trampoline) {
+ /*
+ * Record the text poke event before the ksymbol unregister
+ * event.
+ */
+ perf_event_text_poke((void *)ops->trampoline,
+ (void *)ops->trampoline,
+ ops->trampoline_size, NULL, 0);
perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_OOL,
ops->trampoline, ops->trampoline_size,
true, FTRACE_TRAMPOLINE_SYM);
@@ -6826,6 +6833,13 @@ static void ftrace_update_trampoline(struct ftrace_ops *ops)
perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_OOL,
ops->trampoline, ops->trampoline_size, false,
FTRACE_TRAMPOLINE_SYM);
+ /*
+ * Record the perf text poke event after the ksymbol register
+ * event.
+ */
+ perf_event_text_poke((void *)ops->trampoline, NULL, 0,
+ (void *)ops->trampoline,
+ ops->trampoline_size);
}
}
--
2.17.1
next prev parent reply other threads:[~2020-05-12 12:19 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 12:19 [PATCH V7 00/15] perf/x86: Add perf text poke events Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 01/15] perf: Add perf text poke event Adrian Hunter
2020-06-16 12:21 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 02/15] perf/x86: Add support for perf text poke event for text_poke_bp_batch() callers Adrian Hunter
2020-06-16 12:21 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 03/15] kprobes: Add symbols for kprobe insn pages Adrian Hunter
2020-05-27 17:43 ` Peter Zijlstra
2020-05-28 0:31 ` Masami Hiramatsu
2020-05-28 8:00 ` Adrian Hunter
2020-05-28 8:00 ` [PATCH V8 " Adrian Hunter
2020-06-16 12:21 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2020-05-28 0:25 ` [PATCH V7 03/15] " Masami Hiramatsu
2020-05-12 12:19 ` [PATCH V7 04/15] kprobes: Add perf ksymbol events " Adrian Hunter
2020-05-27 16:17 ` Peter Zijlstra
2020-05-27 17:20 ` Peter Zijlstra
2020-05-28 7:58 ` Adrian Hunter
2020-06-16 12:21 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 05/15] perf/x86: Add perf text poke events for kprobes Adrian Hunter
2020-06-16 12:21 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 06/15] ftrace: Add symbols for ftrace trampolines Adrian Hunter
2020-06-16 12:21 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 07/15] ftrace: Add perf ksymbol events " Adrian Hunter
2020-06-16 12:21 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2020-05-12 12:19 ` Adrian Hunter [this message]
2020-06-16 12:21 ` [tip: perf/core] ftrace: Add perf text poke " tip-bot2 for Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 09/15] perf kcore_copy: Fix module map when there are no modules loaded Adrian Hunter
2020-05-27 15:44 ` Arnaldo Carvalho de Melo
2020-05-12 12:19 ` [PATCH V7 10/15] perf evlist: Disable 'immediate' events last Adrian Hunter
2020-05-27 15:44 ` Arnaldo Carvalho de Melo
2020-05-12 12:19 ` [PATCH V7 11/15] perf tools: Add support for PERF_RECORD_TEXT_POKE Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 12/15] perf tools: Add support for PERF_RECORD_KSYMBOL_TYPE_OOL Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 13/15] perf intel-pt: Add support for text poke events Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 14/15] perf script: Add option --show-text-poke-events Adrian Hunter
2020-05-12 12:19 ` [PATCH V7 15/15] perf script: Show text poke address symbol Adrian Hunter
2020-05-20 1:38 ` Arnaldo Carvalho de Melo
2020-07-10 11:34 ` Arnaldo Carvalho de Melo
2020-07-10 11:38 ` Adrian Hunter
2020-05-17 13:16 ` [PATCH V7 00/15] perf/x86: Add perf text poke events Adrian Hunter
2020-05-20 1:40 ` Arnaldo Carvalho de Melo
2020-05-20 15:56 ` Peter Zijlstra
2020-05-27 15:47 ` Arnaldo Carvalho de Melo
2020-05-27 15:54 ` Peter Zijlstra
2020-07-08 11:55 ` Adrian Hunter
2020-07-08 12:34 ` Arnaldo Carvalho de Melo
2020-07-10 11:43 ` Arnaldo Carvalho de Melo
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=20200512121922.8997-9-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=x86@kernel.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;
as well as URLs for NNTP newsgroup(s).