| Message ID | 1647000658-16149-6-git-send-email-alan.maguire@oracle.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF |
| Headers | show |
| Series | libbpf: name-based u[ret]probe attach | expand |
On 3/11/22 1:10 PM, Alan Maguire wrote: > tests that verify auto-attach works for function entry/return for > local functions in program, library functions in program and library > functions in library. > > Signed-off-by: Alan Maguire <alan.maguire@oracle.com> > --- > .../selftests/bpf/prog_tests/uprobe_autoattach.c | 48 +++++++++++++++ > .../selftests/bpf/progs/test_uprobe_autoattach.c | 69 ++++++++++++++++++++++ > 2 files changed, 117 insertions(+) > create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c > create mode 100644 tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c > > diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c b/tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c > new file mode 100644 > index 0000000..57ed636 > --- /dev/null > +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c > @@ -0,0 +1,48 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* Copyright (c) 2022, Oracle and/or its affiliates. */ > + > +#include <test_progs.h> > +#include "test_uprobe_autoattach.skel.h" > + > +/* uprobe attach point */ > +static void autoattach_trigger_func(void) > +{ > + asm volatile (""); > +} > + > +void test_uprobe_autoattach(void) > +{ > + struct test_uprobe_autoattach *skel; > + char *mem; > + > + skel = test_uprobe_autoattach__open_and_load(); > + if (!ASSERT_OK_PTR(skel, "skel_open")) > + return; > + if (!ASSERT_OK_PTR(skel->bss, "check_bss")) > + goto cleanup; > + > + if (!ASSERT_OK(test_uprobe_autoattach__attach(skel), "skel_attach")) > + goto cleanup; > + > + /* trigger & validate uprobe & uretprobe */ > + autoattach_trigger_func(); > + > + /* trigger & validate shared library u[ret]probes attached by name */ > + mem = malloc(1); > + free(mem); > + > + if (!ASSERT_EQ(skel->bss->uprobe_byname_res, 1, "check_uprobe_byname_res")) > + goto cleanup; > + if (!ASSERT_EQ(skel->bss->uretprobe_byname_res, 2, "check_uretprobe_byname_res")) > + goto cleanup; > + if (!ASSERT_EQ(skel->bss->uprobe_byname2_res, 3, "check_uprobe_byname2_res")) > + goto cleanup; > + if (!ASSERT_EQ(skel->bss->uretprobe_byname2_res, 4, "check_uretprobe_byname2_res")) > + goto cleanup; > + if (!ASSERT_EQ(skel->bss->uprobe_byname3_res, 5, "check_uprobe_byname3_res")) > + goto cleanup; > + if (!ASSERT_EQ(skel->bss->uretprobe_byname3_res, 6, "check_uretprobe_byname3_res")) > + goto cleanup; > +cleanup: > + test_uprobe_autoattach__destroy(skel); > +} Hmm, looks like this fails CI, ptal: https://github.com/kernel-patches/bpf/runs/5517172330?check_suite_focus=true [...] test_attach_probe:PASS:uprobe_offset 0 nsec test_attach_probe:PASS:ref_ctr_offset 0 nsec test_attach_probe:PASS:skel_open 0 nsec test_attach_probe:PASS:check_bss 0 nsec test_attach_probe:PASS:attach_kprobe 0 nsec test_attach_probe:PASS:attach_kretprobe 0 nsec test_attach_probe:PASS:uprobe_ref_ctr_before 0 nsec test_attach_probe:PASS:attach_uprobe 0 nsec test_attach_probe:PASS:uprobe_ref_ctr_after 0 nsec test_attach_probe:PASS:attach_uretprobe 0 nsec test_attach_probe:PASS:auto-attach should fail for old-style name 0 nsec test_attach_probe:PASS:attach_uprobe_byname 0 nsec test_attach_probe:PASS:attach_uretprobe_byname 0 nsec test_attach_probe:PASS:attach_uprobe_byname2 0 nsec test_attach_probe:PASS:attach_uretprobe_byname2 0 nsec test_attach_probe:PASS:check_kprobe_res 0 nsec test_attach_probe:PASS:check_kretprobe_res 0 nsec test_attach_probe:PASS:check_uprobe_res 0 nsec test_attach_probe:PASS:check_uretprobe_res 0 nsec test_attach_probe:PASS:check_uprobe_byname_res 0 nsec test_attach_probe:PASS:check_uretprobe_byname_res 0 nsec test_attach_probe:PASS:check_uprobe_byname2_res 0 nsec test_attach_probe:FAIL:check_uretprobe_byname2_res unexpected check_uretprobe_byname2_res: actual 0 != expected 8 test_attach_probe:PASS:uprobe_ref_ctr_cleanup 0 nsec #4 attach_probe:FAIL [...]
On Fri, Mar 11, 2022 at 4:11 AM Alan Maguire <alan.maguire@oracle.com> wrote: > > tests that verify auto-attach works for function entry/return for > local functions in program, library functions in program and library > functions in library. > > Signed-off-by: Alan Maguire <alan.maguire@oracle.com> > --- > .../selftests/bpf/prog_tests/uprobe_autoattach.c | 48 +++++++++++++++ > .../selftests/bpf/progs/test_uprobe_autoattach.c | 69 ++++++++++++++++++++++ > 2 files changed, 117 insertions(+) > create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c > create mode 100644 tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c > > diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c b/tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c > new file mode 100644 > index 0000000..57ed636 > --- /dev/null > +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c > @@ -0,0 +1,48 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* Copyright (c) 2022, Oracle and/or its affiliates. */ > + > +#include <test_progs.h> > +#include "test_uprobe_autoattach.skel.h" > + > +/* uprobe attach point */ > +static void autoattach_trigger_func(void) > +{ > + asm volatile (""); > +} > + > +void test_uprobe_autoattach(void) > +{ > + struct test_uprobe_autoattach *skel; > + char *mem; > + > + skel = test_uprobe_autoattach__open_and_load(); > + if (!ASSERT_OK_PTR(skel, "skel_open")) > + return; > + if (!ASSERT_OK_PTR(skel->bss, "check_bss")) > + goto cleanup; no need to check skel->bss, a lot of tests will be broken if that doesn't work > + > + if (!ASSERT_OK(test_uprobe_autoattach__attach(skel), "skel_attach")) > + goto cleanup; > + > + /* trigger & validate uprobe & uretprobe */ > + autoattach_trigger_func(); > + > + /* trigger & validate shared library u[ret]probes attached by name */ > + mem = malloc(1); > + free(mem); > + > + if (!ASSERT_EQ(skel->bss->uprobe_byname_res, 1, "check_uprobe_byname_res")) > + goto cleanup; > + if (!ASSERT_EQ(skel->bss->uretprobe_byname_res, 2, "check_uretprobe_byname_res")) > + goto cleanup; > + if (!ASSERT_EQ(skel->bss->uprobe_byname2_res, 3, "check_uprobe_byname2_res")) > + goto cleanup; > + if (!ASSERT_EQ(skel->bss->uretprobe_byname2_res, 4, "check_uretprobe_byname2_res")) > + goto cleanup; > + if (!ASSERT_EQ(skel->bss->uprobe_byname3_res, 5, "check_uprobe_byname3_res")) > + goto cleanup; > + if (!ASSERT_EQ(skel->bss->uretprobe_byname3_res, 6, "check_uretprobe_byname3_res")) > + goto cleanup; same about goto cleanup, for such sequences of value checks it's nice and succinct to just use unconditional sequence of ASSERT_EQ()s > +cleanup: > + test_uprobe_autoattach__destroy(skel); > +} [...]
diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c b/tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c new file mode 100644 index 0000000..57ed636 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, Oracle and/or its affiliates. */ + +#include <test_progs.h> +#include "test_uprobe_autoattach.skel.h" + +/* uprobe attach point */ +static void autoattach_trigger_func(void) +{ + asm volatile (""); +} + +void test_uprobe_autoattach(void) +{ + struct test_uprobe_autoattach *skel; + char *mem; + + skel = test_uprobe_autoattach__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_open")) + return; + if (!ASSERT_OK_PTR(skel->bss, "check_bss")) + goto cleanup; + + if (!ASSERT_OK(test_uprobe_autoattach__attach(skel), "skel_attach")) + goto cleanup; + + /* trigger & validate uprobe & uretprobe */ + autoattach_trigger_func(); + + /* trigger & validate shared library u[ret]probes attached by name */ + mem = malloc(1); + free(mem); + + if (!ASSERT_EQ(skel->bss->uprobe_byname_res, 1, "check_uprobe_byname_res")) + goto cleanup; + if (!ASSERT_EQ(skel->bss->uretprobe_byname_res, 2, "check_uretprobe_byname_res")) + goto cleanup; + if (!ASSERT_EQ(skel->bss->uprobe_byname2_res, 3, "check_uprobe_byname2_res")) + goto cleanup; + if (!ASSERT_EQ(skel->bss->uretprobe_byname2_res, 4, "check_uretprobe_byname2_res")) + goto cleanup; + if (!ASSERT_EQ(skel->bss->uprobe_byname3_res, 5, "check_uprobe_byname3_res")) + goto cleanup; + if (!ASSERT_EQ(skel->bss->uretprobe_byname3_res, 6, "check_uretprobe_byname3_res")) + goto cleanup; +cleanup: + test_uprobe_autoattach__destroy(skel); +} diff --git a/tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c b/tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c new file mode 100644 index 0000000..a808bcf --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c @@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, Oracle and/or its affiliates. */ + +#include <linux/ptrace.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +int uprobe_byname_res = 0; +int uretprobe_byname_res = 0; +int uprobe_byname2_res = 0; +int uretprobe_byname2_res = 0; +int uprobe_byname3_res = 0; +int uretprobe_byname3_res = 0; + +/* This program cannot auto-attach, but that should not stop other + * programs from attaching. + */ +SEC("uprobe/no_autoattach") +int handle_uprobe_noautoattach(struct pt_regs *ctx) +{ + return 0; +} + +SEC("uprobe//proc/self/exe:autoattach_trigger_func") +int handle_uprobe_byname(struct pt_regs *ctx) +{ + uprobe_byname_res = 1; + return 0; +} + +SEC("uretprobe//proc/self/exe:autoattach_trigger_func") +int handle_uretprobe_byname(struct pt_regs *ctx) +{ + uretprobe_byname_res = 2; + return 0; +} + + +SEC("uprobe//proc/self/exe:malloc") +int handle_uprobe_byname2(struct pt_regs *ctx) +{ + uprobe_byname2_res = 3; + return 0; +} + +SEC("uretprobe//proc/self/exe:malloc") +int handle_uretprobe_byname2(struct pt_regs *ctx) +{ + uretprobe_byname2_res = 4; + return 0; +} + + +SEC("uprobe/libc.so.6:free") +int handle_uprobe_byname3(struct pt_regs *ctx) +{ + uprobe_byname3_res = 5; + return 0; +} + +SEC("uretprobe/libc.so.6:free") +int handle_uretprobe_byname3(struct pt_regs *ctx) +{ + uretprobe_byname3_res = 6; + return 0; +} + +char _license[] SEC("license") = "GPL";
tests that verify auto-attach works for function entry/return for local functions in program, library functions in program and library functions in library. Signed-off-by: Alan Maguire <alan.maguire@oracle.com> --- .../selftests/bpf/prog_tests/uprobe_autoattach.c | 48 +++++++++++++++ .../selftests/bpf/progs/test_uprobe_autoattach.c | 69 ++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c create mode 100644 tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c