From: Jiri Olsa <jolsa@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Arnaldo Carvalho de Melo <acme@kernel.org>
Subject: [PATCH 2/5] ftrace perf: Move exclude_kernel tracepoint check to init event
Date: Wed, 16 Mar 2016 15:34:30 +0100 [thread overview]
Message-ID: <1458138873-1553-3-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1458138873-1553-1-git-send-email-jolsa@kernel.org>
We suppress events with attr::exclude_kernel set when
the event is generated, so following capture will
give no warning but won't produce any data:
$ sudo perf record -e sched:sched_switch:u ls
$ sudo /perf script | wc -l
0
Checking the attr::exclude_(kernel|user) at the event
init time and failing right away for tracepoints from
uprobes/kprobes and native ones:
$ sudo perf record -e sched:sched_switch:u ls
Error:
The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (sched:sched_switch).
/bin/dmesg may provide additional information.
No CONFIG_PERF_EVENTS=y kernel support configured?
$ sudo perf record -e probe:sys_read:u ls
Error:
The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (probe:sys_read).
/bin/dmesg may provide additional information.
No CONFIG_PERF_EVENTS=y kernel support configured?
$ ./perf record -e probe_ex:main:k ./ex
Error:
The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (probe_ex:main).
/bin/dmesg may provide additional information.
No CONFIG_PERF_EVENTS=y kernel support configured?
Acked-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
kernel/events/core.c | 5 -----
kernel/trace/trace_event_perf.c | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index c15fd097af93..ca68fdcf47ce 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6898,11 +6898,6 @@ static int perf_tp_event_match(struct perf_event *event,
{
if (event->hw.state & PERF_HES_STOPPED)
return 0;
- /*
- * All tracepoints are from kernel-space.
- */
- if (event->attr.exclude_kernel)
- return 0;
if (!perf_tp_filter_match(event, data))
return 0;
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c
index e11108f1d197..6e6d4052f398 100644
--- a/kernel/trace/trace_event_perf.c
+++ b/kernel/trace/trace_event_perf.c
@@ -185,11 +185,36 @@ static void perf_trace_event_close(struct perf_event *p_event)
tp_event->class->reg(tp_event, TRACE_REG_PERF_CLOSE, p_event);
}
+static int perf_trace_event_attr(struct trace_event_call *tp_event,
+ struct perf_event *event)
+{
+ /*
+ * All tracepoints and kprobes are from kernel-space.
+ */
+ if (((tp_event->flags & TRACE_EVENT_FL_TRACEPOINT) ||
+ (tp_event->flags & TRACE_EVENT_FL_KPROBE)) &&
+ event->attr.exclude_kernel)
+ return -EINVAL;
+
+ /*
+ * All uprobes are from user-space.
+ */
+ if ((tp_event->flags & TRACE_EVENT_FL_UPROBE) &&
+ event->attr.exclude_user)
+ return -EINVAL;
+
+ return 0;
+}
+
static int perf_trace_event_init(struct trace_event_call *tp_event,
struct perf_event *p_event)
{
int ret;
+ ret = perf_trace_event_attr(tp_event, p_event);
+ if (ret)
+ return ret;
+
ret = perf_trace_event_perm(tp_event, p_event);
if (ret)
return ret;
--
2.4.3
next prev parent reply other threads:[~2016-03-16 14:34 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-16 14:34 [PATCHv2 0/5] ftrace perf: Fixes and speedup Jiri Olsa
2016-03-16 14:34 ` [PATCH 1/5] ftrace perf: Check sample types only for sampling events Jiri Olsa
2016-03-18 14:27 ` Steven Rostedt
2016-03-31 9:25 ` [tip:perf/core] ftrace/perf: " tip-bot for Jiri Olsa
2016-03-16 14:34 ` Jiri Olsa [this message]
2016-03-18 14:28 ` [PATCH 2/5] ftrace perf: Move exclude_kernel tracepoint check to init event Steven Rostedt
2016-03-23 10:41 ` Peter Zijlstra
2016-03-24 9:56 ` Jiri Olsa
2016-03-24 10:49 ` Peter Zijlstra
2016-03-24 12:25 ` Jiri Olsa
2016-03-24 13:00 ` Peter Zijlstra
2016-03-24 13:30 ` Jiri Olsa
2016-03-16 14:34 ` [PATCH 3/5] ftrace perf: Use ftrace_ops::private to store event pointer Jiri Olsa
2016-03-18 14:28 ` Steven Rostedt
2016-03-23 14:26 ` Peter Zijlstra
2016-03-24 9:47 ` Jiri Olsa
2016-03-24 10:40 ` Peter Zijlstra
2016-03-16 14:34 ` [PATCH 4/5] ftrace: Make ftrace_hash_rec_enable return update bool Jiri Olsa
2016-03-17 0:23 ` Namhyung Kim
2016-03-16 14:34 ` [PATCH 5/5] ftrace: Update dynamic ftrace calls only if necessary Jiri Olsa
2016-03-17 0:25 ` Namhyung Kim
2016-03-18 14:27 ` Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2016-03-09 20:46 [RFC 0/5] ftrace perf: Fixes and speedup Jiri Olsa
2016-03-09 20:46 ` [PATCH 2/5] ftrace perf: Move exclude_kernel tracepoint check to init event Jiri Olsa
2016-03-10 0:39 ` Namhyung Kim
2016-03-11 8:39 ` Jiri Olsa
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=1458138873-1553-3-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.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).