From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
Tom Zanussi <tom.zanussi@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>,
Namhyung Kim <namhyung@kernel.org>, Jiri Olsa <jolsa@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Subject: [RFC PATCH 09/11] tracing: of: Add trace event settings
Date: Sat, 22 Jun 2019 01:19:30 +0900 [thread overview]
Message-ID: <156113396992.28344.5633907708861645713.stgit@devnote2> (raw)
In-Reply-To: <156113387975.28344.16009584175308192243.stgit@devnote2>
Add per-event settings, which includes filter and actions.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
kernel/trace/trace_events_trigger.c | 2 -
kernel/trace/trace_of.c | 81 +++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 2a2912cb4533..74a19c18219f 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -208,7 +208,7 @@ static int event_trigger_regex_open(struct inode *inode, struct file *file)
return ret;
}
-static int trigger_process_regex(struct trace_event_file *file, char *buff)
+int trigger_process_regex(struct trace_event_file *file, char *buff)
{
char *command, *next = buff;
struct event_command *p;
diff --git a/kernel/trace/trace_of.c b/kernel/trace/trace_of.c
index 5e34e2475d42..696f59234e62 100644
--- a/kernel/trace/trace_of.c
+++ b/kernel/trace/trace_of.c
@@ -22,6 +22,7 @@ extern int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set);
extern void __init trace_init_tracepoint_printk(void);
extern ssize_t tracing_resize_ring_buffer(struct trace_array *tr,
unsigned long size, int cpu_id);
+extern int trigger_process_regex(struct trace_event_file *file, char *buff);
static void __init
trace_of_set_ftrace_options(struct trace_array *tr, struct device_node *node)
@@ -98,6 +99,85 @@ trace_of_enable_events(struct trace_array *tr, struct device_node *node)
}
}
+static void __init
+trace_of_init_one_event(struct trace_array *tr, struct device_node *node)
+{
+ struct trace_event_file *file;
+ struct property *prop;
+ char buf[MAX_BUF_LEN];
+ char *bufp;
+ const char *p;
+ int err;
+
+ if (!of_node_name_prefix(node, "event"))
+ return;
+
+ err = of_property_read_string(node, "event", &p);
+ if (err) {
+ pr_err("Failed to find event on %s\n", of_node_full_name(node));
+ return;
+ }
+
+ err = strlcpy(buf, p, ARRAY_SIZE(buf));
+ if (err >= ARRAY_SIZE(buf)) {
+ pr_err("Event name is too long: %s\n", p);
+ return;
+ }
+ bufp = buf;
+
+ p = strsep(&bufp, ":");
+ if (!bufp) {
+ pr_err("%s has no group name\n", buf);
+ return;
+ }
+
+ mutex_lock(&event_mutex);
+ file = find_event_file(tr, buf, bufp);
+ if (!file) {
+ pr_err("Failed to find event: %s\n", buf);
+ return;
+ }
+
+ err = of_property_read_string(node, "filter", &p);
+ if (!err) {
+ if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf)) {
+ pr_err("filter string is too long: %s\n", p);
+ return;
+ }
+
+ if (apply_event_filter(file, buf) < 0) {
+ pr_err("Failed to apply filter: %s\n", buf);
+ return;
+ }
+ }
+
+ of_property_for_each_string(node, "actions", prop, p) {
+ if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf)) {
+ pr_err("action string is too long: %s\n", p);
+ continue;
+ }
+
+ if (trigger_process_regex(file, buf) < 0)
+ pr_err("Failed to apply an action: %s\n", buf);
+ }
+
+ if (of_property_read_bool(node, "enable")) {
+ if (trace_event_enable_disable(file, 1, 0) < 0)
+ pr_err("Failed to enable event node: %s\n",
+ of_node_full_name(node));
+ }
+ mutex_unlock(&event_mutex);
+}
+
+static void __init
+trace_of_init_events(struct trace_array *tr, struct device_node *node)
+{
+ struct device_node *enode;
+
+ for_each_child_of_node(node, enode)
+ trace_of_init_one_event(tr, enode);
+}
+
static void __init
trace_of_enable_tracer(struct trace_array *tr, struct device_node *trace_node)
{
@@ -126,6 +206,7 @@ static int __init trace_of_init(void)
goto end;
trace_of_set_ftrace_options(tr, trace_node);
+ trace_of_init_events(tr, trace_node);
trace_of_enable_events(tr, trace_node);
trace_of_enable_tracer(tr, trace_node);
next prev parent reply other threads:[~2019-06-21 16:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-21 16:18 [RFC PATCH 00/11] tracing: of: Boot time tracing using devicetree Masami Hiramatsu
2019-06-21 16:18 ` [RFC PATCH 01/11] tracing: Apply soft-disabled and filter to tracepoints printk Masami Hiramatsu
2019-06-21 16:18 ` [RFC PATCH 02/11] tracing: kprobes: Output kprobe event to printk buffer Masami Hiramatsu
2019-06-21 16:18 ` [RFC PATCH 03/11] tracing: Expose EXPORT_SYMBOL_GPL symbol Masami Hiramatsu
2019-06-21 16:18 ` [RFC PATCH 04/11] tracing: kprobes: Register to dynevent earlier stage Masami Hiramatsu
2019-06-21 16:18 ` [RFC PATCH 05/11] tracing: Accept different type for synthetic event fields Masami Hiramatsu
2019-06-21 16:18 ` [RFC PATCH 06/11] tracing: Add NULL trace-array check in print_synth_event() Masami Hiramatsu
2019-06-21 16:19 ` [RFC PATCH 07/11] dt-bindings: tracing: Add ftrace binding document Masami Hiramatsu
2019-06-21 16:19 ` [RFC PATCH 08/11] tracing: of: Add setup tracing by devicetree support Masami Hiramatsu
2019-06-21 16:19 ` Masami Hiramatsu [this message]
2019-06-21 16:19 ` [RFC PATCH 10/11] tracing: of: Add kprobe event support Masami Hiramatsu
2019-06-21 16:19 ` [RFC PATCH 11/11] tracing: of: Add synthetic " Masami Hiramatsu
2019-06-23 19:58 ` [RFC PATCH 00/11] tracing: of: Boot time tracing using devicetree Frank Rowand
2019-06-24 2:52 ` Masami Hiramatsu
2019-06-24 22:31 ` Frank Rowand
2019-06-25 5:00 ` Masami Hiramatsu
2019-07-15 13:55 ` Frank Rowand
2019-07-17 0:57 ` Masami Hiramatsu
2019-06-26 21:58 ` Rob Herring
2019-06-27 2:55 ` Frank Rowand
2019-06-27 10:58 ` Masami Hiramatsu
2019-07-02 9:47 ` Masami Hiramatsu
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=156113396992.28344.5633907708861645713.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=acme@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=robh+dt@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tom.zanussi@linux.intel.com \
/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).