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 30/37] tracing: Add hist trigger support for variable reference aliases
Date: Wed, 6 Dec 2017 16:38:11 -0600 [thread overview]
Message-ID: <5911e0dde2b7a6bc76971fd866a0e3e15a4f77a5.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 support for alias=$somevar where alias can be used as
onmatch.xxx($alias).
Aliases are a way of creating a new name for an existing variable, for
flexibly in making naming more clear in certain cases. For example in
the below the user perhaps feels that using $new_lat in the synthetic
event invocation is opaque or doesn't fit well stylistically with
previous triggers, so creates an alias of $new_lat named $latency and
uses that in the call instead:
# echo 'hist:keys=next_pid:new_lat=common_timestamp.usecs' >
/sys/kernel/debug/tracing/events/sched/sched_switch/trigger
# echo 'hist:keys=pid:latency=$new_lat:
onmatch(sched.sched_switch).wake2($latency,pid)' >
/sys/kernel/debug/tracing/events/synthetic/wake1/trigger
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
kernel/trace/trace_events_hist.c | 58 +++++++++++++++++++++++++++++++++++++---
1 file changed, 55 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 6f3e985..1e79f79 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -228,6 +228,7 @@ enum hist_field_flags {
HIST_FIELD_FL_EXPR = 1 << 13,
HIST_FIELD_FL_VAR_REF = 1 << 14,
HIST_FIELD_FL_CPU = 1 << 15,
+ HIST_FIELD_FL_ALIAS = 1 << 16,
};
struct var_defs {
@@ -1626,7 +1627,8 @@ static const char *hist_field_name(struct hist_field *field,
if (field->field)
field_name = field->field->name;
- else if (field->flags & HIST_FIELD_FL_LOG2)
+ else if (field->flags & HIST_FIELD_FL_LOG2 ||
+ field->flags & HIST_FIELD_FL_ALIAS)
field_name = hist_field_name(field->operands[0], ++level);
else if (field->flags & HIST_FIELD_FL_TIMESTAMP)
field_name = "common_timestamp";
@@ -2095,7 +2097,7 @@ static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data,
hist_field->hist_data = hist_data;
- if (flags & HIST_FIELD_FL_EXPR)
+ if (flags & HIST_FIELD_FL_EXPR || flags & HIST_FIELD_FL_ALIAS)
goto out; /* caller will populate */
if (flags & HIST_FIELD_FL_VAR_REF) {
@@ -2395,6 +2397,28 @@ static struct hist_field *parse_var_ref(struct hist_trigger_data *hist_data,
return field;
}
+static struct hist_field *create_alias(struct hist_trigger_data *hist_data,
+ struct hist_field *var_ref,
+ char *var_name)
+{
+ struct hist_field *alias = NULL;
+ unsigned long flags = HIST_FIELD_FL_ALIAS | HIST_FIELD_FL_VAR;
+
+ alias = create_hist_field(hist_data, NULL, flags, var_name);
+ if (!alias)
+ return NULL;
+
+ alias->fn = var_ref->fn;
+ alias->operands[0] = var_ref;
+
+ if (init_var_ref(alias, var_ref, var_ref->system, var_ref->event_name)) {
+ destroy_hist_field(alias, 0);
+ return NULL;
+ }
+
+ return alias;
+}
+
struct hist_field *parse_atom(struct hist_trigger_data *hist_data,
struct trace_event_file *file, char *str,
unsigned long *flags, char *var_name)
@@ -2428,6 +2452,13 @@ struct hist_field *parse_atom(struct hist_trigger_data *hist_data,
if (hist_field) {
hist_data->var_refs[hist_data->n_var_refs] = hist_field;
hist_field->var_ref_idx = hist_data->n_var_refs++;
+ if (var_name) {
+ hist_field = create_alias(hist_data, hist_field, var_name);
+ if (!hist_field) {
+ ret = -ENOMEM;
+ goto out;
+ }
+ }
return hist_field;
}
} else
@@ -2532,6 +2563,26 @@ static int check_expr_operands(struct hist_field *operand1,
unsigned long operand1_flags = operand1->flags;
unsigned long operand2_flags = operand2->flags;
+ if ((operand1_flags & HIST_FIELD_FL_VAR_REF) ||
+ (operand1_flags & HIST_FIELD_FL_ALIAS)) {
+ struct hist_field *var;
+
+ var = find_var_field(operand1->var.hist_data, operand1->name);
+ if (!var)
+ return -EINVAL;
+ operand1_flags = var->flags;
+ }
+
+ if ((operand2_flags & HIST_FIELD_FL_VAR_REF) ||
+ (operand2_flags & HIST_FIELD_FL_ALIAS)) {
+ struct hist_field *var;
+
+ var = find_var_field(operand2->var.hist_data, operand2->name);
+ if (!var)
+ return -EINVAL;
+ operand2_flags = var->flags;
+ }
+
if ((operand1_flags & HIST_FIELD_FL_TIMESTAMP_USECS) !=
(operand2_flags & HIST_FIELD_FL_TIMESTAMP_USECS))
return -EINVAL;
@@ -4659,7 +4710,8 @@ static void hist_field_print(struct seq_file *m, struct hist_field *hist_field)
else if (hist_field->flags & HIST_FIELD_FL_CPU)
seq_puts(m, "cpu");
else if (field_name) {
- if (hist_field->flags & HIST_FIELD_FL_VAR_REF)
+ if (hist_field->flags & HIST_FIELD_FL_VAR_REF ||
+ hist_field->flags & HIST_FIELD_FL_ALIAS)
seq_putc(m, '$');
seq_printf(m, "%s", field_name);
}
--
1.9.3
next prev parent reply other threads:[~2017-12-06 22:40 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 ` [PATCH v7 23/37] tracing: Add hist trigger action hook Tom Zanussi
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 ` Tom Zanussi [this message]
2017-12-06 22:38 ` [PATCH v7 31/37] tracing: Add 'last error' error facility " 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=5911e0dde2b7a6bc76971fd866a0e3e15a4f77a5.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).