perf trace: Look for default name for entries in the syscalls prog array
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 8b8044e5c9527cdfff3b0937f2d17470cc4acf9e Gitweb: https://git.kernel.org/tip/8b8044e5c9527cdfff3b0937f2d17470cc4acf9e Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 16 Jul 2019 15:24:58 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:41 -0300
perf trace: Look for default name for entries in the syscalls prog array
I.e. just look for "!syscalls:sys_enter_" or "exit_" plus the syscall name, that way we need just to add entries to the augmented_raw_syscalls.c BPF source to add handlers.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Luis Cláudio Gonçalves <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-trace.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)
tools/perf/builtin-trace.c +19 -11
@@ -830,13 +830,11 @@ static struct syscall_fmt { { .name = "newfstatat", .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, }, }, { .name = "open", - .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_open", }, .arg = { [1] = { .scnprintf = SCA_OPEN_FLAGS, /* flags */ }, }, }, { .name = "open_by_handle_at", .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, [2] = { .scnprintf = SCA_OPEN_FLAGS, /* flags */ }, }, }, { .name = "openat", - .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_openat", }, .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, [2] = { .scnprintf = SCA_OPEN_FLAGS, /* flags */ }, }, }, { .name = "perf_event_open",
@@ -873,7 +871,6 @@ static struct syscall_fmt { { .name = "recvmsg", .arg = { [2] = { .scnprintf = SCA_MSG_FLAGS, /* flags */ }, }, }, { .name = "renameat", - .bpf_prog_name = { .sys_enter = "!syscalls:sys_enter_renameat", }, .arg = { [0] = { .scnprintf = SCA_FDAT, /* olddirfd */ }, [2] = { .scnprintf = SCA_FDAT, /* newdirfd */ }, }, }, { .name = "renameat2",
@@ -2778,12 +2775,27 @@ static struct bpf_program *trace__find_syscall_bpf_prog(struct trace *trace, str {struct bpf_program *prog; -if (prog_name ==NULL ) +if (prog_name ==NULL ) { +char default_prog_name[256 ]; +scnprintf (default_prog_name,sizeof (default_prog_name),"!syscalls:sys_%s_%s" , type, sc->name); + prog =trace__find_bpf_program_by_title (trace, default_prog_name); +if (prog !=NULL ) + goto out_found; +if (sc->fmt && sc->fmt->alias) { +scnprintf (default_prog_name,sizeof (default_prog_name),"!syscalls:sys_%s_%s" , type, sc->fmt->alias); + prog =trace__find_bpf_program_by_title (trace, default_prog_name); +if (prog !=NULL ) + goto out_found; + } goto out_unaugmented; + } prog =trace__find_bpf_program_by_title (trace, prog_name); -if (prog !=NULL ) + +if (prog !=NULL ) { +out_found:return prog; + }pr_debug ("Couldn't find BPF prog \"%s\" to associate with syscalls:sys_%s_%s, not augmenting it\n" , prog_name, type, sc->name);
@@ -2798,12 +2810,8 @@ static void trace__init_syscall_bpf_progs(struct trace *trace, int id)if (sc ==NULL )return ; -if (sc->fmt !=NULL ) { - sc->bpf_prog.sys_enter =trace__find_syscall_bpf_prog (trace, sc, sc->fmt->bpf_prog_name.sys_enter,"enter" ); - sc->bpf_prog.sys_exit =trace__find_syscall_bpf_prog (trace, sc, sc->fmt->bpf_prog_name.sys_exit,"exit" ); - }else { - sc->bpf_prog.sys_enter = sc->bpf_prog.sys_exit = trace->syscalls.unaugmented_prog; - } + sc->bpf_prog.sys_enter =trace__find_syscall_bpf_prog (trace, sc, sc->fmt ? sc->fmt->bpf_prog_name.sys_enter :NULL ,"enter" ); + sc->bpf_prog.sys_exit =trace__find_syscall_bpf_prog (trace, sc, sc->fmt ? sc->fmt->bpf_prog_name.sys_exit :NULL ,"exit" ); }static int trace__bpf_prog_sys_enter_fd (struct trace *trace,int id)