From: Tom Zanussi <tom.zanussi@linux.intel.com>
To: rostedt@goodmis.org
Cc: tglx@linutronix.de, mhiramat@kernel.org, namhyung@kernel.org,
vedang.patel@intel.com, bigeasy@linutronix.de,
joel.opensrc@gmail.com, joelaf@google.com,
mathieu.desnoyers@efficios.com, baohong.liu@intel.com,
rajvi.jingar@intel.com, julia@ni.com, fengguang.wu@intel.com,
linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org,
Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: [PATCH v7 23/37] tracing: Add hist trigger action hook
Date: Wed, 6 Dec 2017 16:38:04 -0600 [thread overview]
Message-ID: <3d49ad4ecbf9becca01c2e82bf943b6397e360fb.1512593081.git.tom.zanussi@linux.intel.com> (raw)
In-Reply-To: <cover.1512593081.git.tom.zanussi@linux.intel.com>
In-Reply-To: <cover.1512593081.git.tom.zanussi@linux.intel.com>
Add a hook for executing extra actions whenever a histogram entry is
added or updated.
The default 'action' when a hist entry is added to a histogram is to
update the set of values associated with it. Some applications may
want to perform additional actions at that point, such as generate
another event, or compare and save a maximum.
Add a simple framework for doing that; specific actions will be
implemented on top of it in later patches.
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
kernel/trace/trace_events_hist.c | 106 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 104 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 50d8c1e..ef474b8 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -33,6 +33,7 @@ typedef u64 (*hist_field_fn_t) (struct hist_field *field,
#define HIST_FIELD_OPERANDS_MAX 2
#define HIST_FIELDS_MAX (TRACING_MAP_FIELDS_MAX + TRACING_MAP_VARS_MAX)
+#define HIST_ACTIONS_MAX 8
enum field_op_id {
FIELD_OP_NONE,
@@ -242,6 +243,9 @@ struct hist_trigger_attrs {
char *assignment_str[TRACING_MAP_VARS_MAX];
unsigned int n_assignments;
+ char *action_str[HIST_ACTIONS_MAX];
+ unsigned int n_actions;
+
struct var_defs var_defs;
};
@@ -261,6 +265,21 @@ struct hist_trigger_data {
bool remove;
struct hist_field *var_refs[TRACING_MAP_VARS_MAX];
unsigned int n_var_refs;
+
+ struct action_data *actions[HIST_ACTIONS_MAX];
+ unsigned int n_actions;
+};
+
+struct action_data;
+
+typedef void (*action_fn_t) (struct hist_trigger_data *hist_data,
+ struct tracing_map_elt *elt, void *rec,
+ struct ring_buffer_event *rbe,
+ struct action_data *data, u64 *var_ref_vals);
+
+struct action_data {
+ action_fn_t fn;
+ unsigned int var_ref_idx;
};
static u64 hist_field_timestamp(struct hist_field *hist_field,
@@ -777,6 +796,9 @@ static void destroy_hist_trigger_attrs(struct hist_trigger_attrs *attrs)
for (i = 0; i < attrs->n_assignments; i++)
kfree(attrs->assignment_str[i]);
+ for (i = 0; i < attrs->n_actions; i++)
+ kfree(attrs->action_str[i]);
+
kfree(attrs->name);
kfree(attrs->sort_key_str);
kfree(attrs->keys_str);
@@ -784,6 +806,16 @@ static void destroy_hist_trigger_attrs(struct hist_trigger_attrs *attrs)
kfree(attrs);
}
+static int parse_action(char *str, struct hist_trigger_attrs *attrs)
+{
+ int ret = 0;
+
+ if (attrs->n_actions >= HIST_ACTIONS_MAX)
+ return ret;
+
+ return ret;
+}
+
static int parse_assignment(char *str, struct hist_trigger_attrs *attrs)
{
int ret = 0;
@@ -867,8 +899,9 @@ static struct hist_trigger_attrs *parse_hist_trigger_attrs(char *trigger_str)
else if (strcmp(str, "clear") == 0)
attrs->clear = true;
else {
- ret = -EINVAL;
- goto free;
+ ret = parse_action(str, attrs);
+ if (ret)
+ goto free;
}
}
@@ -2056,11 +2089,55 @@ static int create_sort_keys(struct hist_trigger_data *hist_data)
return ret;
}
+static void destroy_actions(struct hist_trigger_data *hist_data)
+{
+ unsigned int i;
+
+ for (i = 0; i < hist_data->n_actions; i++) {
+ struct action_data *data = hist_data->actions[i];
+
+ kfree(data);
+ }
+}
+
+static int parse_actions(struct hist_trigger_data *hist_data)
+{
+ unsigned int i;
+ int ret = 0;
+ char *str;
+
+ for (i = 0; i < hist_data->attrs->n_actions; i++) {
+ str = hist_data->attrs->action_str[i];
+ }
+
+ return ret;
+}
+
+static int create_actions(struct hist_trigger_data *hist_data,
+ struct trace_event_file *file)
+{
+ struct action_data *data;
+ unsigned int i;
+ int ret = 0;
+
+ for (i = 0; i < hist_data->attrs->n_actions; i++) {
+ data = hist_data->actions[i];
+ }
+
+ return ret;
+}
+
static void destroy_hist_data(struct hist_trigger_data *hist_data)
{
+ if (!hist_data)
+ return;
+
destroy_hist_trigger_attrs(hist_data->attrs);
destroy_hist_fields(hist_data);
tracing_map_destroy(hist_data->map);
+
+ destroy_actions(hist_data);
+
kfree(hist_data);
}
@@ -2127,6 +2204,10 @@ static int create_tracing_map_fields(struct hist_trigger_data *hist_data)
hist_data->remove = remove;
hist_data->event_file = file;
+ ret = parse_actions(hist_data);
+ if (ret)
+ goto free;
+
ret = create_hist_fields(hist_data, file);
if (ret)
goto free;
@@ -2218,6 +2299,20 @@ static inline void add_to_key(char *compound_key, void *key,
memcpy(compound_key + key_field->offset, key, size);
}
+static void
+hist_trigger_actions(struct hist_trigger_data *hist_data,
+ struct tracing_map_elt *elt, void *rec,
+ struct ring_buffer_event *rbe, u64 *var_ref_vals)
+{
+ struct action_data *data;
+ unsigned int i;
+
+ for (i = 0; i < hist_data->n_actions; i++) {
+ data = hist_data->actions[i];
+ data->fn(hist_data, elt, rec, rbe, data, var_ref_vals);
+ }
+}
+
static void event_hist_trigger(struct event_trigger_data *data, void *rec,
struct ring_buffer_event *rbe)
{
@@ -2273,6 +2368,9 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec,
return;
hist_trigger_elt_update(hist_data, elt, rec, rbe, var_ref_vals);
+
+ if (resolve_var_refs(hist_data, key, var_ref_vals, true))
+ hist_trigger_actions(hist_data, elt, rec, rbe, var_ref_vals);
}
static void hist_trigger_stacktrace_print(struct seq_file *m,
@@ -3057,6 +3155,10 @@ static int event_hist_trigger_func(struct event_command *cmd_ops,
if (has_hist_vars(hist_data))
save_hist_vars(hist_data);
+ ret = create_actions(hist_data, file);
+ if (ret)
+ goto out_unreg;
+
ret = tracing_map_init(hist_data->map);
if (ret)
goto out_unreg;
--
1.9.3
next prev parent reply other threads:[~2017-12-06 22:44 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-06 22:37 [PATCH v7 00/37] tracing: Inter-event (e.g. latency) support Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 01/37] tracing: Move hist trigger Documentation to histogram.txt Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 02/37] tracing: Add Documentation for log2 modifier Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 03/37] tracing: Add support to detect and avoid duplicates Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 04/37] tracing: Remove code which merges duplicates Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 05/37] ring-buffer: Add interface for setting absolute time stamps Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 06/37] ring-buffer: Redefine the unimplemented RINGBUF_TYPE_TIME_STAMP Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 07/37] tracing: Add timestamp_mode trace file Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 08/37] tracing: Give event triggers access to ring_buffer_event Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 09/37] tracing: Add ring buffer event param to hist field functions Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 10/37] tracing: Break out hist trigger assignment parsing Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 11/37] tracing: Add hist trigger timestamp support Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 12/37] tracing: Add per-element variable support to tracing_map Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 13/37] tracing: Add hist_data member to hist_field Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 14/37] tracing: Add usecs modifier for hist trigger timestamps Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 15/37] tracing: Add variable support to hist triggers Tom Zanussi
2017-12-08 13:02 ` Namhyung Kim
2017-12-08 19:54 ` Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 16/37] tracing: Account for variables in named trigger compatibility Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 17/37] tracing: Move get_hist_field_flags() Tom Zanussi
2017-12-06 22:37 ` [PATCH v7 18/37] tracing: Add simple expression support to hist triggers Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 19/37] tracing: Generalize per-element hist trigger data Tom Zanussi
2017-12-08 13:06 ` Namhyung Kim
2017-12-08 19:56 ` Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 20/37] tracing: Pass tracing_map_elt to hist_field accessor functions Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 21/37] tracing: Add hist_field 'type' field Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 22/37] tracing: Add variable reference handling to hist triggers Tom Zanussi
2017-12-11 15:17 ` Namhyung Kim
2017-12-11 17:53 ` Tom Zanussi
2017-12-06 22:38 ` Tom Zanussi [this message]
2017-12-06 22:38 ` [PATCH v7 24/37] tracing: Add support for 'synthetic' events Tom Zanussi
2017-12-12 14:42 ` Namhyung Kim
2017-12-12 16:07 ` Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 25/37] tracing: Add support for 'field variables' Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 26/37] tracing: Add 'onmatch' hist trigger action support Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 27/37] tracing: Add 'onmax' " Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 28/37] tracing: Allow whitespace to surround hist trigger filter Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 29/37] tracing: Add cpu field for hist triggers Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 30/37] tracing: Add hist trigger support for variable reference aliases Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 31/37] tracing: Add 'last error' error facility for hist triggers Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 32/37] tracing: Add inter-event hist trigger Documentation Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 33/37] tracing: Make tracing_set_clock() non-static Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 34/37] tracing: Add a clock attribute for hist triggers Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 35/37] tracing: Increase trace_recursive_lock() limit for synthetic events Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 36/37] tracing: Add inter-event blurb to HIST_TRIGGERS config option Tom Zanussi
2017-12-06 22:38 ` [PATCH v7 37/37] selftests: ftrace: Add inter-event hist triggers testcases 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=3d49ad4ecbf9becca01c2e82bf943b6397e360fb.1512593081.git.tom.zanussi@linux.intel.com \
--to=tom.zanussi@linux.intel.com \
--cc=baohong.liu@intel.com \
--cc=bigeasy@linutronix.de \
--cc=fengguang.wu@intel.com \
--cc=joel.opensrc@gmail.com \
--cc=joelaf@google.com \
--cc=julia@ni.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=namhyung@kernel.org \
--cc=rajvi.jingar@intel.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=vedang.patel@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).