From: Tom Zanussi <tom.zanussi@linux.intel.com>
To: rostedt@goodmis.org
Cc: masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org,
josh@joshtriplett.org, andi@firstfloor.org,
mathieu.desnoyers@efficios.com, peterz@infradead.org,
linux-kernel@vger.kernel.org,
Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: [PATCH v13 03/29] tracing: Add event record param to trigger_ops.func()
Date: Thu, 10 Dec 2015 12:50:45 -0600 [thread overview]
Message-ID: <543e31e9fc445ef61077421ab219033401c39846.1449767187.git.tom.zanussi@linux.intel.com> (raw)
In-Reply-To: <cover.1449767187.git.tom.zanussi@linux.intel.com>
In-Reply-To: <cover.1449767187.git.tom.zanussi@linux.intel.com>
Some triggers may need access to the trace event, so pass it in. Also
fix up the existing trigger funcs and their callers.
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Tested-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
---
include/linux/trace_events.h | 7 ++++---
kernel/trace/trace.h | 6 ++++--
kernel/trace/trace_events_trigger.c | 36 +++++++++++++++++++-----------------
3 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 429fdfc..95e8fef 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -430,7 +430,8 @@ extern int call_filter_check_discard(struct trace_event_call *call, void *rec,
extern enum event_trigger_type event_triggers_call(struct trace_event_file *file,
void *rec);
extern void event_triggers_post_call(struct trace_event_file *file,
- enum event_trigger_type tt);
+ enum event_trigger_type tt,
+ void *rec);
bool trace_event_ignore_this_pid(struct trace_event_file *trace_file);
@@ -517,7 +518,7 @@ event_trigger_unlock_commit(struct trace_event_file *file,
trace_buffer_unlock_commit(file->tr, buffer, event, irq_flags, pc);
if (tt)
- event_triggers_post_call(file, tt);
+ event_triggers_post_call(file, tt, entry);
}
/**
@@ -550,7 +551,7 @@ event_trigger_unlock_commit_regs(struct trace_event_file *file,
irq_flags, pc, regs);
if (tt)
- event_triggers_post_call(file, tt);
+ event_triggers_post_call(file, tt, entry);
}
#ifdef CONFIG_BPF_EVENTS
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 2aa03be..c8cf683 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1202,7 +1202,8 @@ extern int register_event_command(struct event_command *cmd);
* @func: The trigger 'probe' function called when the triggering
* event occurs. The data passed into this callback is the data
* that was supplied to the event_command @reg() function that
- * registered the trigger (see struct event_command).
+ * registered the trigger (see struct event_command) along with
+ * the trace record, rec.
*
* @init: An optional initialization function called for the trigger
* when the trigger is registered (via the event_command reg()
@@ -1227,7 +1228,8 @@ extern int register_event_command(struct event_command *cmd);
* (see trace_event_triggers.c).
*/
struct event_trigger_ops {
- void (*func)(struct event_trigger_data *data);
+ void (*func)(struct event_trigger_data *data,
+ void *rec);
int (*init)(struct event_trigger_ops *ops,
struct event_trigger_data *data);
void (*free)(struct event_trigger_ops *ops,
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 6087052..c3abef6 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -73,7 +73,7 @@ event_triggers_call(struct trace_event_file *file, void *rec)
list_for_each_entry_rcu(data, &file->triggers, list) {
if (!rec) {
- data->ops->func(data);
+ data->ops->func(data, rec);
continue;
}
filter = rcu_dereference_sched(data->filter);
@@ -83,7 +83,7 @@ event_triggers_call(struct trace_event_file *file, void *rec)
tt |= data->cmd_ops->trigger_type;
continue;
}
- data->ops->func(data);
+ data->ops->func(data, rec);
}
return tt;
}
@@ -93,6 +93,7 @@ EXPORT_SYMBOL_GPL(event_triggers_call);
* event_triggers_post_call - Call 'post_triggers' for a trace event
* @file: The trace_event_file associated with the event
* @tt: enum event_trigger_type containing a set bit for each trigger to invoke
+ * @rec: The trace entry for the event
*
* For each trigger associated with an event, invoke the trigger
* function registered with the associated trigger command, if the
@@ -103,13 +104,14 @@ EXPORT_SYMBOL_GPL(event_triggers_call);
*/
void
event_triggers_post_call(struct trace_event_file *file,
- enum event_trigger_type tt)
+ enum event_trigger_type tt,
+ void *rec)
{
struct event_trigger_data *data;
list_for_each_entry_rcu(data, &file->triggers, list) {
if (data->cmd_ops->trigger_type & tt)
- data->ops->func(data);
+ data->ops->func(data, rec);
}
}
EXPORT_SYMBOL_GPL(event_triggers_post_call);
@@ -750,7 +752,7 @@ int set_trigger_filter(char *filter_str,
}
static void
-traceon_trigger(struct event_trigger_data *data)
+traceon_trigger(struct event_trigger_data *data, void *rec)
{
if (tracing_is_on())
return;
@@ -759,7 +761,7 @@ traceon_trigger(struct event_trigger_data *data)
}
static void
-traceon_count_trigger(struct event_trigger_data *data)
+traceon_count_trigger(struct event_trigger_data *data, void *rec)
{
if (tracing_is_on())
return;
@@ -774,7 +776,7 @@ traceon_count_trigger(struct event_trigger_data *data)
}
static void
-traceoff_trigger(struct event_trigger_data *data)
+traceoff_trigger(struct event_trigger_data *data, void *rec)
{
if (!tracing_is_on())
return;
@@ -783,7 +785,7 @@ traceoff_trigger(struct event_trigger_data *data)
}
static void
-traceoff_count_trigger(struct event_trigger_data *data)
+traceoff_count_trigger(struct event_trigger_data *data, void *rec)
{
if (!tracing_is_on())
return;
@@ -879,13 +881,13 @@ static struct event_command trigger_traceoff_cmd = {
#ifdef CONFIG_TRACER_SNAPSHOT
static void
-snapshot_trigger(struct event_trigger_data *data)
+snapshot_trigger(struct event_trigger_data *data, void *rec)
{
tracing_snapshot();
}
static void
-snapshot_count_trigger(struct event_trigger_data *data)
+snapshot_count_trigger(struct event_trigger_data *data, void *rec)
{
if (!data->count)
return;
@@ -893,7 +895,7 @@ snapshot_count_trigger(struct event_trigger_data *data)
if (data->count != -1)
(data->count)--;
- snapshot_trigger(data);
+ snapshot_trigger(data, rec);
}
static int
@@ -972,13 +974,13 @@ static __init int register_trigger_snapshot_cmd(void) { return 0; }
#define STACK_SKIP 3
static void
-stacktrace_trigger(struct event_trigger_data *data)
+stacktrace_trigger(struct event_trigger_data *data, void *rec)
{
trace_dump_stack(STACK_SKIP);
}
static void
-stacktrace_count_trigger(struct event_trigger_data *data)
+stacktrace_count_trigger(struct event_trigger_data *data, void *rec)
{
if (!data->count)
return;
@@ -986,7 +988,7 @@ stacktrace_count_trigger(struct event_trigger_data *data)
if (data->count != -1)
(data->count)--;
- stacktrace_trigger(data);
+ stacktrace_trigger(data, rec);
}
static int
@@ -1057,7 +1059,7 @@ struct enable_trigger_data {
};
static void
-event_enable_trigger(struct event_trigger_data *data)
+event_enable_trigger(struct event_trigger_data *data, void *rec)
{
struct enable_trigger_data *enable_data = data->private_data;
@@ -1068,7 +1070,7 @@ event_enable_trigger(struct event_trigger_data *data)
}
static void
-event_enable_count_trigger(struct event_trigger_data *data)
+event_enable_count_trigger(struct event_trigger_data *data, void *rec)
{
struct enable_trigger_data *enable_data = data->private_data;
@@ -1082,7 +1084,7 @@ event_enable_count_trigger(struct event_trigger_data *data)
if (data->count != -1)
(data->count)--;
- event_enable_trigger(data);
+ event_enable_trigger(data, rec);
}
static int
--
1.9.3
next prev parent reply other threads:[~2015-12-10 18:51 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-10 18:50 [PATCH 00/29] tracing: 'hist' triggers Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 01/29] tracing: Make ftrace_event_field checking functions available Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 02/29] tracing: Make event trigger " Tom Zanussi
2015-12-10 18:50 ` Tom Zanussi [this message]
2015-12-10 18:50 ` [PATCH v13 04/29] tracing: Add get_syscall_name() Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 05/29] tracing: Add a per-event-trigger 'paused' field Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 06/29] tracing: Add needs_rec flag to event triggers Tom Zanussi
2016-02-19 19:30 ` Steven Rostedt
2016-02-19 22:35 ` Steven Rostedt
2016-02-19 23:31 ` Tom Zanussi
2016-02-20 1:27 ` Steven Rostedt
2015-12-10 18:50 ` [PATCH v13 07/29] tracing: Add an unreg_all() callback to trigger commands Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 08/29] tracing: Add lock-free tracing_map Tom Zanussi
2016-02-19 19:38 ` Steven Rostedt
2015-12-10 18:50 ` [PATCH v13 09/29] tracing: Add 'hist' event trigger command Tom Zanussi
2016-02-19 21:23 ` Steven Rostedt
2016-02-19 23:27 ` Tom Zanussi
2016-02-20 1:55 ` Steven Rostedt
2015-12-10 18:50 ` [PATCH v13 10/29] tracing: Add hist trigger support for multiple values ('vals=' param) Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 11/29] tracing: Add hist trigger support for compound keys Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 12/29] tracing: Add hist trigger support for user-defined sorting ('sort=' param) Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 13/29] tracing: Add hist trigger support for pausing and continuing a trace Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 14/29] tracing: Add hist trigger support for clearing " Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 15/29] tracing: Add hist trigger 'hex' modifier for displaying numeric fields Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 16/29] tracing: Add hist trigger 'sym' and 'sym-offset' modifiers Tom Zanussi
2015-12-10 18:50 ` [PATCH v13 17/29] tracing: Add hist trigger 'execname' modifier Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 18/29] tracing: Add hist trigger 'syscall' modifier Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 19/29] tracing: Add hist trigger support for stacktraces as keys Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 20/29] tracing: Support string type key properly Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 21/29] tracing: Remove restriction on string position in hist trigger keys Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 22/29] tracing: Add enable_hist/disable_hist triggers Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 23/29] tracing: Add 'hist' trigger Documentation Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 24/29] tracing: Add support for multiple hist triggers per event Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 25/29] tracing: Add support for named triggers Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 26/29] tracing: Add support for named hist triggers Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 27/29] kselftests/ftrace : Add event trigger testcases Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 28/29] kselftests/ftrace: Add hist " Tom Zanussi
2015-12-10 18:51 ` [PATCH v13 29/29] tracing: Add hist trigger 'log2' modifier Tom Zanussi
2016-02-12 16:17 ` [PATCH 00/29] tracing: 'hist' triggers Tom Zanussi
2016-02-12 16:59 ` Steven Rostedt
2016-02-16 22:43 ` Tom Zanussi
2016-02-16 23:42 ` Steven Rostedt
2016-02-17 2:57 ` 平松雅巳 / HIRAMATU，MASAMI
2016-02-19 15:24 ` Tom Zanussi
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=543e31e9fc445ef61077421ab219033401c39846.1449767187.git.tom.zanussi@linux.intel.com \
--to=tom.zanussi@linux.intel.com \
--cc=andi@firstfloor.org \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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
all inboxes | Powered by JetHome®