From: Tom Zanussi <tom.zanussi@linux.intel.com>
To: rostedt@goodmis.org
Cc: daniel.wagner@bmw-carit.de, masami.hiramatsu.pt@hitachi.com,
namhyung@kernel.org, josh@joshtriplett.org, andi@firstfloor.org,
linux-kernel@vger.kernel.org,
Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: [PATCH v9 18/22] tracing: Add hist trigger support for stacktraces as keys
Date: Thu, 16 Jul 2015 12:22:51 -0500 [thread overview]
Message-ID: <abb5e9fe4ade5d2d6809c60bd24b430ca374af09.1437066836.git.tom.zanussi@linux.intel.com> (raw)
In-Reply-To: <cover.1437066836.git.tom.zanussi@linux.intel.com>
In-Reply-To: <cover.1437066836.git.tom.zanussi@linux.intel.com>
It's often useful to be able to use a stacktrace as a hash key, for
keeping a count of the number of times a particular call path resulted
in a trace event, for instance. Add a special key named 'stacktrace'
which can be used as key in a 'keys=' param for this purpose:
# echo hist:keys=stacktrace ... \
[ if filter] > event/trigger
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
kernel/trace/trace.c | 9 +--
kernel/trace/trace_events_hist.c | 135 +++++++++++++++++++++++++++++----------
2 files changed, 106 insertions(+), 38 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 75795e3..16c64a2 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3801,10 +3801,11 @@ static const char readme_msg[] =
"\t The special string 'hitcount' can be used in place of an\n"
"\t explicit value field - this is simply a count of event hits.\n"
"\t If 'values' is not specified, 'hitcount' will be assumed.\n"
- "\t of event hits. Keys can be any field. Compound keys\n"
- "\t consisting of up to two fields can be specified by the 'keys'\n"
- "\t keyword. Additionally, sort keys consisting of up to two\n"
- "\t fields can be specified by the 'sort' keyword.\n\n"
+ "\t Keys can be any field, or the special string 'stacktrace',\n"
+ "\t which will use the event's kernel stacktrace as the key.\n"
+ "\t Compound keys consisting of up to two fields can be specified\n"
+ "\t by the 'keys' keyword. Additionally, sort keys consisting\n"
+ "\t of up to two fields can be specified by the 'sort' keyword.\n\n"
"\t Reading the 'hist' file for the event will dump the hash\n"
"\t table in its entirety to stdout. Each printed hash table\n"
"\t entry is a simple list of the keys and values comprising the\n"
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 28ccaa1..21ab8be 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -35,6 +35,11 @@ struct hist_field {
unsigned int offset;
};
+static u64 hist_field_none(struct hist_field *field, void *event)
+{
+ return 0;
+}
+
static u64 hist_field_counter(struct hist_field *field, void *event)
{
return 1;
@@ -64,9 +69,13 @@ DEFINE_HIST_FIELD_FN(u16);
DEFINE_HIST_FIELD_FN(s8);
DEFINE_HIST_FIELD_FN(u8);
+#define HIST_STACKTRACE_DEPTH 16
+#define HIST_STACKTRACE_SIZE (HIST_STACKTRACE_DEPTH * sizeof(unsigned long))
+#define HIST_STACKTRACE_SKIP 5
+
#define HITCOUNT_IDX 0
#define HIST_KEY_MAX 2
-#define HIST_KEY_SIZE_MAX (MAX_FILTER_STR_VAL + sizeof(u64))
+#define HIST_KEY_SIZE_MAX (MAX_FILTER_STR_VAL + HIST_STACKTRACE_SIZE)
enum hist_field_flags {
HIST_FIELD_HITCOUNT = 1,
@@ -77,6 +86,7 @@ enum hist_field_flags {
HIST_FIELD_SYM_OFFSET = 32,
HIST_FIELD_EXECNAME = 64,
HIST_FIELD_SYSCALL = 128,
+ HIST_FIELD_STACKTRACE = 256,
};
struct hist_trigger_attrs {
@@ -314,6 +324,11 @@ static struct hist_field *create_hist_field(struct ftrace_event_field *field,
goto out;
}
+ if (flags & HIST_FIELD_STACKTRACE) {
+ hist_field->fn = hist_field_none;
+ goto out;
+ }
+
if (is_string_field(field)) {
flags |= HIST_FIELD_STRING;
hist_field->fn = hist_field_string;
@@ -437,38 +452,43 @@ static int create_key_field(struct hist_trigger_data *hist_data,
struct ftrace_event_field *field = NULL;
unsigned long flags = 0;
unsigned int key_size;
- char *field_name;
int ret = 0;
flags |= HIST_FIELD_KEY;
- field_name = strsep(&field_str, ".");
- if (field_str) {
- if (!strcmp(field_str, "hex"))
- flags |= HIST_FIELD_HEX;
- else if (!strcmp(field_str, "sym"))
- flags |= HIST_FIELD_SYM;
- else if (!strcmp(field_str, "sym-offset"))
- flags |= HIST_FIELD_SYM_OFFSET;
- else if (!strcmp(field_str, "execname") &&
- !strcmp(field_name, "common_pid"))
- flags |= HIST_FIELD_EXECNAME;
- else if (!strcmp(field_str, "syscall"))
- flags |= HIST_FIELD_SYSCALL;
- else {
+ if (!strcmp(field_str, "stacktrace")) {
+ flags |= HIST_FIELD_STACKTRACE;
+ key_size = sizeof(unsigned long) * HIST_STACKTRACE_DEPTH;
+ } else {
+ char *field_name = strsep(&field_str, ".");
+
+ if (field_str) {
+ if (!strcmp(field_str, "hex"))
+ flags |= HIST_FIELD_HEX;
+ else if (!strcmp(field_str, "sym"))
+ flags |= HIST_FIELD_SYM;
+ else if (!strcmp(field_str, "sym-offset"))
+ flags |= HIST_FIELD_SYM_OFFSET;
+ else if (!strcmp(field_str, "execname") &&
+ !strcmp(field_name, "common_pid"))
+ flags |= HIST_FIELD_EXECNAME;
+ else if (!strcmp(field_str, "syscall"))
+ flags |= HIST_FIELD_SYSCALL;
+ else {
+ ret = -EINVAL;
+ goto out;
+ }
+ }
+
+ field = trace_find_event_field(file->event_call, field_name);
+ if (!field) {
ret = -EINVAL;
goto out;
}
- }
- field = trace_find_event_field(file->event_call, field_name);
- if (!field) {
- ret = -EINVAL;
- goto out;
+ key_size = field->size;
}
- key_size = field->size;
-
hist_data->fields[key_idx] = create_hist_field(field, flags);
if (!hist_data->fields[key_idx]) {
ret = -ENOMEM;
@@ -649,7 +669,9 @@ static int create_tracing_map_fields(struct hist_trigger_data *hist_data)
field = hist_field->field;
- if (is_string_field(field))
+ if (hist_field->flags & HIST_FIELD_STACKTRACE)
+ cmp_fn = tracing_map_cmp_none;
+ else if (is_string_field(field))
cmp_fn = tracing_map_cmp_string;
else
cmp_fn = tracing_map_cmp_num(field->size,
@@ -737,7 +759,9 @@ static void hist_trigger_elt_update(struct hist_trigger_data *hist_data,
static void event_hist_trigger(struct event_trigger_data *data, void *rec)
{
struct hist_trigger_data *hist_data = data->private_data;
+ unsigned long entries[HIST_STACKTRACE_DEPTH];
char compound_key[HIST_KEY_SIZE_MAX];
+ struct stack_trace stacktrace;
struct hist_field *key_field;
struct tracing_map_elt *elt;
u64 field_contents;
@@ -755,15 +779,27 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec)
for (i = hist_data->n_vals; i < hist_data->n_fields; i++) {
key_field = hist_data->fields[i];
- field_contents = key_field->fn(key_field, rec);
- if (key_field->flags & HIST_FIELD_STRING)
- key = (void *)field_contents;
- else
- key = (void *)&field_contents;
+ if (key_field->flags & HIST_FIELD_STACKTRACE) {
+ stacktrace.max_entries = HIST_STACKTRACE_DEPTH;
+ stacktrace.entries = entries;
+ stacktrace.nr_entries = 0;
+ stacktrace.skip = HIST_STACKTRACE_SKIP;
- if (hist_data->n_keys > 1) {
- memcpy(compound_key + key_field->offset, key,
- key_field->size);
+ memset(stacktrace.entries, 0, HIST_STACKTRACE_SIZE);
+ save_stack_trace(&stacktrace);
+
+ key = entries;
+ } else {
+ field_contents = key_field->fn(key_field, rec);
+ if (key_field->flags & HIST_FIELD_STRING)
+ key = (void *)field_contents;
+ else
+ key = (void *)&field_contents;
+
+ if (hist_data->n_keys > 1) {
+ memcpy(compound_key + key_field->offset, key,
+ key_field->size);
+ }
}
}
@@ -779,6 +815,24 @@ static void event_hist_trigger(struct event_trigger_data *data, void *rec)
atomic64_inc(&hist_data->total_hits);
}
+static void hist_trigger_stacktrace_print(struct seq_file *m,
+ unsigned long *stacktrace_entries,
+ unsigned int max_entries)
+{
+ char str[KSYM_SYMBOL_LEN];
+ unsigned int spaces = 8;
+ unsigned int i;
+
+ for (i = 0; i < max_entries; i++) {
+ if (stacktrace_entries[i] == ULONG_MAX)
+ return;
+
+ seq_printf(m, "%*c", 1 + spaces, ' ');
+ sprint_symbol(str, stacktrace_entries[i]);
+ seq_printf(m, "%s\n", str);
+ }
+}
+
static void
hist_trigger_entry_print(struct seq_file *m,
struct hist_trigger_data *hist_data, void *key,
@@ -786,6 +840,7 @@ hist_trigger_entry_print(struct seq_file *m,
{
struct hist_field *key_field;
char str[KSYM_SYMBOL_LEN];
+ bool multiline = false;
unsigned int i;
u64 uval;
@@ -827,6 +882,12 @@ hist_trigger_entry_print(struct seq_file *m,
seq_printf(m, "%s: %-30s[%3llu]",
key_field->field->name, syscall_name, uval);
+ } else if (key_field->flags & HIST_FIELD_STACKTRACE) {
+ seq_puts(m, "stacktrace:\n");
+ hist_trigger_stacktrace_print(m,
+ key + key_field->offset,
+ HIST_STACKTRACE_DEPTH);
+ multiline = true;
} else if (key_field->flags & HIST_FIELD_STRING) {
seq_printf(m, "%s: %-35s", key_field->field->name,
(char *)(key + key_field->offset));
@@ -837,7 +898,10 @@ hist_trigger_entry_print(struct seq_file *m,
}
}
- seq_puts(m, " }");
+ if (!multiline)
+ seq_puts(m, " ");
+
+ seq_puts(m, "}");
seq_printf(m, " hitcount: %10llu",
tracing_map_read_sum(elt, HITCOUNT_IDX));
@@ -975,7 +1039,10 @@ static int event_hist_trigger_print(struct seq_file *m,
if (i > hist_data->n_vals)
seq_puts(m, ",");
- hist_field_print(m, key_field);
+ if (key_field->flags & HIST_FIELD_STACKTRACE)
+ seq_puts(m, "stacktrace");
+ else
+ hist_field_print(m, key_field);
}
seq_puts(m, ":vals=");
--
1.9.3
next prev parent reply other threads:[~2015-07-16 17:24 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-16 17:22 [PATCH v9 00/22] tracing: 'hist' triggers Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 01/22] tracing: Update cond flag when enabling or disabling a trigger Tom Zanussi
2015-07-21 10:04 ` Masami Hiramatsu
2015-07-16 17:22 ` [PATCH v9 02/22] tracing: Make ftrace_event_field checking functions available Tom Zanussi
2015-07-21 10:04 ` Masami Hiramatsu
2015-07-21 14:26 ` Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 03/22] tracing: Make event trigger " Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 04/22] tracing: Add event record param to trigger_ops.func() Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 05/22] tracing: Add get_syscall_name() Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 06/22] tracing: Add a per-event-trigger 'paused' field Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 07/22] tracing: Add lock-free tracing_map Tom Zanussi
2015-07-16 17:49 ` Peter Zijlstra
2015-07-16 21:41 ` Tom Zanussi
2015-07-16 22:32 ` Peter Zijlstra
2015-07-17 1:51 ` Tom Zanussi
2015-07-16 18:03 ` Peter Zijlstra
2015-07-16 21:33 ` Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 08/22] tracing: Add 'hist' event trigger command Tom Zanussi
2015-07-20 13:37 ` Masami Hiramatsu
2015-07-21 14:17 ` Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 09/22] tracing: Add hist trigger support for multiple values ('vals=' param) Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 10/22] tracing: Add hist trigger support for compound keys Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 11/22] tracing: Add hist trigger support for user-defined sorting ('sort=' param) Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 12/22] tracing: Add hist trigger support for pausing and continuing a trace Tom Zanussi
2015-07-22 8:20 ` Masami Hiramatsu
2015-07-22 20:22 ` Tom Zanussi
2015-07-23 14:06 ` Masami Hiramatsu
2015-07-23 15:58 ` Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 13/22] tracing: Add hist trigger support for clearing " Tom Zanussi
2015-07-22 13:50 ` Masami Hiramatsu
2015-07-22 20:24 ` Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 14/22] tracing: Add hist trigger 'hex' modifier for displaying numeric fields Tom Zanussi
2015-07-19 13:22 ` Namhyung Kim
2015-07-21 14:10 ` Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 15/22] tracing: Add hist trigger 'sym' and 'sym-offset' modifiers Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 16/22] tracing: Add hist trigger 'execname' modifier Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 17/22] tracing: Add hist trigger 'syscall' modifier Tom Zanussi
2015-07-16 17:22 ` Tom Zanussi [this message]
2015-07-16 17:22 ` [PATCH v9 19/22] tracing: Support string type key properly Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 20/22] tracing: Remove restriction on string position in hist trigger keys Tom Zanussi
2015-07-19 13:31 ` Namhyung Kim
2015-07-21 14:15 ` Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 21/22] tracing: Add enable_hist/disable_hist triggers Tom Zanussi
2015-07-20 14:57 ` Masami Hiramatsu
2015-07-21 16:10 ` Tom Zanussi
2015-07-22 14:21 ` Masami Hiramatsu
2015-07-22 20:18 ` Tom Zanussi
2015-07-16 17:22 ` [PATCH v9 22/22] tracing: Add 'hist' trigger Documentation Tom Zanussi
2015-07-21 9:40 ` [PATCH v9 00/22] tracing: 'hist' triggers Masami Hiramatsu
2015-07-21 14:18 ` Tom Zanussi
2015-07-22 18:29 ` Brendan Gregg
2015-07-23 1:55 ` 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=abb5e9fe4ade5d2d6809c60bd24b430ca374af09.1437066836.git.tom.zanussi@linux.intel.com \
--to=tom.zanussi@linux.intel.com \
--cc=andi@firstfloor.org \
--cc=daniel.wagner@bmw-carit.de \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--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
all inboxes | Powered by JetHome®