| Message ID | 20220412165555.4146407-6-kuifeng@fb.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | Attach a cookie to a tracing program. | expand |
On Tue, Apr 12, 2022 at 9:56 AM Kui-Feng Lee <kuifeng@fb.com> wrote: > > Make sure BPF cookies are correct for fentry/fexit/fmod_ret. > > Signed-off-by: Kui-Feng Lee <kuifeng@fb.com> > --- > .../selftests/bpf/prog_tests/bpf_cookie.c | 52 +++++++++++++++++++ > .../selftests/bpf/progs/test_bpf_cookie.c | 24 +++++++++ > 2 files changed, 76 insertions(+) > > diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c > index 923a6139b2d8..7f05056c66d4 100644 > --- a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c > +++ b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c > @@ -410,6 +410,56 @@ static void pe_subtest(struct test_bpf_cookie *skel) > bpf_link__destroy(link); > } > > +static void tracing_subtest(struct test_bpf_cookie *skel) > +{ > + __u64 cookie; > + int prog_fd; > + int fentry_fd = -1, fexit_fd = -1, fmod_ret_fd = -1; > + unnecessary empty line > + LIBBPF_OPTS(bpf_test_run_opts, opts, .repeat = 1); .repeat = 1 is not necessary, I think, .repeat = 0 is equivalent to that > + LIBBPF_OPTS(bpf_link_create_opts, link_opts); > + > + skel->bss->fentry_res = 0; > + skel->bss->fexit_res = 0; > + > + cookie = 0x100000; nit: make this value bigger to make sure higher 32 bits of u64 are preserved properly. Maybe 0x1000000010000000 (and similarly with 2 and 3) > + prog_fd = bpf_program__fd(skel->progs.fentry_test1); > + link_opts.tracing.bpf_cookie = cookie; > + fentry_fd = bpf_link_create(prog_fd, 0, BPF_TRACE_FENTRY, &link_opts); > + ASSERT_GE? > + cookie = 0x200000; > + prog_fd = bpf_program__fd(skel->progs.fexit_test1); > + link_opts.tracing.bpf_cookie = cookie; > + fexit_fd = bpf_link_create(prog_fd, 0, BPF_TRACE_FEXIT, &link_opts); > + if (!ASSERT_GE(fexit_fd, 0, "fexit.open")) > + goto cleanup; > + [...]
On Tue, 2022-04-12 at 20:17 -0700, Andrii Nakryiko wrote: > On Tue, Apr 12, 2022 at 9:56 AM Kui-Feng Lee <kuifeng@fb.com> wrote: > > > > Make sure BPF cookies are correct for fentry/fexit/fmod_ret. > > > > Signed-off-by: Kui-Feng Lee <kuifeng@fb.com> > > --- > > .../selftests/bpf/prog_tests/bpf_cookie.c | 52 > > +++++++++++++++++++ > > .../selftests/bpf/progs/test_bpf_cookie.c | 24 +++++++++ > > 2 files changed, 76 insertions(+) > > > > diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c > > b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c > > index 923a6139b2d8..7f05056c66d4 100644 > > --- a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c > > +++ b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c > > @@ -410,6 +410,56 @@ static void pe_subtest(struct test_bpf_cookie > > *skel) > > bpf_link__destroy(link); > > } > > > > +static void tracing_subtest(struct test_bpf_cookie *skel) > > +{ > > + __u64 cookie; > > + int prog_fd; > > + int fentry_fd = -1, fexit_fd = -1, fmod_ret_fd = -1; > > + > > unnecessary empty line Got it! > > > + LIBBPF_OPTS(bpf_test_run_opts, opts, .repeat = 1); > > .repeat = 1 is not necessary, I think, .repeat = 0 is equivalent to > that I will test it. > > > + LIBBPF_OPTS(bpf_link_create_opts, link_opts); > > + > > + skel->bss->fentry_res = 0; > > + skel->bss->fexit_res = 0; > > + > > + cookie = 0x100000; > > nit: make this value bigger to make sure higher 32 bits of u64 are > preserved properly. Maybe 0x1000000010000000 (and similarly with 2 > and > 3) Ok! > > > + prog_fd = bpf_program__fd(skel->progs.fentry_test1); > > + link_opts.tracing.bpf_cookie = cookie; > > + fentry_fd = bpf_link_create(prog_fd, 0, BPF_TRACE_FENTRY, > > &link_opts); > > + > > ASSERT_GE? sure! > > > + cookie = 0x200000; > > + prog_fd = bpf_program__fd(skel->progs.fexit_test1); > > + link_opts.tracing.bpf_cookie = cookie; > > + fexit_fd = bpf_link_create(prog_fd, 0, BPF_TRACE_FEXIT, > > &link_opts); > > + if (!ASSERT_GE(fexit_fd, 0, "fexit.open")) > > + goto cleanup; > > + > > [...]
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c index 923a6139b2d8..7f05056c66d4 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c @@ -410,6 +410,56 @@ static void pe_subtest(struct test_bpf_cookie *skel) bpf_link__destroy(link); } +static void tracing_subtest(struct test_bpf_cookie *skel) +{ + __u64 cookie; + int prog_fd; + int fentry_fd = -1, fexit_fd = -1, fmod_ret_fd = -1; + + LIBBPF_OPTS(bpf_test_run_opts, opts, .repeat = 1); + LIBBPF_OPTS(bpf_link_create_opts, link_opts); + + skel->bss->fentry_res = 0; + skel->bss->fexit_res = 0; + + cookie = 0x100000; + prog_fd = bpf_program__fd(skel->progs.fentry_test1); + link_opts.tracing.bpf_cookie = cookie; + fentry_fd = bpf_link_create(prog_fd, 0, BPF_TRACE_FENTRY, &link_opts); + + cookie = 0x200000; + prog_fd = bpf_program__fd(skel->progs.fexit_test1); + link_opts.tracing.bpf_cookie = cookie; + fexit_fd = bpf_link_create(prog_fd, 0, BPF_TRACE_FEXIT, &link_opts); + if (!ASSERT_GE(fexit_fd, 0, "fexit.open")) + goto cleanup; + + cookie = 0x300000; + prog_fd = bpf_program__fd(skel->progs.fmod_ret_test); + link_opts.tracing.bpf_cookie = cookie; + fmod_ret_fd = bpf_link_create(prog_fd, 0, BPF_MODIFY_RETURN, &link_opts); + if (!ASSERT_GE(fmod_ret_fd, 0, "fmod_ret.opoen")) + goto cleanup; + + prog_fd = bpf_program__fd(skel->progs.fentry_test1); + bpf_prog_test_run_opts(prog_fd, &opts); + + prog_fd = bpf_program__fd(skel->progs.fmod_ret_test); + bpf_prog_test_run_opts(prog_fd, &opts); + + ASSERT_EQ(skel->bss->fentry_res, 0x100000, "fentry_res"); + ASSERT_EQ(skel->bss->fexit_res, 0x200000, "fexit_res"); + ASSERT_EQ(skel->bss->fmod_ret_res, 0x300000, "fmod_ret_res"); + +cleanup: + if (fentry_fd >= 0) + close(fentry_fd); + if (fexit_fd >= 0) + close(fexit_fd); + if (fmod_ret_fd >= 0) + close(fmod_ret_fd); +} + void test_bpf_cookie(void) { struct test_bpf_cookie *skel; @@ -432,6 +482,8 @@ void test_bpf_cookie(void) tp_subtest(skel); if (test__start_subtest("perf_event")) pe_subtest(skel); + if (test__start_subtest("trampoline")) + tracing_subtest(skel); test_bpf_cookie__destroy(skel); } diff --git a/tools/testing/selftests/bpf/progs/test_bpf_cookie.c b/tools/testing/selftests/bpf/progs/test_bpf_cookie.c index 0e2222968918..c37bc6ad0b70 100644 --- a/tools/testing/selftests/bpf/progs/test_bpf_cookie.c +++ b/tools/testing/selftests/bpf/progs/test_bpf_cookie.c @@ -14,6 +14,9 @@ int uprobe_res; int uretprobe_res; int tp_res; int pe_res; +int fentry_res; +int fexit_res; +int fmod_ret_res; static void update(void *ctx, int *res) { @@ -82,4 +85,25 @@ int handle_pe(struct pt_regs *ctx) return 0; } +SEC("fentry/bpf_fentry_test1") +int BPF_PROG(fentry_test1, int a) +{ + update(ctx, &fentry_res); + return 0; +} + +SEC("fexit/bpf_fentry_test1") +int BPF_PROG(fexit_test1, int a, int ret) +{ + update(ctx, &fexit_res); + return 0; +} + +SEC("fmod_ret/bpf_modify_return_test") +int BPF_PROG(fmod_ret_test, int _a, int *_b, int _ret) +{ + update(ctx, &fmod_ret_res); + return 1234; +} + char _license[] SEC("license") = "GPL";
Make sure BPF cookies are correct for fentry/fexit/fmod_ret. Signed-off-by: Kui-Feng Lee <kuifeng@fb.com> --- .../selftests/bpf/prog_tests/bpf_cookie.c | 52 +++++++++++++++++++ .../selftests/bpf/progs/test_bpf_cookie.c | 24 +++++++++ 2 files changed, 76 insertions(+)