* [PATCH bpf-next] selftests/bpf: add fexit and kretprobe triggering benchmarks
@ 2024-03-09 0:51 Andrii Nakryiko
2024-03-11 8:17 ` Jiri Olsa
2024-03-11 19:39 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Andrii Nakryiko @ 2024-03-09 0:51 UTC (permalink / raw)
To: bpf, ast, daniel, martin.lau; +Cc: andrii, kernel-team
We already have kprobe and fentry benchmarks. Let's add kretprobe and
fexit ones for completeness.
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
---
tools/testing/selftests/bpf/bench.c | 4 +++
.../selftests/bpf/benchs/bench_trigger.c | 32 +++++++++++++++++++
.../selftests/bpf/progs/trigger_bench.c | 14 ++++++++
3 files changed, 50 insertions(+)
diff --git a/tools/testing/selftests/bpf/bench.c b/tools/testing/selftests/bpf/bench.c
index 60df99b6ac72..8e02645afe31 100644
--- a/tools/testing/selftests/bpf/bench.c
+++ b/tools/testing/selftests/bpf/bench.c
@@ -495,7 +495,9 @@ extern const struct bench bench_trig_base;
extern const struct bench bench_trig_tp;
extern const struct bench bench_trig_rawtp;
extern const struct bench bench_trig_kprobe;
+extern const struct bench bench_trig_kretprobe;
extern const struct bench bench_trig_fentry;
+extern const struct bench bench_trig_fexit;
extern const struct bench bench_trig_fentry_sleep;
extern const struct bench bench_trig_fmodret;
extern const struct bench bench_trig_uprobe_base;
@@ -539,7 +541,9 @@ static const struct bench *benchs[] = {
&bench_trig_tp,
&bench_trig_rawtp,
&bench_trig_kprobe,
+ &bench_trig_kretprobe,
&bench_trig_fentry,
+ &bench_trig_fexit,
&bench_trig_fentry_sleep,
&bench_trig_fmodret,
&bench_trig_uprobe_base,
diff --git a/tools/testing/selftests/bpf/benchs/bench_trigger.c b/tools/testing/selftests/bpf/benchs/bench_trigger.c
index 064a1ef7a6fb..3f24be9cfcb9 100644
--- a/tools/testing/selftests/bpf/benchs/bench_trigger.c
+++ b/tools/testing/selftests/bpf/benchs/bench_trigger.c
@@ -85,12 +85,24 @@ static void trigger_kprobe_setup(void)
attach_bpf(ctx.skel->progs.bench_trigger_kprobe);
}
+static void trigger_kretprobe_setup(void)
+{
+ setup_ctx();
+ attach_bpf(ctx.skel->progs.bench_trigger_kretprobe);
+}
+
static void trigger_fentry_setup(void)
{
setup_ctx();
attach_bpf(ctx.skel->progs.bench_trigger_fentry);
}
+static void trigger_fexit_setup(void)
+{
+ setup_ctx();
+ attach_bpf(ctx.skel->progs.bench_trigger_fexit);
+}
+
static void trigger_fentry_sleep_setup(void)
{
setup_ctx();
@@ -261,6 +273,16 @@ const struct bench bench_trig_kprobe = {
.report_final = hits_drops_report_final,
};
+const struct bench bench_trig_kretprobe = {
+ .name = "trig-kretprobe",
+ .validate = trigger_validate,
+ .setup = trigger_kretprobe_setup,
+ .producer_thread = trigger_producer,
+ .measure = trigger_measure,
+ .report_progress = hits_drops_report_progress,
+ .report_final = hits_drops_report_final,
+};
+
const struct bench bench_trig_fentry = {
.name = "trig-fentry",
.validate = trigger_validate,
@@ -271,6 +293,16 @@ const struct bench bench_trig_fentry = {
.report_final = hits_drops_report_final,
};
+const struct bench bench_trig_fexit = {
+ .name = "trig-fexit",
+ .validate = trigger_validate,
+ .setup = trigger_fexit_setup,
+ .producer_thread = trigger_producer,
+ .measure = trigger_measure,
+ .report_progress = hits_drops_report_progress,
+ .report_final = hits_drops_report_final,
+};
+
const struct bench bench_trig_fentry_sleep = {
.name = "trig-fentry-sleep",
.validate = trigger_validate,
diff --git a/tools/testing/selftests/bpf/progs/trigger_bench.c b/tools/testing/selftests/bpf/progs/trigger_bench.c
index 694e7cec1823..eb94f9c0186f 100644
--- a/tools/testing/selftests/bpf/progs/trigger_bench.c
+++ b/tools/testing/selftests/bpf/progs/trigger_bench.c
@@ -33,6 +33,13 @@ int bench_trigger_kprobe(void *ctx)
return 0;
}
+SEC("kretprobe/" SYS_PREFIX "sys_getpgid")
+int bench_trigger_kretprobe(void *ctx)
+{
+ __sync_add_and_fetch(&hits, 1);
+ return 0;
+}
+
SEC("fentry/" SYS_PREFIX "sys_getpgid")
int bench_trigger_fentry(void *ctx)
{
@@ -40,6 +47,13 @@ int bench_trigger_fentry(void *ctx)
return 0;
}
+SEC("fexit/" SYS_PREFIX "sys_getpgid")
+int bench_trigger_fexit(void *ctx)
+{
+ __sync_add_and_fetch(&hits, 1);
+ return 0;
+}
+
SEC("fentry.s/" SYS_PREFIX "sys_getpgid")
int bench_trigger_fentry_sleep(void *ctx)
{
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH bpf-next] selftests/bpf: add fexit and kretprobe triggering benchmarks
2024-03-09 0:51 [PATCH bpf-next] selftests/bpf: add fexit and kretprobe triggering benchmarks Andrii Nakryiko
@ 2024-03-11 8:17 ` Jiri Olsa
2024-03-11 19:39 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Olsa @ 2024-03-11 8:17 UTC (permalink / raw)
To: Andrii Nakryiko; +Cc: bpf, ast, daniel, martin.lau, kernel-team
On Fri, Mar 08, 2024 at 04:51:24PM -0800, Andrii Nakryiko wrote:
> We already have kprobe and fentry benchmarks. Let's add kretprobe and
> fexit ones for completeness.
>
> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
jirka
> ---
> tools/testing/selftests/bpf/bench.c | 4 +++
> .../selftests/bpf/benchs/bench_trigger.c | 32 +++++++++++++++++++
> .../selftests/bpf/progs/trigger_bench.c | 14 ++++++++
> 3 files changed, 50 insertions(+)
>
> diff --git a/tools/testing/selftests/bpf/bench.c b/tools/testing/selftests/bpf/bench.c
> index 60df99b6ac72..8e02645afe31 100644
> --- a/tools/testing/selftests/bpf/bench.c
> +++ b/tools/testing/selftests/bpf/bench.c
> @@ -495,7 +495,9 @@ extern const struct bench bench_trig_base;
> extern const struct bench bench_trig_tp;
> extern const struct bench bench_trig_rawtp;
> extern const struct bench bench_trig_kprobe;
> +extern const struct bench bench_trig_kretprobe;
> extern const struct bench bench_trig_fentry;
> +extern const struct bench bench_trig_fexit;
> extern const struct bench bench_trig_fentry_sleep;
> extern const struct bench bench_trig_fmodret;
> extern const struct bench bench_trig_uprobe_base;
> @@ -539,7 +541,9 @@ static const struct bench *benchs[] = {
> &bench_trig_tp,
> &bench_trig_rawtp,
> &bench_trig_kprobe,
> + &bench_trig_kretprobe,
> &bench_trig_fentry,
> + &bench_trig_fexit,
> &bench_trig_fentry_sleep,
> &bench_trig_fmodret,
> &bench_trig_uprobe_base,
> diff --git a/tools/testing/selftests/bpf/benchs/bench_trigger.c b/tools/testing/selftests/bpf/benchs/bench_trigger.c
> index 064a1ef7a6fb..3f24be9cfcb9 100644
> --- a/tools/testing/selftests/bpf/benchs/bench_trigger.c
> +++ b/tools/testing/selftests/bpf/benchs/bench_trigger.c
> @@ -85,12 +85,24 @@ static void trigger_kprobe_setup(void)
> attach_bpf(ctx.skel->progs.bench_trigger_kprobe);
> }
>
> +static void trigger_kretprobe_setup(void)
> +{
> + setup_ctx();
> + attach_bpf(ctx.skel->progs.bench_trigger_kretprobe);
> +}
> +
> static void trigger_fentry_setup(void)
> {
> setup_ctx();
> attach_bpf(ctx.skel->progs.bench_trigger_fentry);
> }
>
> +static void trigger_fexit_setup(void)
> +{
> + setup_ctx();
> + attach_bpf(ctx.skel->progs.bench_trigger_fexit);
> +}
> +
> static void trigger_fentry_sleep_setup(void)
> {
> setup_ctx();
> @@ -261,6 +273,16 @@ const struct bench bench_trig_kprobe = {
> .report_final = hits_drops_report_final,
> };
>
> +const struct bench bench_trig_kretprobe = {
> + .name = "trig-kretprobe",
> + .validate = trigger_validate,
> + .setup = trigger_kretprobe_setup,
> + .producer_thread = trigger_producer,
> + .measure = trigger_measure,
> + .report_progress = hits_drops_report_progress,
> + .report_final = hits_drops_report_final,
> +};
> +
> const struct bench bench_trig_fentry = {
> .name = "trig-fentry",
> .validate = trigger_validate,
> @@ -271,6 +293,16 @@ const struct bench bench_trig_fentry = {
> .report_final = hits_drops_report_final,
> };
>
> +const struct bench bench_trig_fexit = {
> + .name = "trig-fexit",
> + .validate = trigger_validate,
> + .setup = trigger_fexit_setup,
> + .producer_thread = trigger_producer,
> + .measure = trigger_measure,
> + .report_progress = hits_drops_report_progress,
> + .report_final = hits_drops_report_final,
> +};
> +
> const struct bench bench_trig_fentry_sleep = {
> .name = "trig-fentry-sleep",
> .validate = trigger_validate,
> diff --git a/tools/testing/selftests/bpf/progs/trigger_bench.c b/tools/testing/selftests/bpf/progs/trigger_bench.c
> index 694e7cec1823..eb94f9c0186f 100644
> --- a/tools/testing/selftests/bpf/progs/trigger_bench.c
> +++ b/tools/testing/selftests/bpf/progs/trigger_bench.c
> @@ -33,6 +33,13 @@ int bench_trigger_kprobe(void *ctx)
> return 0;
> }
>
> +SEC("kretprobe/" SYS_PREFIX "sys_getpgid")
> +int bench_trigger_kretprobe(void *ctx)
> +{
> + __sync_add_and_fetch(&hits, 1);
> + return 0;
> +}
> +
> SEC("fentry/" SYS_PREFIX "sys_getpgid")
> int bench_trigger_fentry(void *ctx)
> {
> @@ -40,6 +47,13 @@ int bench_trigger_fentry(void *ctx)
> return 0;
> }
>
> +SEC("fexit/" SYS_PREFIX "sys_getpgid")
> +int bench_trigger_fexit(void *ctx)
> +{
> + __sync_add_and_fetch(&hits, 1);
> + return 0;
> +}
> +
> SEC("fentry.s/" SYS_PREFIX "sys_getpgid")
> int bench_trigger_fentry_sleep(void *ctx)
> {
> --
> 2.43.0
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH bpf-next] selftests/bpf: add fexit and kretprobe triggering benchmarks
2024-03-09 0:51 [PATCH bpf-next] selftests/bpf: add fexit and kretprobe triggering benchmarks Andrii Nakryiko
2024-03-11 8:17 ` Jiri Olsa
@ 2024-03-11 19:39 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-03-11 19:39 UTC (permalink / raw)
To: Andrii Nakryiko; +Cc: bpf, ast, daniel, martin.lau, kernel-team
Hello:
This patch was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:
On Fri, 8 Mar 2024 16:51:24 -0800 you wrote:
> We already have kprobe and fentry benchmarks. Let's add kretprobe and
> fexit ones for completeness.
>
> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
> ---
> tools/testing/selftests/bpf/bench.c | 4 +++
> .../selftests/bpf/benchs/bench_trigger.c | 32 +++++++++++++++++++
> .../selftests/bpf/progs/trigger_bench.c | 14 ++++++++
> 3 files changed, 50 insertions(+)
Here is the summary with links:
- [bpf-next] selftests/bpf: add fexit and kretprobe triggering benchmarks
https://git.kernel.org/bpf/bpf-next/c/365c2b32792e
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-11 19:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-09 0:51 [PATCH bpf-next] selftests/bpf: add fexit and kretprobe triggering benchmarks Andrii Nakryiko
2024-03-11 8:17 ` Jiri Olsa
2024-03-11 19:39 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).