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,
mathieu.desnoyers@efficios.com, peterz@infradead.org,
linux-kernel@vger.kernel.org,
Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: [PATCH v10 18/26] tracing: Add hist trigger 'syscall' modifier
Date: Wed, 30 Sep 2015 14:10:04 -0500 [thread overview]
Message-ID: <7b1826cfcf4dee30bd5773ddaa5670661ff2dd47.1443637631.git.tom.zanussi@linux.intel.com> (raw)
In-Reply-To: <cover.1443637631.git.tom.zanussi@linux.intel.com>
In-Reply-To: <cover.1443637631.git.tom.zanussi@linux.intel.com>
Allow users to have syscall id fields displayed as syscall names in
the output by appending '.syscall' to field names:
# echo hist:keys=aaa.syscall ... \
[ if filter] > event/trigger
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
kernel/trace/trace.c | 3 ++-
kernel/trace/trace_events_hist.c | 15 +++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ac5454e..278d09c 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3812,7 +3812,8 @@ static const char readme_msg[] =
"\t .hex display a number as a hex value\n"
"\t .sym display an address as a symbol\n"
"\t .sym-offset display an address as a symbol and offset\n"
- "\t .execname display a common_pid as a program name\n\n"
+ "\t .execname display a common_pid as a program name\n"
+ "\t .syscall display a syscall id as a syscall name\n\n"
"\t The 'pause' parameter can be used to pause an existing hist\n"
"\t trigger or to start a hist trigger but not log any events\n"
"\t until told to do so. 'continue' can be used to start or\n"
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 656973a..b514719 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -76,6 +76,7 @@ enum hist_field_flags {
HIST_FIELD_SYM = 16,
HIST_FIELD_SYM_OFFSET = 32,
HIST_FIELD_EXECNAME = 64,
+ HIST_FIELD_SYSCALL = 128,
};
struct hist_trigger_attrs {
@@ -452,6 +453,8 @@ static int create_key_field(struct hist_trigger_data *hist_data,
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;
@@ -814,6 +817,16 @@ hist_trigger_entry_print(struct seq_file *m,
uval = *(u64 *)(key + key_field->offset);
seq_printf(m, "%s: %-16s[%10llu]",
key_field->field->name, comm, uval);
+ } else if (key_field->flags & HIST_FIELD_SYSCALL) {
+ const char *syscall_name;
+
+ uval = *(u64 *)(key + key_field->offset);
+ syscall_name = get_syscall_name(uval);
+ if (!syscall_name)
+ syscall_name = "unknown_syscall";
+
+ seq_printf(m, "%s: %-30s[%3llu]",
+ key_field->field->name, syscall_name, uval);
} else if (key_field->flags & HIST_FIELD_STRING) {
seq_printf(m, "%s: %-50s", key_field->field->name,
(char *)(key + key_field->offset));
@@ -935,6 +948,8 @@ static const char *get_hist_field_flags(struct hist_field *hist_field)
flags_str = "sym-offset";
else if (hist_field->flags & HIST_FIELD_EXECNAME)
flags_str = "execname";
+ else if (hist_field->flags & HIST_FIELD_SYSCALL)
+ flags_str = "syscall";
return flags_str;
}
--
1.9.3
next prev parent reply other threads:[~2015-09-30 19:14 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 19:09 [PATCH 00/26] tracing: 'hist' triggers Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 01/26] tracing: Update cond flag when enabling or disabling a trigger Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 02/26] tracing: Make ftrace_event_field checking functions available Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 03/26] tracing: Make event trigger " Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 04/26] tracing: Add event record param to trigger_ops.func() Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 05/26] tracing: Add get_syscall_name() Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 06/26] tracing: Add a per-event-trigger 'paused' field Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 07/26] tracing: Add needs_rec flag to event triggers Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 08/26] tracing: Add lock-free tracing_map Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 09/26] tracing: Add 'hist' event trigger command Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 10/26] tracing: Add hist trigger support for multiple values ('vals=' param) Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 11/26] tracing: Add hist trigger support for compound keys Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 12/26] tracing: Add hist trigger support for user-defined sorting ('sort=' param) Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 13/26] tracing: Add hist trigger support for pausing and continuing a trace Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 14/26] tracing: Add hist trigger support for clearing " Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 15/26] tracing: Add hist trigger 'hex' modifier for displaying numeric fields Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 16/26] tracing: Add hist trigger 'sym' and 'sym-offset' modifiers Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 17/26] tracing: Add hist trigger 'execname' modifier Tom Zanussi
2015-09-30 19:10 ` Tom Zanussi [this message]
2015-09-30 19:10 ` [PATCH v10 19/26] tracing: Add hist trigger support for stacktraces as keys Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 20/26] tracing: Support string type key properly Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 21/26] tracing: Remove restriction on string position in hist trigger keys Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 22/26] tracing: Add enable_hist/disable_hist triggers Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 23/26] tracing: Add 'hist' trigger Documentation Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 24/26] tracing: Add support for multiple hist triggers per event Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 25/26] tracing: Add support for named triggers Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 26/26] tracing: Add support for named hist triggers Tom Zanussi
2015-10-21 12:40 ` [PATCH 00/26] tracing: 'hist' triggers 平松雅巳 / HIRAMATU，MASAMI
2015-10-22 11:17 ` Masami Hiramatsu
2015-10-22 11:17 ` [PATCH 1/2] kselftests/ftrace : Add event trigger testcases Masami Hiramatsu
2015-10-22 11:17 ` [PATCH 2/2] kselftests/ftrace: Add hist " Masami Hiramatsu
2015-10-22 18:10 ` [PATCH 00/26] tracing: 'hist' triggers Tom Zanussi
2015-10-23 6:48 ` 平松雅巳 / HIRAMATU，MASAMI
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=7b1826cfcf4dee30bd5773ddaa5670661ff2dd47.1443637631.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=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®