For now, the benchmark for kprobe-multi is single, which means there is
only 1 function is hooked during testing. Add the testing
"kprobe-multi-all", which will hook all the kernel functions during
the benchmark.

Signed-off-by: Menglong Dong <dong...@chinatelecom.cn>
---
 tools/testing/selftests/bpf/bench.c           |  2 ++
 .../selftests/bpf/benchs/bench_trigger.c      | 30 +++++++++++++++++++
 .../selftests/bpf/benchs/run_bench_trigger.sh |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/bench.c 
b/tools/testing/selftests/bpf/bench.c
index ddd73d06a1eb..da971d8c5ae5 100644
--- a/tools/testing/selftests/bpf/bench.c
+++ b/tools/testing/selftests/bpf/bench.c
@@ -510,6 +510,7 @@ extern const struct bench bench_trig_kretprobe;
 extern const struct bench bench_trig_kprobe_multi;
 extern const struct bench bench_trig_kretprobe_multi;
 extern const struct bench bench_trig_fentry;
+extern const struct bench bench_trig_kprobe_multi_all;
 extern const struct bench bench_trig_fexit;
 extern const struct bench bench_trig_fmodret;
 extern const struct bench bench_trig_tp;
@@ -578,6 +579,7 @@ static const struct bench *benchs[] = {
        &bench_trig_kprobe_multi,
        &bench_trig_kretprobe_multi,
        &bench_trig_fentry,
+       &bench_trig_kprobe_multi_all,
        &bench_trig_fexit,
        &bench_trig_fmodret,
        &bench_trig_tp,
diff --git a/tools/testing/selftests/bpf/benchs/bench_trigger.c 
b/tools/testing/selftests/bpf/benchs/bench_trigger.c
index 82327657846e..be5fe88862a4 100644
--- a/tools/testing/selftests/bpf/benchs/bench_trigger.c
+++ b/tools/testing/selftests/bpf/benchs/bench_trigger.c
@@ -226,6 +226,35 @@ static void trigger_fentry_setup(void)
        attach_bpf(ctx.skel->progs.bench_trigger_fentry);
 }
 
+static void trigger_kprobe_multi_all_setup(void)
+{
+       LIBBPF_OPTS(bpf_kprobe_multi_opts, opts);
+       struct bpf_program *prog;
+       struct bpf_link *link;
+       char **syms = NULL;
+       size_t cnt = 0;
+
+       setup_ctx();
+       prog = ctx.skel->progs.bench_trigger_kprobe_multi;
+       bpf_program__set_autoload(prog, true);
+       load_ctx();
+
+       if (bpf_get_ksyms(&syms, &cnt, true)) {
+               printf("failed to get ksyms\n");
+               exit(1);
+       }
+
+       printf("found %zu ksyms\n", cnt);
+       opts.syms = (const char **) syms;
+       opts.cnt = cnt;
+       link = bpf_program__attach_kprobe_multi_opts(prog, NULL, &opts);
+       if (!link) {
+               printf("failed to attach bpf_program__attach_kprobe_multi_opts 
to all\n");
+               exit(1);
+       }
+       ctx.skel->links.bench_trigger_kprobe_multi = link;
+}
+
 static void trigger_fexit_setup(void)
 {
        setup_ctx();
@@ -512,6 +541,7 @@ BENCH_TRIG_KERNEL(kretprobe, "kretprobe");
 BENCH_TRIG_KERNEL(kprobe_multi, "kprobe-multi");
 BENCH_TRIG_KERNEL(kretprobe_multi, "kretprobe-multi");
 BENCH_TRIG_KERNEL(fentry, "fentry");
+BENCH_TRIG_KERNEL(kprobe_multi_all, "kprobe-multi-all");
 BENCH_TRIG_KERNEL(fexit, "fexit");
 BENCH_TRIG_KERNEL(fmodret, "fmodret");
 BENCH_TRIG_KERNEL(tp, "tp");
diff --git a/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh 
b/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh
index a690f5a68b6b..886b6ffc9742 100755
--- a/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh
+++ b/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh
@@ -6,7 +6,7 @@ def_tests=( \
        usermode-count kernel-count syscall-count \
        fentry fexit fmodret \
        rawtp tp \
-       kprobe kprobe-multi \
+       kprobe kprobe-multi kprobe-multi-all \
        kretprobe kretprobe-multi \
 )
 
-- 
2.50.1


Reply via email to