Skip to content

Commit 3169619

Browse files
tzanussirostedt
authored andcommitted
tracing: Add hist trigger 'syscall' modifier
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 Link: http://lkml.kernel.org/r/2bab1e59933d76a14b545bd2e02f80b8b08ac4d3.1457029949.git.tom.zanussi@linux.intel.com Signed-off-by: Tom Zanussi <[email protected]> Tested-by: Masami Hiramatsu <[email protected]> Reviewed-by: Namhyung Kim <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
1 parent 6b4827a commit 3169619

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

kernel/trace/trace.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3858,7 +3858,8 @@ static const char readme_msg[] =
38583858
"\t .hex display a number as a hex value\n"
38593859
"\t .sym display an address as a symbol\n"
38603860
"\t .sym-offset display an address as a symbol and offset\n"
3861-
"\t .execname display a common_pid as a program name\n\n"
3861+
"\t .execname display a common_pid as a program name\n"
3862+
"\t .syscall display a syscall id as a syscall name\n\n"
38623863
"\t The 'pause' parameter can be used to pause an existing hist\n"
38633864
"\t trigger or to start a hist trigger but not log any events\n"
38643865
"\t until told to do so. 'continue' can be used to start or\n"

kernel/trace/trace_events_hist.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ enum hist_field_flags {
8484
HIST_FIELD_FL_SYM = 16,
8585
HIST_FIELD_FL_SYM_OFFSET = 32,
8686
HIST_FIELD_FL_EXECNAME = 64,
87+
HIST_FIELD_FL_SYSCALL = 128,
8788
};
8889

8990
struct hist_trigger_attrs {
@@ -474,6 +475,8 @@ static int create_key_field(struct hist_trigger_data *hist_data,
474475
else if ((strcmp(field_str, "execname") == 0) &&
475476
(strcmp(field_name, "common_pid") == 0))
476477
flags |= HIST_FIELD_FL_EXECNAME;
478+
else if (strcmp(field_str, "syscall") == 0)
479+
flags |= HIST_FIELD_FL_SYSCALL;
477480
else {
478481
ret = -EINVAL;
479482
goto out;
@@ -854,6 +857,16 @@ hist_trigger_entry_print(struct seq_file *m,
854857
uval = *(u64 *)(key + key_field->offset);
855858
seq_printf(m, "%s: %-16s[%10llu]",
856859
key_field->field->name, comm, uval);
860+
} else if (key_field->flags & HIST_FIELD_FL_SYSCALL) {
861+
const char *syscall_name;
862+
863+
uval = *(u64 *)(key + key_field->offset);
864+
syscall_name = get_syscall_name(uval);
865+
if (!syscall_name)
866+
syscall_name = "unknown_syscall";
867+
868+
seq_printf(m, "%s: %-30s[%3llu]",
869+
key_field->field->name, syscall_name, uval);
857870
} else if (key_field->flags & HIST_FIELD_FL_STRING) {
858871
seq_printf(m, "%s: %-50s", key_field->field->name,
859872
(char *)(key + key_field->offset));
@@ -975,6 +988,8 @@ static const char *get_hist_field_flags(struct hist_field *hist_field)
975988
flags_str = "sym-offset";
976989
else if (hist_field->flags & HIST_FIELD_FL_EXECNAME)
977990
flags_str = "execname";
991+
else if (hist_field->flags & HIST_FIELD_FL_SYSCALL)
992+
flags_str = "syscall";
978993

979994
return flags_str;
980995
}

0 commit comments

Comments
 (0)