perf bench uprobe: Remove lib64 from libc.so.6 binary path
Subsystems (2)
Ian Rogers
reviewerPATCH 1/2 perf bench uprobe: Remove lib64 from libc.so.6 binary path
bpf_program__attach_uprobe_opts will search LD_LIBRARY_PATH and so specifying /lib64 is unnecessary and causes failures for libc.so.6 paths like /lib/x86_64-linux-gnu/libc.so.6.
--- tools/perf/bench/uprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/bench/uprobe.c +1 -1
@@ -47,7 +47,7 @@ static const char * const bench_uprobe_usage[] = {#define bench_uprobe__attach_uprobe (prog) \ skel->links.prog = bpf_program__attach_uprobe_opts(/*prog=*/ skel->progs.prog, \/*pid=*/ -1 , \ -/*binary_path=*/ "/lib64/libc.so.6" , \ +/*binary_path=*/ "libc.so.6" , \/*func_offset=*/ 0 , \ /*opts=*/&uprobe_opts); \if (!skel->links.prog) { \
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Ian Rogers
reviewerPATCH 2/2 perf bench uprobe: Add uretprobe variant of uprobe benchmarks
Name benchmarks with _ret at the end to avoid creating a new set of benchmarks.
--- tools/perf/bench/bench.h | 2 ++ tools/perf/bench/uprobe.c | 20 +++++++++++++++++--- tools/perf/builtin-bench.c | 2 ++ tools/perf/util/bpf_skel/bench_uprobe.bpf.c | 16 ++++++++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-)
tools/perf/bench/bench.h +2 -0
@@ -46,6 +46,8 @@ int bench_breakpoint_enable(int argc, const char **argv);int bench_uprobe_baseline (int argc,const char **argv);int bench_uprobe_empty (int argc,const char **argv);int bench_uprobe_trace_printk (int argc,const char **argv); +int bench_uprobe_empty_ret (int argc,const char **argv); +int bench_uprobe_trace_printk_ret (int argc,const char **argv);int bench_pmu_scan (int argc,const char **argv);#define BENCH_FORMAT_DEFAULT_STR "default"
tools/perf/bench/uprobe.c +17 -3
@@ -26,9 +26,11 @@static int loops =LOOPS_DEFAULT ;enum bench_uprobe { -BENCH_UPROBE__BASELINE , -BENCH_UPROBE__EMPTY , -BENCH_UPROBE__TRACE_PRINTK , +BENCH_UPROBE__BASELINE , +BENCH_UPROBE__EMPTY , +BENCH_UPROBE__TRACE_PRINTK , +BENCH_UPROBE__EMPTY_RET , +BENCH_UPROBE__TRACE_PRINTK_RET , };static const struct option options[] = {
@@ -81,6 +83,8 @@ static int bench_uprobe__setup_bpf_skel(enum bench_uprobe bench)case BENCH_UPROBE__BASELINE :break ;case BENCH_UPROBE__EMPTY :bench_uprobe__attach_uprobe (empty);break ;case BENCH_UPROBE__TRACE_PRINTK :bench_uprobe__attach_uprobe (trace_printk);break ; +case BENCH_UPROBE__EMPTY_RET :bench_uprobe__attach_uprobe (empty_ret);break ; +case BENCH_UPROBE__TRACE_PRINTK_RET :bench_uprobe__attach_uprobe (trace_printk_ret);break ;default :fprintf (stderr,"Invalid bench: %d\n" , bench); goto cleanup;
@@ -197,3 +201,13 @@ int bench_uprobe_trace_printk(int argc, const char **argv) {return bench_uprobe (argc, argv,BENCH_UPROBE__TRACE_PRINTK ); } + +int bench_uprobe_empty_ret (int argc,const char **argv) +{ +return bench_uprobe (argc, argv,BENCH_UPROBE__EMPTY_RET ); +} + +int bench_uprobe_trace_printk_ret (int argc,const char **argv) +{ +return bench_uprobe (argc, argv,BENCH_UPROBE__TRACE_PRINTK_RET ); +}
tools/perf/builtin-bench.c +2 -0
@@ -109,6 +109,8 @@ static struct bench uprobe_benchmarks[] = { { "baseline", "Baseline libc usleep(1000) call", bench_uprobe_baseline, }, { "empty", "Attach empty BPF prog to uprobe on usleep, system wide", bench_uprobe_empty, }, { "trace_printk", "Attach trace_printk BPF prog to uprobe on usleep syswide", bench_uprobe_trace_printk, }, + { "empty_ret", "Attach empty BPF prog to uretprobe on usleep, system wide", bench_uprobe_empty_ret, }, + { "trace_printk_ret", "Attach trace_printk BPF prog to uretprobe on usleep syswide", bench_uprobe_trace_printk_ret,}, { NULL, NULL, NULL }, };
tools/perf/util/bpf_skel/bench_uprobe.bpf.c +16 -0
@@ -4,6 +4,7 @@#include <bpf/bpf_tracing.h> unsigned int nr_uprobes; +unsigned int nr_uretprobes; SEC("uprobe")int BPF_UPROBE (empty )
@@ -20,4 +21,19 @@ int BPF_UPROBE(trace_printk)return 0 ; } +SEC("uretprobe") +int BPF_URETPROBE (empty_ret ) +{ +return 0 ; +} + +SEC("uretprobe") +int BPF_URETPROBE (trace_printk_ret ) +{ +char fmt[] ="perf bench uretprobe %u" ; + +bpf_trace_printk (fmt,sizeof (fmt), ++nr_uretprobes); +return 0 ; +} + char LICENSE[] SEC("license") = "Dual BSD/GPL";
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Quoted 6 lines · Ian Rogers
bpf_program__attach_uprobe_optswill searchLD_LIBRARY_PATHand so specifying/lib64is unnecessary and causes failures for libc.so.6 paths like/lib/x86_64-linux-gnu/libc.so.6.Fixes 7b47623b8cae ("perf bench uprobe trace_printk: Add entry attaching an BPF program that does a trace_printk")Signed-off-by Ian Rogers <[email protected]>
patchset lgtm
jirka
Quoted 20 lines
--- tools/perf/bench/uprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/bench/uprobe.c +1
-1@@ -47,7 +47,7 @@ static const char * const bench_uprobe_usage[] = {#define bench_uprobe__attach_uprobe (prog) \ skel->links.prog = bpf_program__attach_uprobe_opts(/*prog=*/ skel->progs.prog, \/*pid=*/ -1 , \ -/*binary_path=*/ "/lib64/libc.so.6" , \ +/*binary_path=*/ "libc.so.6" , \/*func_offset=*/ 0 , \ /*opts=*/&uprobe_opts); \if (!skel->links.prog) { \Signature · 1 line
2.44.0.478.gd926399ef9-goog
Quoted 11 lines · Jiri Olsa
Quoted 6 lines · Ian Rogers
bpf_program__attach_uprobe_optswill searchLD_LIBRARY_PATHand so specifying/lib64is unnecessary and causes failures for libc.so.6 paths like/lib/x86_64-linux-gnu/libc.so.6.Fixes 7b47623b8cae ("perf bench uprobe trace_printk: Add entry attaching an BPF program that does a trace_printk")Signed-off-by Ian Rogers <[email protected]>patchset lgtm
Acked-by Jiri Olsa <[email protected]>
Thanks, applied it to the series, b4 picked it just for this patch.
I tried to convince Konstantin to look for "patchset lgtm", "for the series", but for now we need to do it manually :-)
- Arnaldo