Skip to content

Commit 610b2c0

Browse files
image-dragonKernel Patches Daemon
authored andcommitted
selftests/bpf: add benchmark testing for kprobe-multi-all
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. And the "kretprobe-multi-all" is added too. Signed-off-by: Menglong Dong <[email protected]>
1 parent fa64fcb commit 610b2c0

File tree

5 files changed

+72
-2
lines changed

5 files changed

+72
-2
lines changed

tools/testing/selftests/bpf/bench.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,8 @@ extern const struct bench bench_trig_kretprobe;
510510
extern const struct bench bench_trig_kprobe_multi;
511511
extern const struct bench bench_trig_kretprobe_multi;
512512
extern const struct bench bench_trig_fentry;
513+
extern const struct bench bench_trig_kprobe_multi_all;
514+
extern const struct bench bench_trig_kretprobe_multi_all;
513515
extern const struct bench bench_trig_fexit;
514516
extern const struct bench bench_trig_fmodret;
515517
extern const struct bench bench_trig_tp;
@@ -578,6 +580,8 @@ static const struct bench *benchs[] = {
578580
&bench_trig_kprobe_multi,
579581
&bench_trig_kretprobe_multi,
580582
&bench_trig_fentry,
583+
&bench_trig_kprobe_multi_all,
584+
&bench_trig_kretprobe_multi_all,
581585
&bench_trig_fexit,
582586
&bench_trig_fmodret,
583587
&bench_trig_tp,

tools/testing/selftests/bpf/benchs/bench_trigger.c

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,57 @@ static void trigger_fentry_setup(void)
226226
attach_bpf(ctx.skel->progs.bench_trigger_fentry);
227227
}
228228

229+
static void attach_ksyms_all(struct bpf_program *empty, bool kretprobe)
230+
{
231+
LIBBPF_OPTS(bpf_kprobe_multi_opts, opts);
232+
char **syms = NULL;
233+
size_t cnt = 0;
234+
235+
if (bpf_get_ksyms(&syms, &cnt, true)) {
236+
fprintf(stderr, "failed to get ksyms\n");
237+
exit(1);
238+
}
239+
240+
opts.syms = (const char **) syms;
241+
opts.cnt = cnt;
242+
opts.retprobe = kretprobe;
243+
/* attach empty to all the kernel functions except bpf_get_numa_node_id. */
244+
if (!bpf_program__attach_kprobe_multi_opts(empty, NULL, &opts)) {
245+
fprintf(stderr, "failed to attach bpf_program__attach_kprobe_multi_opts to all\n");
246+
exit(1);
247+
}
248+
}
249+
250+
static void trigger_kprobe_multi_all_setup(void)
251+
{
252+
struct bpf_program *prog, *empty;
253+
254+
setup_ctx();
255+
empty = ctx.skel->progs.bench_kprobe_multi_empty;
256+
prog = ctx.skel->progs.bench_trigger_kprobe_multi;
257+
bpf_program__set_autoload(empty, true);
258+
bpf_program__set_autoload(prog, true);
259+
load_ctx();
260+
261+
attach_ksyms_all(empty, false);
262+
attach_bpf(prog);
263+
}
264+
265+
static void trigger_kretprobe_multi_all_setup(void)
266+
{
267+
struct bpf_program *prog, *empty;
268+
269+
setup_ctx();
270+
empty = ctx.skel->progs.bench_kretprobe_multi_empty;
271+
prog = ctx.skel->progs.bench_trigger_kretprobe_multi;
272+
bpf_program__set_autoload(empty, true);
273+
bpf_program__set_autoload(prog, true);
274+
load_ctx();
275+
276+
attach_ksyms_all(empty, true);
277+
attach_bpf(prog);
278+
}
279+
229280
static void trigger_fexit_setup(void)
230281
{
231282
setup_ctx();
@@ -512,6 +563,8 @@ BENCH_TRIG_KERNEL(kretprobe, "kretprobe");
512563
BENCH_TRIG_KERNEL(kprobe_multi, "kprobe-multi");
513564
BENCH_TRIG_KERNEL(kretprobe_multi, "kretprobe-multi");
514565
BENCH_TRIG_KERNEL(fentry, "fentry");
566+
BENCH_TRIG_KERNEL(kprobe_multi_all, "kprobe-multi-all");
567+
BENCH_TRIG_KERNEL(kretprobe_multi_all, "kretprobe-multi-all");
515568
BENCH_TRIG_KERNEL(fexit, "fexit");
516569
BENCH_TRIG_KERNEL(fmodret, "fmodret");
517570
BENCH_TRIG_KERNEL(tp, "tp");

tools/testing/selftests/bpf/benchs/run_bench_trigger.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ def_tests=( \
66
usermode-count kernel-count syscall-count \
77
fentry fexit fmodret \
88
rawtp tp \
9-
kprobe kprobe-multi \
10-
kretprobe kretprobe-multi \
9+
kprobe kprobe-multi kprobe-multi-all \
10+
kretprobe kretprobe-multi kretprobe-multi-all \
1111
)
1212

1313
tests=("$@")

tools/testing/selftests/bpf/progs/trigger_bench.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,25 @@ int bench_trigger_kprobe_multi(void *ctx)
9797
return 0;
9898
}
9999

100+
SEC("?kprobe.multi/bpf_get_numa_node_id")
101+
int bench_kprobe_multi_empty(void *ctx)
102+
{
103+
return 0;
104+
}
105+
100106
SEC("?kretprobe.multi/bpf_get_numa_node_id")
101107
int bench_trigger_kretprobe_multi(void *ctx)
102108
{
103109
inc_counter();
104110
return 0;
105111
}
106112

113+
SEC("?kretprobe.multi/bpf_get_numa_node_id")
114+
int bench_kretprobe_multi_empty(void *ctx)
115+
{
116+
return 0;
117+
}
118+
107119
SEC("?fentry/bpf_get_numa_node_id")
108120
int bench_trigger_fentry(void *ctx)
109121
{

tools/testing/selftests/bpf/trace_helpers.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,7 @@ static const char * const trace_blacklist[] = {
549549
"preempt_count_sub",
550550
"__rcu_read_lock",
551551
"__rcu_read_unlock",
552+
"bpf_get_numa_node_id",
552553
};
553554

554555
static bool skip_entry(char *name)

0 commit comments

Comments
 (0)