On Thu, Mar 31, 2022 at 8:55 AM Alan Maguire <alan.maguire@xxxxxxxxxx> wrote: > > cOn Fri, 25 Mar 2022, Andrii Nakryiko wrote: > > > Add semaphore-based USDT to test_progs itself and write basic tests to > > valicate both auto-attachment and manual attachment logic, as well as > > BPF-side functionality. > > > > Also add subtests to validate that libbpf properly deduplicates USDT > > specs and handles spec overflow situations correctly, as well as proper > > "rollback" of partially-attached multi-spec USDT. > > > > Signed-off-by: Andrii Nakryiko <andrii@xxxxxxxxxx> > > One compilation issue and minor nit below > > Reviewed-by: Alan Maguire <alan.maguire@xxxxxxxxxx> > > > --- > > tools/testing/selftests/bpf/Makefile | 1 + > > tools/testing/selftests/bpf/prog_tests/usdt.c | 314 ++++++++++++++++++ > > tools/testing/selftests/bpf/progs/test_usdt.c | 115 +++++++ > > 3 files changed, 430 insertions(+) > > create mode 100644 tools/testing/selftests/bpf/prog_tests/usdt.c > > create mode 100644 tools/testing/selftests/bpf/progs/test_usdt.c > > > > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > > index 3820608faf57..18e22def3bdb 100644 > > --- a/tools/testing/selftests/bpf/Makefile > > +++ b/tools/testing/selftests/bpf/Makefile > > @@ -400,6 +400,7 @@ $(TRUNNER_BPF_OBJS): $(TRUNNER_OUTPUT)/%.o: \ > > $(TRUNNER_BPF_PROGS_DIR)/*.h \ > > $$(INCLUDE_DIR)/vmlinux.h \ > > $(wildcard $(BPFDIR)/bpf_*.h) \ > > + $(wildcard $(BPFDIR)/*.bpf.h) \ > > | $(TRUNNER_OUTPUT) $$(BPFOBJ) > > $$(call $(TRUNNER_BPF_BUILD_RULE),$$<,$$@, \ > > $(TRUNNER_BPF_CFLAGS)) > > diff --git a/tools/testing/selftests/bpf/prog_tests/usdt.c b/tools/testing/selftests/bpf/prog_tests/usdt.c > > new file mode 100644 > > index 000000000000..44a20d8c45d7 > > --- /dev/null > > +++ b/tools/testing/selftests/bpf/prog_tests/usdt.c > > @@ -0,0 +1,314 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */ > > +#include <test_progs.h> > > + > > +#define _SDT_HAS_SEMAPHORES 1 > > +#include <sys/sdt.h> > > + > > Do we need to bracket with feature test for sdt.h? I think I had > something rough for this in > > https://lore.kernel.org/bpf/1642004329-23514-5-git-send-email-alan.maguire@xxxxxxxxxx/ > > might prevent selftest compilation failures if sdt.h isn't present, > and IIRC that feature test is used in perf code. Well, I was thinking to just specify in README that one needs to have sys/sdt.h installed from the systemtap-sdt-devel package. Alternatively, copy/pasting sdt.h locally and using it is also an option, that header is quite well contained and has permissive license. The latter is less hassle for everyone, but someone might have concerns about checking in external header. So in v2 I'll go with documenting dependency on systemtap-sdt-devel package, unless people prefer sdt.h being checked in > > I just realized I got confused on the cookie logic. There's really two > levels of cookies: > > - at the API level, the USDT cookie is associated with the USDT > attachment, and can span multiple sites; but under the hood > - the uprobe cookie is used to associate the uprobe point of attachment > with the associated spec id. If BPF cookie retrieval isn't supported, > we fall back to using the instruction pointer -> spec id mapping. > > To get the usdt cookie in BPF prog context, we first look up the uprobe > cookie to get the spec id, and then get the spec entry. Yep, it's all cookies around :) Not sure how to make the distinction cleaner, tbh. > > I guess libbpf CI on older kernels will cover testing for the case where > bpf cookies aren't supported and we need to do that ip -> spec id > mapping? Perhaps we could have a test that #defines > BPF_USDT_HAS_BPF_COOKIE to 0 to cover testing this on newer kernels? Yes, you are right about CI, I plan to enable this test on 4.9 and 5.5 kernels we have in CI. Just setting BPF_USDT_HAS_BPF_COOKIE to 0 won't work because user-space part is doing it's own detection of BPF cookie support, and doing it some other way is way too complicated for something that is necessary for selftest. But we'll get coverage for old kernels in CI, so that's good news. > > > +#include "test_usdt.skel.h" > > +#include "test_urandom_usdt.skel.h" > > + > > +int lets_test_this(int); > > + > > +static volatile int idx = 2; > > +static volatile __u64 bla = 0xFEDCBA9876543210ULL; > > +static volatile short nums[] = {-1, -2, -3, }; > > + [...] > > +/* we shouldn't be able to attach to test:usdt2_300 USDT as we don't have as > > + * many slots for specs. It's important that each STAP_PROBE2() invocation > > + * (after untolling) gets different arg spec due to compiler inlining i as > > + * a constant > > + */ > > +static void __always_inline f300(int x) > > +{ > > + STAP_PROBE1(test, usdt_300, x); > > +} > > + > > +__weak void trigger_300_usdts(void) > > +{ > > + R100(f300, 0); > > + R100(f300, 100); > > + R100(f300, 200); > > +} > > + > > +static void __always_inline f400(int /*unused*/ ) > > ...caused a compilation error on gcc-9 for me: > > TEST-OBJ [test_progs] usdt.test.o > /home/alan/kbuild/bpf-next/tools/testing/selftests/bpf/prog_tests/usdt.c: > In function ‘f400’: > /home/alan/kbuild/bpf-next/tools/testing/selftests/bpf/prog_tests/usdt.c:191:34: > error: parameter name omitted > 191 | static void __always_inline f400(int /*unused*/ ) > | ^~~ > make: *** > [/home/alan/kbuild/bpf-next/tools/testing/selftests/bpf/usdt.test.o] Error > 1 > ...but with > > diff --git a/tools/testing/selftests/bpf/prog_tests/usdt.c > b/tools/testing/selftests/bpf/prog_tests/ > index b4c070b..5d382c8 100644 > --- a/tools/testing/selftests/bpf/prog_tests/usdt.c > +++ b/tools/testing/selftests/bpf/prog_tests/usdt.c > @@ -188,7 +188,7 @@ __weak void trigger_300_usdts(void) > R100(f300, 200); > } > > -static void __always_inline f400(int /*unused*/ ) > +static void __always_inline f400(int u /*unused*/ ) > { > static int x; > > > > ...tests passed cleanly. oh, cool, thanks for the report. I'll name the argument and add __attribute__((unused)) to prevent other compilers to complain > > > +{ > > + static int x; > > + > > + STAP_PROBE1(test, usdt_400, x++); > > +} > > + [...] > > +SEC("usdt//proc/self/exe:test:usdt_100") > > +int BPF_USDT(usdt_100, int x) > > +{ > > + long tmp; > > + > > + if (my_pid != (bpf_get_current_pid_tgid() >> 32)) > > + return 0; > > + > > + __sync_fetch_and_add(&usdt_100_called, 1); > > + __sync_fetch_and_add(&usdt_100_sum, x); > > + > > + bpf_printk("X is %d, sum is %d", x, usdt_100_sum); > > + > > debugging, needed? oops, yep, leftovers, will clean up. > > > + return 0; > > +} > > + > > +char _license[] SEC("license") = "GPL"; > > -- > > 2.30.2 > > > >
