Skip to content

selftests/bpf: simplify the kernel_count bench trigger #6322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: bpf-next_base
Choose a base branch
from
+6 −16
Open

selftests/bpf: simplify the kernel_count bench trigger #6322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions tools/testing/selftests/bpf/benchs/bench_trigger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,8 @@ static void trigger_syscall_count_setup(void)
static void trigger_kernel_count_setup(void)
{
setup_ctx();
bpf_program__set_autoload(ctx.skel->progs.trigger_driver, false);
bpf_program__set_autoload(ctx.skel->progs.trigger_count, true);
ctx.skel->rodata->kernel_count = 1;
load_ctx();
/* override driver program */
ctx.driver_prog_fd = bpf_program__fd(ctx.skel->progs.trigger_count);
}

static void trigger_kprobe_setup(void)
Expand Down
17 changes: 5 additions & 12 deletions tools/testing/selftests/bpf/progs/trigger_bench.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,19 @@ int bench_trigger_uprobe_multi(void *ctx)
return 0;
}

const volatile int kernel_count = 0;
const volatile int batch_iters = 0;

SEC("?raw_tp")
int trigger_count(void *ctx)
{
int i;

for (i = 0; i < batch_iters; i++)
inc_counter();

return 0;
}

SEC("?raw_tp")
int trigger_driver(void *ctx)
{
int i;

for (i = 0; i < batch_iters; i++)
for (i = 0; i < batch_iters; i++) {
(void)bpf_get_numa_node_id(); /* attach point for benchmarking */
if (kernel_count)
inc_counter();
}

return 0;
}
Expand Down
Loading