| Message ID | 20211025223345.2136168-4-fallentree@fb.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF |
| Headers | show |
| Series | selftests/bpf: parallel mode improvement | expand |
On Mon, Oct 25, 2021 at 3:33 PM Yucong Sun <fallentree@fb.com> wrote: > > From: Yucong Sun <sunyucong@gmail.com> > > This patch makes attach_probe uses its own method as attach point, > avoiding conflict with other tests like bpf_cookie. > > Signed-off-by: Yucong Sun <sunyucong@gmail.com> > --- > tools/testing/selftests/bpf/prog_tests/attach_probe.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c > index 6c511dcd1465..d0bd51eb23c8 100644 > --- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c > +++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c > @@ -5,6 +5,11 @@ > /* this is how USDT semaphore is actually defined, except volatile modifier */ > volatile unsigned short uprobe_ref_ctr __attribute__((unused)) __attribute((section(".probes"))); > > +/* attach point */ > +static void method(void) { { on separate line let's also mark it as noinline just in case > + return ; unnecessary return (also extra space before semicolon) > +} > + > void test_attach_probe(void) > { > DECLARE_LIBBPF_OPTS(bpf_uprobe_opts, uprobe_opts); > @@ -33,7 +38,7 @@ void test_attach_probe(void) > if (CHECK(base_addr < 0, "get_base_addr", > "failed to find base addr: %zd", base_addr)) > return; > - uprobe_offset = get_uprobe_offset(&get_base_addr, base_addr); > + uprobe_offset = get_uprobe_offset(&method, base_addr); > > ref_ctr_offset = get_rel_offset((uintptr_t)&uprobe_ref_ctr); > if (!ASSERT_GE(ref_ctr_offset, 0, "ref_ctr_offset")) > @@ -98,7 +103,7 @@ void test_attach_probe(void) > goto cleanup; > > /* trigger & validate uprobe & uretprobe */ > - get_base_addr(); > + method(); > > if (CHECK(skel->bss->uprobe_res != 3, "check_uprobe_res", > "wrong uprobe res: %d\n", skel->bss->uprobe_res)) > -- > 2.30.2 >
diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c index 6c511dcd1465..d0bd51eb23c8 100644 --- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c +++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c @@ -5,6 +5,11 @@ /* this is how USDT semaphore is actually defined, except volatile modifier */ volatile unsigned short uprobe_ref_ctr __attribute__((unused)) __attribute((section(".probes"))); +/* attach point */ +static void method(void) { + return ; +} + void test_attach_probe(void) { DECLARE_LIBBPF_OPTS(bpf_uprobe_opts, uprobe_opts); @@ -33,7 +38,7 @@ void test_attach_probe(void) if (CHECK(base_addr < 0, "get_base_addr", "failed to find base addr: %zd", base_addr)) return; - uprobe_offset = get_uprobe_offset(&get_base_addr, base_addr); + uprobe_offset = get_uprobe_offset(&method, base_addr); ref_ctr_offset = get_rel_offset((uintptr_t)&uprobe_ref_ctr); if (!ASSERT_GE(ref_ctr_offset, 0, "ref_ctr_offset")) @@ -98,7 +103,7 @@ void test_attach_probe(void) goto cleanup; /* trigger & validate uprobe & uretprobe */ - get_base_addr(); + method(); if (CHECK(skel->bss->uprobe_res != 3, "check_uprobe_res", "wrong uprobe res: %d\n", skel->bss->uprobe_res))