Tests against two libbpf failures and two kernel failures: * libbpf: 'ids' + 'fds'. * libbpf: 'pattern' + 'fds'. * kernel: 'fds' + invalid 'ids'. * kernel: duplicate targets via different fd for the same bpf prog + func.
Assisted-by: Codex:gpt-5.5 Signed-off-by: Leon Hwang <[email protected]> --- tools/lib/bpf/libbpf.c | 2 +- tools/lib/bpf/libbpf_internal.h | 1 + .../selftests/bpf/prog_tests/tracing_multi.c | 100 ++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index edc5e8e813f3..72e2459e9339 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -11604,7 +11604,7 @@ int libbpf_find_vmlinux_btf_id(const char *name, return libbpf_err(err); } -static int libbpf_find_prog_btf_id(const char *name, __u32 attach_prog_fd, int token_fd) +int libbpf_find_prog_btf_id(const char *name, __u32 attach_prog_fd, int token_fd) { struct bpf_prog_info info; __u32 info_len = sizeof(info); diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h index 4e45dfacb548..d4e899181bdd 100644 --- a/tools/lib/bpf/libbpf_internal.h +++ b/tools/lib/bpf/libbpf_internal.h @@ -439,6 +439,7 @@ int btf_load_into_kernel(struct btf *btf, char *log_buf, size_t log_sz, __u32 log_level, int token_fd); struct btf *btf_load_from_kernel(__u32 id, struct btf *base_btf, int token_fd); +int libbpf_find_prog_btf_id(const char *name, __u32 attach_prog_fd, int token_fd); struct btf *btf_get_from_fd(int btf_fd, struct btf *base_btf); void btf_get_kernel_prefix_kind(enum bpf_attach_type attach_type, diff --git a/tools/testing/selftests/bpf/prog_tests/tracing_multi.c b/tools/testing/selftests/bpf/prog_tests/tracing_multi.c index 801136ca63f0..d428b5e2600c 100644 --- a/tools/testing/selftests/bpf/prog_tests/tracing_multi.c +++ b/tools/testing/selftests/bpf/prog_tests/tracing_multi.c @@ -1195,8 +1195,108 @@ static void test_link_api_bpf_prog(void) tracing_multi_bpf__destroy(skel); } +static void test_attach_api_bpf_prog_fails(void) +{ + static const char * const kfuncs[] = { + "bpf_fentry_test1", + }; + const char *bpf_funcs[] = { "target_1" }; + LIBBPF_OPTS(bpf_tracing_multi_opts, opts); + LIBBPF_OPTS(bpf_link_create_opts, lopts); + struct tracing_multi_bpf *skel = NULL; + int fd, target_id, token_fd; + int fds[2], dup_fd = -1; + struct bpf_link *link; + __u32 target_ids[2]; + __u32 *ids = NULL; + long err; + + skel = tracing_multi_bpf__open_and_load(); + if (!ASSERT_OK_PTR(skel, "tracing_multi_bpf__open_and_load")) + return; + + ids = get_ids(kfuncs, ARRAY_SIZE(kfuncs), NULL); + if (!ASSERT_OK_PTR(ids, "get_ids")) + goto cleanup; + + fds[0] = bpf_program__fd(skel->progs.target_1); + + /* fail#1 (libbpf) kernel ids and BPF prog fds */ + LIBBPF_OPTS_RESET(opts, + .ids = ids, + .fds = fds, + .funcs = bpf_funcs, + .cnt = ARRAY_SIZE(bpf_funcs), + ); + + link = bpf_program__attach_tracing_multi(skel->progs.test_fentry, NULL, &opts); + err = libbpf_get_error(link); + if (!ASSERT_EQ(err, -EINVAL, "libbpf_ids_fds")) { + if (!err) + bpf_link__destroy(link); + goto cleanup; + } + + /* fail#2 (libbpf) kernel pattern and BPF prog fds */ + LIBBPF_OPTS_RESET(opts, + .fds = fds, + .funcs = bpf_funcs, + .cnt = ARRAY_SIZE(bpf_funcs), + ); + + link = bpf_program__attach_tracing_multi(skel->progs.test_fentry, + "bpf_fentry_test*", &opts); + err = libbpf_get_error(link); + if (!ASSERT_EQ(err, -EINVAL, "libbpf_pattern_fds")) { + if (!err) + bpf_link__destroy(link); + goto cleanup; + } + + /* fail#3 (kernel) kernel id with BPF prog fd */ + lopts.tracing_multi.ids = ids; + lopts.tracing_multi.fds = fds; + lopts.tracing_multi.cnt = ARRAY_SIZE(bpf_funcs); + fd = bpf_link_create(bpf_program__fd(skel->progs.test_fentry), 0, + BPF_TRACE_FENTRY_MULTI, &lopts); + ASSERT_EQ(fd, -EINVAL, "kernel_id_bpf_fd"); + if (fd >= 0) + close(fd); + + /* fail#4 (kernel) duplicate target through different fds */ + token_fd = bpf_object__token_fd(skel->obj); + token_fd = token_fd < 0 ? 0 : token_fd; + target_id = libbpf_find_prog_btf_id("target_1", fds[0], token_fd); + if (!ASSERT_GT(target_id, 0, "target_1_btf_id")) + goto cleanup; + + dup_fd = dup(fds[0]); + if (!ASSERT_GE(dup_fd, 0, "dup_target_fd")) + goto cleanup; + + fds[1] = dup_fd; + target_ids[0] = target_id; + target_ids[1] = target_id; + lopts.tracing_multi.ids = target_ids; + lopts.tracing_multi.fds = fds; + lopts.tracing_multi.cnt = ARRAY_SIZE(fds); + fd = bpf_link_create(bpf_program__fd(skel->progs.test_fentry), 0, + BPF_TRACE_FENTRY_MULTI, &lopts); + ASSERT_EQ(fd, -EINVAL, "duplicate_bpf_target"); + if (fd >= 0) + close(fd); + +cleanup: + if (dup_fd >= 0) + close(dup_fd); + tracing_multi_bpf__destroy(skel); + free(ids); +} + void test_tracing_multi_prog_test(void) { if (test__start_subtest("link_api")) test_link_api_bpf_prog(); + if (test__start_subtest("attach_api_fails")) + test_attach_api_bpf_prog_fails(); } -- 2.55.0
