From: Jiri Olsa <olsajiri@gmail.com>
To: Leon Hwang <leon.hwang@linux.dev>
Cc: bpf@vger.kernel.org, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
John Fastabend <john.fastabend@gmail.com>,
Andrii Nakryiko <andrii@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>,
Kumar Kartikeya Dwivedi <memxor@gmail.com>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
Emil Tsalapatis <emil@etsalapatis.com>,
Shuah Khan <shuah@kernel.org>,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
kernel-patches-bot@fb.com
Subject: Re: [PATCH bpf-next v2 2/2] selftests/bpf: Test fentry link after tracing_multi link
Date: Sat, 11 Jul 2026 22:36:38 +0200 [thread overview]
Message-ID: <alKpVgOkHyc7kS_W@krava> (raw)
In-Reply-To: <20260711124822.29406-3-leon.hwang@linux.dev>
On Sat, Jul 11, 2026 at 08:48:22PM +0800, Leon Hwang wrote:
> Verify that there's no any issue to attach tracing_multi link, then attach
> fentry link.
>
> Assisted-by: Codex:gpt-5.6-sol
> Signed-off-by: Leon Hwang <leon.hwang@linux.dev>
Acked-by: Jiri Olsa <jolsa@kernel.org>
thanks,
jirka
> ---
> .../selftests/bpf/prog_tests/tracing_multi.c | 69 +++++++++++++++++++
> .../progs/tracing_multi_intersect_attach.c | 8 +++
> 2 files changed, 77 insertions(+)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/tracing_multi.c b/tools/testing/selftests/bpf/prog_tests/tracing_multi.c
> index f02ffc7f41d7..0aa9532a05cf 100644
> --- a/tools/testing/selftests/bpf/prog_tests/tracing_multi.c
> +++ b/tools/testing/selftests/bpf/prog_tests/tracing_multi.c
> @@ -460,6 +460,73 @@ static void test_intersect(void)
> tracing_multi_intersect__destroy(skel);
> }
>
> +static void test_fentry_after_multi(void)
> +{
> + static const char * const funcs[] = {
> + "bpf_fentry_test1",
> + };
> + struct bpf_link *fentry_link = NULL, *multi_link = NULL;
> + struct tracing_multi_intersect *skel = NULL;
> + LIBBPF_OPTS(bpf_tracing_multi_opts, opts);
> + LIBBPF_OPTS(bpf_test_run_opts, topts);
> + __u32 *ids = NULL;
> + int err;
> +
> + skel = tracing_multi_intersect__open_and_load();
> + if (!ASSERT_OK_PTR(skel, "tracing_multi_intersect__open_and_load"))
> + return;
> +
> + skel->bss->pid = getpid();
> +
> + ids = get_ids(funcs, ARRAY_SIZE(funcs), NULL);
> + if (!ASSERT_OK_PTR(ids, "get_ids"))
> + goto cleanup;
> +
> + opts.ids = ids;
> + opts.cnt = ARRAY_SIZE(funcs);
> + multi_link = bpf_program__attach_tracing_multi(skel->progs.fentry_1, NULL, &opts);
> + if (!ASSERT_OK_PTR(multi_link, "attach_multi"))
> + goto cleanup;
> +
> + fentry_link = bpf_program__attach(skel->progs.fentry);
> + if (!ASSERT_OK_PTR(fentry_link, "attach_fentry"))
> + goto cleanup;
> +
> + err = bpf_prog_test_run_opts(bpf_program__fd(skel->progs.fentry_1), &topts);
> + if (!ASSERT_OK(err, "test_run"))
> + goto cleanup;
> + ASSERT_EQ(skel->bss->test_result_fentry_1, 1, "multi_fentry");
> + ASSERT_EQ(skel->bss->test_result_fentry, 1, "fentry");
> +
> + err = bpf_link__destroy(fentry_link);
> + fentry_link = NULL;
> + if (!ASSERT_OK(err, "destroy_fentry"))
> + goto cleanup;
> +
> + err = bpf_prog_test_run_opts(bpf_program__fd(skel->progs.fentry_1), &topts);
> + if (!ASSERT_OK(err, "test_run_multi"))
> + goto cleanup;
> + ASSERT_EQ(skel->bss->test_result_fentry_1, 2, "multi_fentry_only");
> + ASSERT_EQ(skel->bss->test_result_fentry, 1, "fentry_detached");
> +
> + err = bpf_link__destroy(multi_link);
> + multi_link = NULL;
> + if (!ASSERT_OK(err, "destroy_multi"))
> + goto cleanup;
> +
> + err = bpf_prog_test_run_opts(bpf_program__fd(skel->progs.fentry_1), &topts);
> + if (!ASSERT_OK(err, "test_run_detached"))
> + goto cleanup;
> + ASSERT_EQ(skel->bss->test_result_fentry_1, 2, "multi_fentry_detached");
> + ASSERT_EQ(skel->bss->test_result_fentry, 1, "fentry_still_detached");
> +
> +cleanup:
> + bpf_link__destroy(fentry_link);
> + bpf_link__destroy(multi_link);
> + free(ids);
> + tracing_multi_intersect__destroy(skel);
> +}
> +
> static void test_session(void)
> {
> LIBBPF_OPTS(bpf_test_run_opts, topts);
> @@ -957,4 +1024,6 @@ void test_tracing_multi_test(void)
> if (test__start_subtest("attach_api_fails"))
> test_attach_api_fails();
> RUN_TESTS(tracing_multi_verifier);
> + if (test__start_subtest("fentry_after_multi"))
> + test_fentry_after_multi();
> }
> diff --git a/tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c b/tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c
> index cd5be0bb6ffd..5b0af8f4c62f 100644
> --- a/tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c
> +++ b/tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c
> @@ -11,6 +11,14 @@ __u64 test_result_fentry_1 = 0;
> __u64 test_result_fentry_2 = 0;
> __u64 test_result_fexit_1 = 0;
> __u64 test_result_fexit_2 = 0;
> +__u64 test_result_fentry = 0;
> +
> +SEC("fentry/bpf_fentry_test1")
> +int BPF_PROG(fentry)
> +{
> + tracing_multi_arg_check(ctx, &test_result_fentry, false);
> + return 0;
> +}
>
> SEC("fentry.multi")
> int BPF_PROG(fentry_1)
> --
> 2.55.0
>
next prev parent reply other threads:[~2026-07-11 20:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-11 12:48 [PATCH bpf-next v2 0/2] bpf: Fix WARNING in bpf_trampoline_multi_detach Leon Hwang
2026-07-11 12:48 ` [PATCH bpf-next v2 1/2] bpf: Mark tracing_multi trampolines as ftrace managed Leon Hwang
2026-07-11 12:48 ` [PATCH bpf-next v2 2/2] selftests/bpf: Test fentry link after tracing_multi link Leon Hwang
2026-07-11 20:36 ` Jiri Olsa [this message]
2026-07-12 0:00 ` [PATCH bpf-next v2 0/2] bpf: Fix WARNING in bpf_trampoline_multi_detach patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alKpVgOkHyc7kS_W@krava \
--to=olsajiri@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=emil@etsalapatis.com \
--cc=john.fastabend@gmail.com \
--cc=kernel-patches-bot@fb.com \
--cc=leon.hwang@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox