selftests/bpf: Add Memory Sanitizer support
Subsystems (7)
PATCH v2 1/16 selftests/bpf: Quote host tools
In reply to Ilya LeoshkevichUsing HOSTCC="ccache clang" breaks building the tests, since, when it's forwarded to e.g. bpftool, the child make sees HOSTCC=ccache and "clang" is considered a target. Fix by quoting it, and also HOSTLD and HOSTAR for consistency.
--- tools/testing/selftests/bpf/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/Makefile +4 -3
@@ -246,7 +246,7 @@ BPFTOOL ?= $(DEFAULT_BPFTOOL) $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/bpftool $(Q)$(MAKE) $(submake_extras) -C $(BPFTOOLDIR) \ - ARCH= CROSS_COMPILE= CC=$(HOSTCC) LD=$(HOSTLD) \ + ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" \ EXTRA_CFLAGS='-g -O0' \ OUTPUT=$(HOST_BUILD_DIR)/bpftool/ \ LIBBPF_OUTPUT=$(HOST_BUILD_DIR)/libbpf/ \
@@ -278,7 +278,8 @@ $(HOST_BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ | $(HOST_BUILD_DIR)/libbpf $(Q)$(MAKE) $(submake_extras) -C $(BPFDIR) \ EXTRA_CFLAGS='-g -O0' ARCH= CROSS_COMPILE= \ - OUTPUT=$(HOST_BUILD_DIR)/libbpf/ CC=$(HOSTCC) LD=$(HOSTLD) \ + OUTPUT=$(HOST_BUILD_DIR)/libbpf/ \ + CC="$(HOSTCC)" LD="$(HOSTLD)" \ DESTDIR=$(HOST_SCRATCH_DIR)/ prefix= all install_headers endif
@@ -299,7 +300,7 @@ $(RESOLVE_BTFIDS): $(HOST_BPFOBJ) | $(HOST_BUILD_DIR)/resolve_btfids \ $(TOOLSDIR)/lib/ctype.c \ $(TOOLSDIR)/lib/str_error_r.c $(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/resolve_btfids \ - CC=$(HOSTCC) LD=$(HOSTLD) AR=$(HOSTAR) \ + CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" \ LIBBPF_INCLUDE=$(HOST_INCLUDE_DIR) \ OUTPUT=$(HOST_BUILD_DIR)/resolve_btfids/ BPFOBJ=$(HOST_BPFOBJ)
Signature · 1 line
2.39.1
PATCH v2 2/16 tools: runqslower: Add EXTRA_CFLAGS and EXTRA_LDFLAGS support
In reply to Ilya LeoshkevichThis makes it possible to add sanitizer flags.
--- tools/bpf/runqslower/Makefile | 2 ++ 1 file changed, 2 insertions(+)
tools/bpf/runqslower/Makefile +2 -0
@@ -13,6 +13,8 @@ BPF_DESTDIR := $(BPFOBJ_OUTPUT) BPF_INCLUDE := $(BPF_DESTDIR)/include INCLUDES := -I$(OUTPUT) -I$(BPF_INCLUDE) -I$(abspath ../../include/uapi) CFLAGS := -g -Wall $(CLANG_CROSS_FLAGS) +CFLAGS += $(EXTRA_CFLAGS) +LDFLAGS += $(EXTRA_LDFLAGS) # Try to detect best kernel BTF source KERNEL_REL := $(shell uname -r)
Signature · 1 line
2.39.1
PATCH v2 3/16 selftests/bpf: Split SAN_CFLAGS and SAN_LDFLAGS
In reply to Ilya LeoshkevichMemory Sanitizer requires passing different options to CFLAGS and
LDFLAGS: besides the mandatory -fsanitize=memory, one needs to pass header and library paths, and passing -L to a compilation step triggers -Wunused-command-line-argument. So introduce a separate variable for linker flags. Use $(SAN_CFLAGS) as a default in order to avoid complicating the ASan usage.
--- tools/testing/selftests/bpf/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/Makefile +2 -1
@@ -22,10 +22,11 @@ endif BPF_GCC ?= $(shell command -v bpf-gcc;) SAN_CFLAGS ?= +SAN_LDFLAGS ?= $(SAN_CFLAGS) CFLAGS += -g -O0 -rdynamic -Wall -Werror $(GENFLAGS) $(SAN_CFLAGS) \ -I$(CURDIR) -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR) \ -I$(TOOLSINCDIR) -I$(APIDIR) -I$(OUTPUT) -LDFLAGS += $(SAN_CFLAGS) +LDFLAGS += $(SAN_LDFLAGS) LDLIBS += -lelf -lz -lrt -lpthread # Silence some warnings when compiled with clang
Signature · 1 line
2.39.1
v2 cover selftests/bpf: Add Memory Sanitizer support
v1: https://lore.kernel.org/bpf/[email protected]/
v1 -> v2:
- Apply runqslower's EXTRA_CFLAGS and EXTRA_LDFLAGS unconditionally.
- Use u64 for uretprobe_byname2_rc.
- Use BPF_UPROBE() instead of PT_REGS_xxx().
- Use void * instead of char * for pointer arithmetic.
- Rename libbpf_mark_defined() to __libbpf_mark_mem_written(), add convenience wrappers.
- Add a comment about defined(__has_feature) && __has_feature(memory_sanitizer).
- Extract is_percpu_bpf_map_type().
- Introduce bpf_get_{map,prog,link,btf}_info_by_fd() and convert all code to use them. If it's too early for that, in particular for samples and perf, the respective patches can be dropped.
- Unpoison infos returned by these functions, paying attention to potentially missing fields. Use macros to reduce boilerplate.
- Move capget() unpoisoning to LLVM [5].
- With that, only a few cases remain where data needs to be unpoisoned in selftests.
Hi,
This series adds support for building selftests with Memory Sanitizer
[1] - a compiler instrumentation for detecting usages of undefined memory.
The primary motivation is to make sure that such usages do not occur during testing, since the ones that have not been caught yet are likely to affect the CI results on s390x. The secondary motivation is to be able to use libbpf in applications instrumented with MSan (it requires all code running in a process to be instrumented).
MSan has found one real issue (fixed by patch 7), and of course a number of false positives. This rest of this series deals with preparing the build infrastructure and adding MSan annotations to libbpf and selftests.
The setup I'm using is as follows:
- Instrumented zlib-ng and patched elfutils [2].
- Patched LLVM [3, 4, 5].
- Clang-built kernel.
- Building tests with MSan:
make \
-C tools/testing/selftests/bpf \
CC="ccache clang-17" \
LD=ld \
HOSTCC="ccache clang-17" \
HOSTLD=ld \
LLVM=1 \
LLVM_SUFFIX=-17 \
OBJCOPY=objcopy \
CLANG="ccache clang-17" \
LLVM_STRIP=llvm-strip-17 \
LLC=llc-17 \
BPF_GCC= \
SAN_CFLAGS="-fsanitize=memory \
-fsanitize-memory-track-origins \
-I$PWD/../zlib-ng/dist/include \
-I$PWD/../elfutils/dist/include" \
SAN_LDFLAGS="-fsanitize=memory \
-fsanitize-memory-track-origins \
-L$PWD/../zlib-ng/dist/lib \
-L$PWD/../elfutils/dist/lib" \
CROSS_COMPILE=s390x-linux-gnu- It's a lot of options, but most of them are trivial: setting up LLVM toolchain, taking in account s390x quirks, setting up MSan and disabling bpf-gcc. The CROSS_COMPILE one is a hack: instrumenting bpftool turned out to be too complicated from the build system perspective, so having CROSS_COMPILE forces compiling the host libbpf uninstrumented and guest libbpf instrumented.
- Running tests with MSan on s390x:
LD_LIBRARY_PATH=<instrumented libs> ./test_progs
...
Summary: 282/1624 PASSED, 23 SKIPPED, 4 FAILEDThe 4 failures happen without MSan too, they are already known and denylisted.
Best regards,
Ilya
[1] https://clang.llvm.org/docs/MemorySanitizer.html
[2] https://sourceware.org/pipermail/elfutils-devel/2023q1/005831.html
[3] https://reviews.llvm.org/D143296
[4] https://reviews.llvm.org/D143330
[5] https://reviews.llvm.org/D143660
Ilya Leoshkevich (16):
selftests/bpf: Quote host tools
tools: runqslower: Add EXTRA_CFLAGS and EXTRA_LDFLAGS support selftests/bpf: Split SAN_CFLAGS and SAN_LDFLAGS selftests/bpf: Forward SAN_CFLAGS and SAN_LDFLAGS to runqslower and
libbpf
selftests/bpf: Attach to fopen()/fclose() in uprobe_autoattach selftests/bpf: Attach to fopen()/fclose() in attach_probe
libbpf: Fix alen calculation in libbpf_nla_dump_errormsg()
libbpf: Introduce bpf_{btf,link,map,prog}_get_info_by_fd()
libbpf: Use bpf_{btf,link,map,prog}_get_info_by_fd()
bpftool: Use bpf_{btf,link,map,prog}_get_info_by_fd()
perf: Use bpf_{btf,link,map,prog}_get_info_by_fd() samples/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd() selftests/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd()
libbpf: Factor out is_percpu_bpf_map_type()
libbpf: Add MSan annotations
selftests/bpf: Add MSan annotations
samples/bpf/test_map_in_map_user.c | 2 +- samples/bpf/xdp1_user.c | 2 +- samples/bpf/xdp_adjust_tail_user.c | 2 +- samples/bpf/xdp_fwd_user.c | 4 +- samples/bpf/xdp_redirect_cpu_user.c | 4 +- samples/bpf/xdp_rxq_info_user.c | 2 +- samples/bpf/xdp_sample_pkts_user.c | 2 +- samples/bpf/xdp_tx_iptunnel_user.c | 2 +- tools/bpf/bpftool/btf.c | 13 +- tools/bpf/bpftool/btf_dumper.c | 4 +- tools/bpf/bpftool/cgroup.c | 4 +- tools/bpf/bpftool/common.c | 13 +- tools/bpf/bpftool/link.c | 4 +- tools/bpf/bpftool/main.h | 3 +- tools/bpf/bpftool/map.c | 8 +- tools/bpf/bpftool/prog.c | 24 +-- tools/bpf/bpftool/struct_ops.c | 6 +- tools/bpf/runqslower/Makefile | 2 + tools/lib/bpf/bpf.c | 179 +++++++++++++++++- tools/lib/bpf/bpf.h | 13 ++ tools/lib/bpf/btf.c | 9 +- tools/lib/bpf/libbpf.c | 26 +-- tools/lib/bpf/libbpf.map | 5 + tools/lib/bpf/libbpf_internal.h | 46 +++++ tools/lib/bpf/netlink.c | 2 +- tools/lib/bpf/nlattr.c | 2 +- tools/lib/bpf/ringbuf.c | 4 +- tools/perf/util/bpf-utils.c | 4 +- tools/perf/util/bpf_counter.c | 2 +- tools/perf/util/bpf_counter.h | 6 +- tools/testing/selftests/bpf/Makefile | 17 +- .../bpf/map_tests/map_in_map_batch_ops.c | 2 +- .../selftests/bpf/prog_tests/attach_probe.c | 10 +- .../selftests/bpf/prog_tests/bpf_iter.c | 8 +- .../selftests/bpf/prog_tests/bpf_obj_id.c | 20 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 3 + tools/testing/selftests/bpf/prog_tests/btf.c | 24 +-- .../selftests/bpf/prog_tests/btf_map_in_map.c | 2 +- .../selftests/bpf/prog_tests/check_mtu.c | 2 +- .../selftests/bpf/prog_tests/enable_stats.c | 2 +- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 14 +- .../bpf/prog_tests/flow_dissector_reattach.c | 10 +- .../bpf/prog_tests/libbpf_get_fd_by_id_opts.c | 4 +- .../selftests/bpf/prog_tests/lsm_cgroup.c | 3 +- .../selftests/bpf/prog_tests/metadata.c | 8 +- tools/testing/selftests/bpf/prog_tests/mmap.c | 2 +- .../selftests/bpf/prog_tests/perf_link.c | 2 +- .../selftests/bpf/prog_tests/pinning.c | 2 +- .../selftests/bpf/prog_tests/prog_run_opts.c | 2 +- .../selftests/bpf/prog_tests/recursion.c | 4 +- .../selftests/bpf/prog_tests/send_signal.c | 2 + .../selftests/bpf/prog_tests/sockmap_basic.c | 6 +- .../bpf/prog_tests/task_local_storage.c | 8 +- .../testing/selftests/bpf/prog_tests/tc_bpf.c | 4 +- .../bpf/prog_tests/tp_attach_query.c | 9 +- .../bpf/prog_tests/unpriv_bpf_disabled.c | 8 +- .../bpf/prog_tests/uprobe_autoattach.c | 14 +- .../selftests/bpf/prog_tests/verif_stats.c | 5 +- .../selftests/bpf/prog_tests/xdp_attach.c | 4 +- .../selftests/bpf/prog_tests/xdp_bonding.c | 3 + .../bpf/prog_tests/xdp_cpumap_attach.c | 8 +- .../bpf/prog_tests/xdp_devmap_attach.c | 8 +- .../selftests/bpf/prog_tests/xdp_info.c | 2 +- .../selftests/bpf/prog_tests/xdp_link.c | 10 +- .../selftests/bpf/progs/test_attach_probe.c | 11 +- .../bpf/progs/test_uprobe_autoattach.c | 16 +- tools/testing/selftests/bpf/test_maps.c | 2 +- .../selftests/bpf/test_skb_cgroup_id_user.c | 2 +- .../bpf/test_tcp_check_syncookie_user.c | 2 +- tools/testing/selftests/bpf/test_verifier.c | 8 +- tools/testing/selftests/bpf/testing_helpers.c | 2 +- tools/testing/selftests/bpf/xdp_synproxy.c | 15 +- 72 files changed, 478 insertions(+), 211 deletions(-)
Signature · 1 line
2.39.1
PATCH v2 4/16 selftests/bpf: Forward SAN_CFLAGS and SAN_LDFLAGS to runqslower and libbpf
To get useful results from the Memory Sanitizer, all code running in a process needs to be instrumented. When building tests with other sanitizers, it's not strictly necessary, but is also helpful. So make sure runqslower and libbpf are compiled with SAN_CFLAGS and linked with SAN_LDFLAGS.
--- tools/testing/selftests/bpf/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/Makefile +5 -2
@@ -213,7 +213,9 @@ $(OUTPUT)/runqslower: $(BPFOBJ) | $(DEFAULT_BPFTOOL) $(RUNQSLOWER_OUTPUT) OUTPUT=$(RUNQSLOWER_OUTPUT) VMLINUX_BTF=$(VMLINUX_BTF) \ BPFTOOL_OUTPUT=$(HOST_BUILD_DIR)/bpftool/ \ BPFOBJ_OUTPUT=$(BUILD_DIR)/libbpf \ - BPFOBJ=$(BPFOBJ) BPF_INCLUDE=$(INCLUDE_DIR) && \ + BPFOBJ=$(BPFOBJ) BPF_INCLUDE=$(INCLUDE_DIR) \ + EXTRA_CFLAGS='-g -O0 $(SAN_CFLAGS)' \ + EXTRA_LDFLAGS='$(SAN_LDFLAGS)' && \ cp $(RUNQSLOWER_OUTPUT)runqslower $@ TEST_GEN_PROGS_EXTENDED += $(DEFAULT_BPFTOOL)
@@ -270,7 +272,8 @@ $(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ $(APIDIR)/linux/bpf.h \ | $(BUILD_DIR)/libbpf $(Q)$(MAKE) $(submake_extras) -C $(BPFDIR) OUTPUT=$(BUILD_DIR)/libbpf/ \ - EXTRA_CFLAGS='-g -O0' \ + EXTRA_CFLAGS='-g -O0 $(SAN_CFLAGS)' \ + EXTRA_LDFLAGS='$(SAN_LDFLAGS)' \ DESTDIR=$(SCRATCH_DIR) prefix= all install_headers ifneq ($(BPFOBJ),$(HOST_BPFOBJ))
Signature · 1 line
2.39.1
PATCH v2 5/16 selftests/bpf: Attach to fopen()/fclose() in uprobe_autoattach
In reply to Ilya Leoshkevichmalloc() and free() may be completely replaced by sanitizers, use fopen() and fclose() instead.
--- .../selftests/bpf/prog_tests/uprobe_autoattach.c | 14 ++++++++------ .../selftests/bpf/progs/test_uprobe_autoattach.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-)
tools/testing/selftests/bpf/prog_tests/uprobe_autoattach.c +8 -6
@@ -16,10 +16,10 @@ static noinline int autoattach_trigger_func(int arg1, int arg2, int arg3,void test_uprobe_autoattach (void ) { +const char *devnull_str ="/dev/null" ;struct test_uprobe_autoattach *skel;int trigger_ret; -size_t malloc_sz =1 ; -char *mem; +FILE *devnull; skel =test_uprobe_autoattach__open_and_load ();if (!ASSERT_OK_PTR (skel,"skel_open" ))
@@ -36,16 +36,18 @@ void test_uprobe_autoattach(void) skel->bss->test_pid =getpid ();/* trigger & validate shared library u[ret]probes attached by name */ - mem =malloc (malloc_sz); + devnull =fopen (devnull_str,"r" );ASSERT_EQ (skel->bss->uprobe_byname_parm1,1 ,"check_uprobe_byname_parm1" );ASSERT_EQ (skel->bss->uprobe_byname_ran,1 ,"check_uprobe_byname_ran" );ASSERT_EQ (skel->bss->uretprobe_byname_rc, trigger_ret,"check_uretprobe_byname_rc" );ASSERT_EQ (skel->bss->uretprobe_byname_ret, trigger_ret,"check_uretprobe_byname_ret" );ASSERT_EQ (skel->bss->uretprobe_byname_ran,2 ,"check_uretprobe_byname_ran" ); -ASSERT_EQ (skel->bss->uprobe_byname2_parm1, malloc_sz,"check_uprobe_byname2_parm1" ); +ASSERT_EQ (skel->bss->uprobe_byname2_parm1, (__u64 )(long )devnull_str, +"check_uprobe_byname2_parm1" );ASSERT_EQ (skel->bss->uprobe_byname2_ran,3 ,"check_uprobe_byname2_ran" ); -ASSERT_EQ (skel->bss->uretprobe_byname2_rc, mem,"check_uretprobe_byname2_rc" ); +ASSERT_EQ (skel->bss->uretprobe_byname2_rc, (__u64 )(long )devnull, +"check_uretprobe_byname2_rc" );ASSERT_EQ (skel->bss->uretprobe_byname2_ran,4 ,"check_uretprobe_byname2_ran" );ASSERT_EQ (skel->bss->a[0 ],1 ,"arg1" );
@@ -67,7 +69,7 @@ void test_uprobe_autoattach(void)ASSERT_EQ (skel->bss->a[7 ],8 ,"arg8" );#endif -free (mem); +fclose (devnull); cleanup:test_uprobe_autoattach__destroy (skel); }
tools/testing/selftests/bpf/progs/test_uprobe_autoattach.c +8 -8
@@ -13,9 +13,9 @@ int uprobe_byname_ran = 0;int uretprobe_byname_rc =0 ;int uretprobe_byname_ret =0 ;int uretprobe_byname_ran =0 ; -size_t uprobe_byname2_parm1 =0 ; +u64 uprobe_byname2_parm1 =0 ;int uprobe_byname2_ran =0 ; -char *uretprobe_byname2_rc =NULL ; +u64 uretprobe_byname2_rc =0 ;int uretprobe_byname2_ran =0 ;int test_pid;
@@ -88,28 +88,28 @@ int BPF_URETPROBE(handle_uretprobe_byname, int ret) } -SEC("uprobe/libc.so.6:malloc") -int handle_uprobe_byname2 (struct pt_regs *ctx) +SEC("uprobe/libc.so.6:fopen") +int BPF_UPROBE (handle_uprobe_byname2 ,const char *pathname,const char *mode) {int pid =bpf_get_current_pid_tgid () >>32 ;/* ignore irrelevant invocations */ if (test_pid != pid)return 0 ; - uprobe_byname2_parm1 =PT_REGS_PARM1_CORE (ctx); + uprobe_byname2_parm1 = (u64 )(long )pathname; uprobe_byname2_ran =3 ;return 0 ; } -SEC("uretprobe/libc.so.6:malloc") -int handle_uretprobe_byname2 (struct pt_regs *ctx) +SEC("uretprobe/libc.so.6:fopen") +int BPF_URETPROBE (handle_uretprobe_byname2 ,void *ret) {int pid =bpf_get_current_pid_tgid () >>32 ;/* ignore irrelevant invocations */ if (test_pid != pid)return 0 ; - uretprobe_byname2_rc = (char *)PT_REGS_RC_CORE (ctx); + uretprobe_byname2_rc = (u64 )(long )ret; uretprobe_byname2_ran =4 ;return 0 ; }
Signature · 1 line
2.39.1
PATCH v2 6/16 selftests/bpf: Attach to fopen()/fclose() in attach_probe
In reply to Ilya Leoshkevichmalloc() and free() may be completely replaced by sanitizers, use fopen() and fclose() instead.
--- tools/testing/selftests/bpf/prog_tests/attach_probe.c | 10 +++++----- tools/testing/selftests/bpf/progs/test_attach_probe.c | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-)
tools/testing/selftests/bpf/prog_tests/attach_probe.c +5 -5
@@ -33,8 +33,8 @@ void test_attach_probe(void)struct test_attach_probe * skel;ssize_t uprobe_offset, ref_ctr_offset;struct bpf_link *uprobe_err_link; +FILE *devnull;bool legacy; -char *mem;/* Check if new-style kprobe/uprobe API is supported. * Kernels that support new FD-based kprobe and uprobe BPF attachment
@@ -147,7 +147,7 @@ void test_attach_probe(void)/* test attach by name for a library function, using the library * as the binary argument. libc.so.6 will be resolved via dlopen()/dlinfo(). */ - uprobe_opts.func_name ="malloc" ; + uprobe_opts.func_name ="fopen" ; uprobe_opts.retprobe = false; skel->links.handle_uprobe_byname2 = bpf_program__attach_uprobe_opts(skel->progs.handle_uprobe_byname2,
@@ -157,7 +157,7 @@ void test_attach_probe(void)if (!ASSERT_OK_PTR (skel->links.handle_uprobe_byname2,"attach_uprobe_byname2" )) goto cleanup; - uprobe_opts.func_name ="free" ; + uprobe_opts.func_name ="fclose" ; uprobe_opts.retprobe = true; skel->links.handle_uretprobe_byname2 = bpf_program__attach_uprobe_opts(skel->progs.handle_uretprobe_byname2,
@@ -195,8 +195,8 @@ void test_attach_probe(void)usleep (1 );/* trigger & validate shared library u[ret]probes attached by name */ - mem =malloc (1 ); -free (mem); + devnull =fopen ("/dev/null" ,"r" ); +fclose (devnull);/* trigger & validate uprobe & uretprobe */ trigger_func ();
tools/testing/selftests/bpf/progs/test_attach_probe.c +6 -5
@@ -92,18 +92,19 @@ int handle_uretprobe_byname(struct pt_regs *ctx) } SEC("uprobe") -int handle_uprobe_byname2 (struct pt_regs *ctx) +int BPF_UPROBE (handle_uprobe_byname2 ,const char *pathname,const char *mode) { -unsigned int size =PT_REGS_PARM1 (ctx); +char mode_buf[2 ] = {}; -/* verify malloc size */ -if (size ==1 ) +/* verify fopen mode */ +bpf_probe_read_user (mode_buf,sizeof (mode_buf), mode); +if (mode_buf[0 ] =='r' && mode_buf[1 ] ==0 ) uprobe_byname2_res =7 ;return 0 ; } SEC("uretprobe") -int handle_uretprobe_byname2 (struct pt_regs *ctx) +int BPF_URETPROBE (handle_uretprobe_byname2 ,void *ret) { uretprobe_byname2_res =8 ;return 0 ;
Signature · 1 line
2.39.1
PATCH v2 7/16 libbpf: Fix alen calculation in libbpf_nla_dump_errormsg()
In reply to Ilya LeoshkevichThe code assumes that everything that comes after nlmsgerr are nlattrs. When calculating their size, it does not account for the initial nlmsghdr. This may lead to accessing uninitialized memory.
--- tools/lib/bpf/nlattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/nlattr.c +1 -1
@@ -178,7 +178,7 @@ int libbpf_nla_dump_errormsg(struct nlmsghdr *nlh) hlen +=nlmsg_len (&err->msg); attr = (struct nlattr *) ((void *) err + hlen); - alen = nlh->nlmsg_len - hlen; + alen = (void *)nlh + nlh->nlmsg_len - (void *)attr;if (libbpf_nla_parse (tb,NLMSGERR_ATTR_MAX , attr, alen, extack_policy) !=0 ) {
Signature · 1 line
2.39.1
PATCH v2 8/16 libbpf: Introduce bpf_{btf,link,map,prog}_get_info_by_fd()
In reply to Ilya LeoshkevichThese are type-safe wrappers around bpf_obj_get_info_by_fd(). They found one problem in selftests, and are also useful for adding Memory Sanitizer annotations.
--- tools/lib/bpf/bpf.c | 24 ++++++++++++++++++++++++ tools/lib/bpf/bpf.h | 13 +++++++++++++ tools/lib/bpf/libbpf.map | 5 +++++ 3 files changed, 42 insertions(+)
tools/lib/bpf/bpf.c +24 -0
@@ -1044,6 +1044,30 @@ int bpf_obj_get_info_by_fd(int bpf_fd, void *info, __u32 *info_len)return libbpf_err_errno (err); } +int bpf_prog_get_info_by_fd (int prog_fd,struct bpf_prog_info *info, +__u32 *info_len) +{ +return bpf_obj_get_info_by_fd (prog_fd, info, info_len); +} + +int bpf_map_get_info_by_fd (int map_fd,struct bpf_map_info *info, +__u32 *info_len) +{ +return bpf_obj_get_info_by_fd (map_fd, info, info_len); +} + +int bpf_btf_get_info_by_fd (int btf_fd,struct bpf_btf_info *info, +__u32 *info_len) +{ +return bpf_obj_get_info_by_fd (btf_fd, info, info_len); +} + +int bpf_link_get_info_by_fd (int link_fd,struct bpf_link_info *info, +__u32 *info_len) +{ +return bpf_obj_get_info_by_fd (link_fd, info, info_len); +} +int bpf_raw_tracepoint_open (const char *name,int prog_fd) { const size_t attr_sz = offsetofend(union bpf_attr, raw_tracepoint);
tools/lib/bpf/bpf.h +13 -0
@@ -386,6 +386,19 @@ LIBBPF_API int bpf_link_get_fd_by_id(__u32 id); LIBBPF_API int bpf_link_get_fd_by_id_opts(__u32 id,const struct bpf_get_fd_by_id_opts *opts); LIBBPF_API int bpf_obj_get_info_by_fd(int bpf_fd, void *info, __u32 *info_len); +/* Type-safe variants of bpf_obj_get_info_by_fd(). The callers still needs to +* pass info_len, which should normally be +* sizeof(struct bpf_{prog,map,btf,link}_info), in order to be compatible with +* different libbpf and kernel versions. +*/ +LIBBPF_API int bpf_prog_get_info_by_fd(int prog_fd, struct bpf_prog_info *info, +__u32 *info_len); +LIBBPF_API int bpf_map_get_info_by_fd(int map_fd, struct bpf_map_info *info, +__u32 *info_len); +LIBBPF_API int bpf_btf_get_info_by_fd(int btf_fd, struct bpf_btf_info *info, +__u32 *info_len); +LIBBPF_API int bpf_link_get_info_by_fd(int link_fd, struct bpf_link_info *info, +__u32 *info_len);struct bpf_prog_query_opts {size_t sz;/* size of this struct for forward/backward compatibility */
tools/lib/bpf/libbpf.map +5 -0
@@ -384,4 +384,9 @@ LIBBPF_1.1.0 { } LIBBPF_1.0.0; LIBBPF_1.2.0 { + global: + bpf_btf_get_info_by_fd; + bpf_link_get_info_by_fd; + bpf_map_get_info_by_fd; + bpf_prog_get_info_by_fd; } LIBBPF_1.1.0;
Signature · 1 line
2.39.1
PATCH v2 11/16 perf: Use bpf_{btf,link,map,prog}_get_info_by_fd()
In reply to Ilya LeoshkevichUse the new type-safe wrappers around bpf_obj_get_info_by_fd().
--- tools/perf/util/bpf-utils.c | 4 ++-- tools/perf/util/bpf_counter.c | 2 +- tools/perf/util/bpf_counter.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
tools/perf/util/bpf-utils.c +2 -2
@@ -121,7 +121,7 @@ get_bpf_prog_info_linear(int fd, __u64 arrays)return ERR_PTR (-EINVAL );/* step 1: get array dimensions */ - err =bpf_obj_get_info_by_fd (fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (fd, &info, &info_len);if (err) {pr_debug ("can't get prog info: %s" ,strerror (errno));return ERR_PTR (-EFAULT );
@@ -183,7 +183,7 @@ get_bpf_prog_info_linear(int fd, __u64 arrays) }/* step 5: call syscall again to get required arrays */ - err =bpf_obj_get_info_by_fd (fd, &info_linear->info, &info_len); + err =bpf_prog_get_info_by_fd (fd, &info_linear->info, &info_len);if (err) {pr_debug ("can't get prog info: %s" ,strerror (errno));free (info_linear);
tools/perf/util/bpf_counter.c +1 -1
@@ -304,7 +304,7 @@ static bool bperf_attr_map_compatible(int attr_map_fd)__u32 map_info_len =sizeof (map_info);int err; - err =bpf_obj_get_info_by_fd (attr_map_fd, &map_info, &map_info_len); + err =bpf_map_get_info_by_fd (attr_map_fd, &map_info, &map_info_len);if (err)return false;
tools/perf/util/bpf_counter.h +3 -3
@@ -97,7 +97,7 @@ static inline __u32 bpf_link_get_id(int fd)struct bpf_link_info link_info = { .id =0 , };__u32 link_info_len =sizeof (link_info); -bpf_obj_get_info_by_fd (fd, &link_info, &link_info_len); +bpf_link_get_info_by_fd (fd, &link_info, &link_info_len);return link_info.id; }
@@ -106,7 +106,7 @@ static inline __u32 bpf_link_get_prog_id(int fd)struct bpf_link_info link_info = { .id =0 , };__u32 link_info_len =sizeof (link_info); -bpf_obj_get_info_by_fd (fd, &link_info, &link_info_len); +bpf_link_get_info_by_fd (fd, &link_info, &link_info_len);return link_info.prog_id; }
@@ -115,7 +115,7 @@ static inline __u32 bpf_map_get_id(int fd)struct bpf_map_info map_info = { .id =0 , };__u32 map_info_len =sizeof (map_info); -bpf_obj_get_info_by_fd (fd, &map_info, &map_info_len); +bpf_map_get_info_by_fd (fd, &map_info, &map_info_len);return map_info.id; }
Signature · 1 line
2.39.1
PATCH v2 9/16 libbpf: Use bpf_{btf,link,map,prog}_get_info_by_fd()
In reply to Ilya LeoshkevichUse the new type-safe wrappers around bpf_obj_get_info_by_fd().
--- tools/lib/bpf/btf.c | 8 ++++---- tools/lib/bpf/libbpf.c | 14 +++++++------- tools/lib/bpf/netlink.c | 2 +- tools/lib/bpf/ringbuf.c | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-)
tools/lib/bpf/btf.c +4 -4
@@ -1350,9 +1350,9 @@ struct btf *btf_get_from_fd(int btf_fd, struct btf *base_btf)void *ptr;int err; -/* we won't know btf_size until we call bpf_obj_get_info_by_fd(). so +/* we won't know btf_size until we call bpf_btf_get_info_by_fd(). so * let's start with a sane default - 4KiB here - and resize it only if -* bpf_obj_get_info_by_fd() needs a bigger buffer. +* bpf_btf_get_info_by_fd() needs a bigger buffer. */ last_size =4096 ; ptr =malloc (last_size);
@@ -1362,7 +1362,7 @@ struct btf *btf_get_from_fd(int btf_fd, struct btf *base_btf)memset (&btf_info,0 ,sizeof (btf_info)); btf_info.btf =ptr_to_u64 (ptr); btf_info.btf_size = last_size; - err =bpf_obj_get_info_by_fd (btf_fd, &btf_info, &len); + err =bpf_btf_get_info_by_fd (btf_fd, &btf_info, &len);if (!err && btf_info.btf_size > last_size) {void *temp_ptr;
@@ -1380,7 +1380,7 @@ struct btf *btf_get_from_fd(int btf_fd, struct btf *base_btf) btf_info.btf =ptr_to_u64 (ptr); btf_info.btf_size = last_size; - err =bpf_obj_get_info_by_fd (btf_fd, &btf_info, &len); + err =bpf_btf_get_info_by_fd (btf_fd, &btf_info, &len); }if (err || btf_info.btf_size > last_size) {
tools/lib/bpf/libbpf.c +7 -7
@@ -4345,7 +4345,7 @@ int bpf_map__reuse_fd(struct bpf_map *map, int fd)char *new_name;memset (&info,0 , len); - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_map_get_info_by_fd (fd, &info, &len);if (err && errno ==EINVAL ) err =bpf_get_map_info_from_fdinfo (fd, &info);if (err)
@@ -4729,7 +4729,7 @@ static int probe_module_btf(void)* kernel's module BTF support coincides with support for * name/name_len fields in struct bpf_btf_info. */ - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_btf_get_info_by_fd (fd, &info, &len);close (fd);return !err; }
@@ -4892,7 +4892,7 @@ static bool map_is_reuse_compat(const struct bpf_map *map, int map_fd)int err;memset (&map_info,0 , map_info_len); - err =bpf_obj_get_info_by_fd (map_fd, &map_info, &map_info_len); + err =bpf_map_get_info_by_fd (map_fd, &map_info, &map_info_len);if (err && errno ==EINVAL ) err =bpf_get_map_info_from_fdinfo (map_fd, &map_info);if (err) {
@@ -5437,7 +5437,7 @@ static int load_module_btfs(struct bpf_object *obj) info.name =ptr_to_u64 (name); info.name_len =sizeof (name); - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_btf_get_info_by_fd (fd, &info, &len);if (err) { err = -errno;pr_warn ("failed to get BTF object #%d info: %d\n" , id, err);
@@ -9030,9 +9030,9 @@ static int libbpf_find_prog_btf_id(const char *name, __u32 attach_prog_fd)int err;memset (&info,0 , info_len); - err =bpf_obj_get_info_by_fd (attach_prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (attach_prog_fd, &info, &info_len);if (err) { -pr_warn ("failed bpf_obj_get_info_by_fd for FD %d: %d\n" , +pr_warn ("failed bpf_prog_get_info_by_fd for FD %d: %d\n" , attach_prog_fd, err);return err; }
@@ -11741,7 +11741,7 @@ static struct perf_buffer *__perf_buffer__new(int map_fd, size_t page_cnt,/* best-effort sanity checks */ memset (&map,0 ,sizeof (map)); map_info_len =sizeof (map); - err =bpf_obj_get_info_by_fd (map_fd, &map, &map_info_len); + err =bpf_map_get_info_by_fd (map_fd, &map, &map_info_len);if (err) { err = -errno;/* if BPF_OBJ_GET_INFO_BY_FD is supported, will return
tools/lib/bpf/netlink.c +1 -1
@@ -689,7 +689,7 @@ static int tc_add_fd_and_name(struct libbpf_nla_req *req, int fd)int len, ret;memset (&info,0 , info_len); - ret =bpf_obj_get_info_by_fd (fd, &info, &info_len); + ret =bpf_prog_get_info_by_fd (fd, &info, &info_len);if (ret <0 )return ret;
tools/lib/bpf/ringbuf.c +2 -2
@@ -83,7 +83,7 @@ int ring_buffer__add(struct ring_buffer *rb, int map_fd,memset (&info,0 ,sizeof (info)); - err =bpf_obj_get_info_by_fd (map_fd, &info, &len); + err =bpf_map_get_info_by_fd (map_fd, &info, &len);if (err) { err = -errno; pr_warn("ringbuf: failed to get map info for fd=%d: %d\n",
@@ -359,7 +359,7 @@ static int user_ringbuf_map(struct user_ring_buffer *rb, int map_fd)memset (&info,0 ,sizeof (info)); - err =bpf_obj_get_info_by_fd (map_fd, &info, &len); + err =bpf_map_get_info_by_fd (map_fd, &info, &len);if (err) { err = -errno;pr_warn ("user ringbuf: failed to get map info for fd=%d: %d\n" , map_fd, err);
Signature · 1 line
2.39.1
PATCH v2 12/16 samples/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd()
In reply to Ilya LeoshkevichUse the new type-safe wrappers around bpf_obj_get_info_by_fd().
--- samples/bpf/test_map_in_map_user.c | 2 +- samples/bpf/xdp1_user.c | 2 +- samples/bpf/xdp_adjust_tail_user.c | 2 +- samples/bpf/xdp_fwd_user.c | 4 ++-- samples/bpf/xdp_redirect_cpu_user.c | 4 ++-- samples/bpf/xdp_rxq_info_user.c | 2 +- samples/bpf/xdp_sample_pkts_user.c | 2 +- samples/bpf/xdp_tx_iptunnel_user.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-)
samples/bpf/test_map_in_map_user.c +1 -1
@@ -38,7 +38,7 @@ static void check_map_id(int inner_map_fd, int map_in_map_fd, uint32_t key)uint32_t info_len =sizeof (info);int ret, id; - ret =bpf_obj_get_info_by_fd (inner_map_fd, &info, &info_len); + ret =bpf_map_get_info_by_fd (inner_map_fd, &info, &info_len);assert (!ret); ret =bpf_map_lookup_elem (map_in_map_fd, &key, &id);
samples/bpf/xdp1_user.c +1 -1
@@ -153,7 +153,7 @@ int main(int argc, char **argv)return 1 ; } - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (err) {printf ("can't get prog info - %s\n" ,strerror (errno));return err;
samples/bpf/xdp_adjust_tail_user.c +1 -1
@@ -184,7 +184,7 @@ int main(int argc, char **argv)return 1 ; } - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (err) {printf ("can't get prog info - %s\n" ,strerror (errno));return 1 ;
samples/bpf/xdp_fwd_user.c +2 -2
@@ -76,9 +76,9 @@ static int do_detach(int ifindex, const char *ifname, const char *app_name)return prog_fd; } - err =bpf_obj_get_info_by_fd (prog_fd, &prog_info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &prog_info, &info_len);if (err) { -printf ("ERROR: bpf_obj_get_info_by_fd failed (%s)\n" , +printf ("ERROR: bpf_prog_get_info_by_fd failed (%s)\n" ,strerror (errno)); goto close_out; }
samples/bpf/xdp_redirect_cpu_user.c +2 -2
@@ -494,9 +494,9 @@ int main(int argc, char **argv) goto end_cpu; } - ret =bpf_obj_get_info_by_fd (bpf_map__fd (skel->maps.cpu_map), &info, &infosz); + ret =bpf_map_get_info_by_fd (bpf_map__fd (skel->maps.cpu_map), &info, &infosz);if (ret <0 ) { -fprintf (stderr,"Failed bpf_obj_get_info_by_fd for cpumap: %s\n" , +fprintf (stderr,"Failed bpf_map_get_info_by_fd for cpumap: %s\n" ,strerror (errno)); goto end_cpu; }
samples/bpf/xdp_rxq_info_user.c +1 -1
@@ -602,7 +602,7 @@ int main(int argc, char **argv)return EXIT_FAIL_XDP ; } - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (err) {printf ("can't get prog info - %s\n" ,strerror (errno));return err;
samples/bpf/xdp_sample_pkts_user.c +1 -1
@@ -35,7 +35,7 @@ static int do_attach(int idx, int fd, const char *name)return err; } - err =bpf_obj_get_info_by_fd (fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (fd, &info, &info_len);if (err) {printf ("can't get prog info - %s\n" ,strerror (errno));return err;
samples/bpf/xdp_tx_iptunnel_user.c +1 -1
@@ -295,7 +295,7 @@ int main(int argc, char **argv)return 1 ; } - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (err) {printf ("can't get prog info - %s\n" ,strerror (errno));return err;
Signature · 1 line
2.39.1
PATCH v2 15/16 libbpf: Add MSan annotations
In reply to Ilya LeoshkevichMSan runs into a few false positives in libbpf. They all come from the fact that MSan does not know anything about the bpf syscall, particularly, what it writes to.
Add __libbpf_mark_mem_written() function to mark memory modified by the bpf syscall, and a few convenience wrappers. Use the abstract name (it could be e.g. libbpf_msan_unpoison()), because it can be used for Valgrind in the future as well.
--- tools/lib/bpf/bpf.c | 161 ++++++++++++++++++++++++++++++-- tools/lib/bpf/btf.c | 1 + tools/lib/bpf/libbpf.c | 1 + tools/lib/bpf/libbpf_internal.h | 38 ++++++++ 4 files changed, 194 insertions(+), 7 deletions(-)
tools/lib/bpf/bpf.c +154 -7
@@ -69,6 +69,11 @@ static inline __u64 ptr_to_u64(const void *ptr)return (__u64 ) (unsigned long ) ptr; } +static inline void *u64_to_ptr (__u64 val) +{ +return (void *) (unsigned long ) val; +} +static inline int sys_bpf (enum bpf_cmd cmd,union bpf_attr *attr,unsigned int size) {
@@ -92,6 +97,8 @@ int sys_bpf_prog_load(union bpf_attr *attr, unsigned int size, int attempts) fd =sys_bpf_fd (BPF_PROG_LOAD , attr, size); }while (fd <0 && errno ==EAGAIN && --attempts >0 ); +libbpf_mark_mem_written (u64_to_ptr (attr->log_buf), attr->log_size); +return fd; }
@@ -395,6 +402,26 @@ int bpf_map_update_elem(int fd, const void *key, const void *value,return libbpf_err_errno (ret); } +/* Tell memory checkers that the given value of the given map is initialized. */ +static void libbpf_mark_map_value_written (int fd,void *value) +{ +#ifdef HAVE_LIBBPF_MARK_MEM_WRITTEN +struct bpf_map_info info; +__u32 info_len; +size_t size; +int err; + + info_len =sizeof (info); + err =bpf_map_get_info_by_fd (fd, &info, &info_len); +if (!err) { + size = info.value_size; +if (is_percpu_bpf_map_type (info.type)) + size =roundup (size,8 ) *libbpf_num_possible_cpus (); +libbpf_mark_mem_written (value, size); + } +#endif +} +int bpf_map_lookup_elem (int fd,const void *key,void *value) { const size_t attr_sz = offsetofend(union bpf_attr, flags);
@@ -407,6 +434,8 @@ int bpf_map_lookup_elem(int fd, const void *key, void *value) attr.value =ptr_to_u64 (value); ret =sys_bpf (BPF_MAP_LOOKUP_ELEM , &attr, attr_sz); +if (!ret) +libbpf_mark_map_value_written (fd, value);return libbpf_err_errno (ret); }
@@ -423,6 +452,8 @@ int bpf_map_lookup_elem_flags(int fd, const void *key, void *value, __u64 flags) attr.flags = flags; ret =sys_bpf (BPF_MAP_LOOKUP_ELEM , &attr, attr_sz); +if (!ret) +libbpf_mark_map_value_written (fd, value);return libbpf_err_errno (ret); }
@@ -438,6 +469,8 @@ int bpf_map_lookup_and_delete_elem(int fd, const void *key, void *value) attr.value =ptr_to_u64 (value); ret =sys_bpf (BPF_MAP_LOOKUP_AND_DELETE_ELEM , &attr, attr_sz); +if (!ret) +libbpf_mark_map_value_written (fd, value);return libbpf_err_errno (ret); }
@@ -454,6 +487,8 @@ int bpf_map_lookup_and_delete_elem_flags(int fd, const void *key, void *value, _ attr.flags = flags; ret =sys_bpf (BPF_MAP_LOOKUP_AND_DELETE_ELEM , &attr, attr_sz); +if (!ret) +libbpf_mark_map_value_written (fd, value);return libbpf_err_errno (ret); }
@@ -823,10 +858,12 @@ int bpf_prog_query_opts(int target_fd, { const size_t attr_sz = offsetofend(union bpf_attr, query);union bpf_attr attr; +__u32 *prog_ids;int ret;if (!OPTS_VALID (opts, bpf_prog_query_opts))return libbpf_err (-EINVAL ); + prog_ids =OPTS_GET (opts, prog_ids,NULL );memset (&attr,0 , attr_sz);
@@ -834,11 +871,15 @@ int bpf_prog_query_opts(int target_fd, attr.query.attach_type = type; attr.query.query_flags =OPTS_GET (opts, query_flags,0 ); attr.query.prog_cnt =OPTS_GET (opts, prog_cnt,0 ); - attr.query.prog_ids =ptr_to_u64 (OPTS_GET (opts, prog_ids,NULL )); + attr.query.prog_ids =ptr_to_u64 (prog_ids); attr.query.prog_attach_flags =ptr_to_u64 (OPTS_GET (opts, prog_attach_flags,NULL )); ret =sys_bpf (BPF_PROG_QUERY , &attr, attr_sz); +libbpf_mark_mem_written_if (prog_ids, + attr.query.prog_cnt *sizeof (*prog_ids), + !ret); +OPTS_SET (opts, attach_flags, attr.query.attach_flags);OPTS_SET (opts, prog_cnt, attr.query.prog_cnt);
@@ -868,10 +909,14 @@ int bpf_prog_test_run_opts(int prog_fd, struct bpf_test_run_opts *opts) { const size_t attr_sz = offsetofend(union bpf_attr, test);union bpf_attr attr; +void *data_out; +void *ctx_out;int ret;if (!OPTS_VALID (opts, bpf_test_run_opts))return libbpf_err (-EINVAL ); + data_out =OPTS_GET (opts, data_out,NULL ); + ctx_out =OPTS_GET (opts, ctx_out,NULL );memset (&attr,0 , attr_sz); attr.test.prog_fd = prog_fd;
@@ -885,12 +930,15 @@ int bpf_prog_test_run_opts(int prog_fd, struct bpf_test_run_opts *opts) attr.test.data_size_in =OPTS_GET (opts, data_size_in,0 ); attr.test.data_size_out =OPTS_GET (opts, data_size_out,0 ); attr.test.ctx_in =ptr_to_u64 (OPTS_GET (opts, ctx_in,NULL )); - attr.test.ctx_out =ptr_to_u64 (OPTS_GET (opts, ctx_out,NULL )); + attr.test.ctx_out =ptr_to_u64 (ctx_out); attr.test.data_in =ptr_to_u64 (OPTS_GET (opts, data_in,NULL )); - attr.test.data_out =ptr_to_u64 (OPTS_GET (opts, data_out,NULL )); + attr.test.data_out =ptr_to_u64 (data_out); ret =sys_bpf (BPF_PROG_TEST_RUN , &attr, attr_sz); +libbpf_mark_mem_written_if (data_out, attr.test.data_size_out, !ret); +libbpf_mark_mem_written_if (ctx_out, attr.test.ctx_size_out, !ret); +OPTS_SET (opts, data_size_out, attr.test.data_size_out);OPTS_SET (opts, ctx_size_out, attr.test.ctx_size_out);OPTS_SET (opts, duration, attr.test.duration);
@@ -1039,15 +1087,100 @@ int bpf_obj_get_info_by_fd(int bpf_fd, void *info, __u32 *info_len) attr.info.info =ptr_to_u64 (info); err =sys_bpf (BPF_OBJ_GET_INFO_BY_FD , &attr, attr_sz); -if (!err) +if (!err) { *info_len = attr.info.info_len; +libbpf_mark_mem_written (info, attr.info.info_len); + }return libbpf_err_errno (err); } +/* Helper macros for telling memory checkers that an array pointed to by +* a struct bpf_{btf,link,map,prog}_info member is initialized. Before doing +* that, they make sure that kernel has provided the respective member. +*/ + +/* Handle arrays with a certain element size. */ +#define __MARK_INFO_ARRAY_WRITTEN (ptr, nr, elem_size) do { \ + if (info_len >= offsetofend(typeof(*info), ptr) && \ + info_len >= offsetofend(typeof(*info), nr) && \ + info->ptr) \ + libbpf_mark_mem_written(u64_to_ptr(info->ptr), \ + info->nr * elem_size); \ +} while (0) + +/* Handle arrays with a certain element type. */ +#define MARK_INFO_ARRAY_WRITTEN (ptr, nr, type) \ + __MARK_INFO_ARRAY_WRITTEN(ptr, nr, sizeof(type)) + +/* Handle arrays with element size defined by a struct member. */ +#define MARK_INFO_REC_ARRAY_WRITTEN (ptr, nr, rec_size) do { \ + if (info_len >= offsetofend(typeof(*info), rec_size)) \ + __MARK_INFO_ARRAY_WRITTEN(ptr, nr, info->rec_size); \ +} while (0) + +/* Handle null-terminated strings. */ +#define MARK_INFO_STR_WRITTEN (ptr, nr) do { \ + if (info_len >= offsetofend(typeof(*info), ptr) && \ + info_len >= offsetofend(typeof(*info), nr) && \ + info->ptr) \ + libbpf_mark_mem_written(u64_to_ptr(info->ptr), \ + info->nr + 1); \ +} while (0) + +/* Helper functions for telling memory checkers that arrays pointed to by +* bpf_{btf,link,map,prog}_info members are initialized. +*/ + +static void mark_prog_info_written (struct bpf_prog_info *info,__u32 info_len) +{ +MARK_INFO_ARRAY_WRITTEN (map_ids, nr_map_ids, __u32); +MARK_INFO_ARRAY_WRITTEN (jited_ksyms, nr_jited_ksyms, __u64); +MARK_INFO_ARRAY_WRITTEN (jited_func_lens, nr_jited_func_lens, __u32); +MARK_INFO_REC_ARRAY_WRITTEN (func_info, nr_func_info, + func_info_rec_size); +MARK_INFO_REC_ARRAY_WRITTEN (line_info, nr_line_info, + line_info_rec_size); +MARK_INFO_REC_ARRAY_WRITTEN (jited_line_info, nr_jited_line_info, + jited_line_info_rec_size); +MARK_INFO_ARRAY_WRITTEN (prog_tags, nr_prog_tags, __u8[BPF_TAG_SIZE ]); +} + +static void mark_btf_info_written (struct bpf_btf_info *info,__u32 info_len) +{ +MARK_INFO_ARRAY_WRITTEN (btf, btf_size, __u8); +MARK_INFO_STR_WRITTEN (name, name_len); +} + +static void mark_link_info_written (struct bpf_link_info *info,__u32 info_len) +{ +switch (info->type) { +case BPF_LINK_TYPE_RAW_TRACEPOINT : +MARK_INFO_STR_WRITTEN (raw_tracepoint.tp_name, + raw_tracepoint.tp_name_len); +break ; +case BPF_LINK_TYPE_ITER : +MARK_INFO_STR_WRITTEN (iter.target_name, iter.target_name_len); +break ; +default : +break ; + } +} + +#undef MARK_INFO_STR_WRITTEN +#undef MARK_INFO_REC_ARRAY_WRITTEN +#undef MARK_INFO_ARRAY_WRITTEN +#undef __MARK_INFO_ARRAY_WRITTEN +int bpf_prog_get_info_by_fd (int prog_fd,struct bpf_prog_info *info,__u32 *info_len) { -return bpf_obj_get_info_by_fd (prog_fd, info, info_len); +int err; + + err =bpf_obj_get_info_by_fd (prog_fd, info, info_len); +if (!err) +mark_prog_info_written (info, *info_len); + +return err; } int bpf_map_get_info_by_fd(int map_fd, struct bpf_map_info *info,
@@ -1059,13 +1192,25 @@ int bpf_map_get_info_by_fd(int map_fd, struct bpf_map_info *info,int bpf_btf_get_info_by_fd (int btf_fd,struct bpf_btf_info *info,__u32 *info_len) { -return bpf_obj_get_info_by_fd (btf_fd, info, info_len); +int err; + + err =bpf_obj_get_info_by_fd (btf_fd, info, info_len); +if (!err) +mark_btf_info_written (info, *info_len); + +return err; }int bpf_link_get_info_by_fd (int link_fd,struct bpf_link_info *info,__u32 *info_len) { -return bpf_obj_get_info_by_fd (link_fd, info, info_len); +int err; + + err =bpf_obj_get_info_by_fd (link_fd, info, info_len); +if (!err) +mark_link_info_written (info, *info_len); + +return err; }int bpf_raw_tracepoint_open (const char *name,int prog_fd)
@@ -1127,6 +1272,7 @@ int bpf_btf_load(const void *btf_data, size_t btf_size, const struct bpf_btf_loa attr.btf_log_level =1 ; fd =sys_bpf_fd (BPF_BTF_LOAD , &attr, attr_sz); } +libbpf_mark_mem_written (log_buf, attr.btf_log_size);return libbpf_err_errno (fd); }
@@ -1146,6 +1292,7 @@ int bpf_task_fd_query(int pid, int fd, __u32 flags, char *buf, __u32 *buf_len, attr.task_fd_query.buf_len = *buf_len; err =sys_bpf (BPF_TASK_FD_QUERY , &attr, attr_sz); +libbpf_mark_mem_written_if (buf, attr.task_fd_query.buf_len +1 , !err); *buf_len = attr.task_fd_query.buf_len; *prog_id = attr.task_fd_query.prog_id;
tools/lib/bpf/btf.c +1 -0
@@ -1388,6 +1388,7 @@ struct btf *btf_get_from_fd(int btf_fd, struct btf *base_btf) goto exit_free; } +libbpf_mark_mem_written (ptr, btf_info.btf_size); btf =btf_new (ptr, btf_info.btf_size, base_btf); exit_free:
tools/lib/bpf/libbpf.c +1 -0
@@ -5443,6 +5443,7 @@ static int load_module_btfs(struct bpf_object *obj)pr_warn ("failed to get BTF object #%d info: %d\n" , id, err); goto err_out; } +libbpf_mark_mem_written (name, info.name_len +1 );/* ignore non-module BTFs */ if (!info.kernel_btf ||strcmp (name,"vmlinux" ) ==0 ) {
tools/lib/bpf/libbpf_internal.h +38 -0
@@ -585,4 +585,42 @@ static inline bool is_percpu_bpf_map_type(__u32 type) type == BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE; } +/* Check whether the code is compiled with the Memory Sanitizer. This needs to +* be two #if statements: if they are combined into one and __has_feature is +* not defined, then its usage will generate a syntax error. +*/ +#if defined(__has_feature) +#if __has_feature (memory_sanitizer) +#define LIBBPF_MSAN +#endif +#endif + +/* __libbpf_mark_mem_written(): tell memory checkers that a certain address +* range should be treated as initialized. Currently supports Memory Sanitizer; +* Valgrind support can be added in the future. +*/ +#ifdef LIBBPF_MSAN +#define HAVE_LIBBPF_MARK_MEM_WRITTEN +#include <sanitizer/msan_interface.h> +#define __libbpf_mark_mem_written __msan_unpoison +#else +static inline void __libbpf_mark_mem_written (void *s,size_t n) {} +#endif + +/* Convenience wrappers around __libbpf_mark_mem_written(). */ + +static inline void libbpf_mark_mem_written (void *s,size_t n) +{ +if (s && n) +__libbpf_mark_mem_written (s, n); +} + +static inline void libbpf_mark_mem_written_if (void *s,size_t n,bool c) +{ +if (c) +libbpf_mark_mem_written (s, n); +} + +#define libbpf_mark_var_written (v) libbpf_mark_mem_written(&(v), sizeof(v)) +#endif /* __LIBBPF_LIBBPF_INTERNAL_H */
Signature · 1 line
2.39.1
PATCH v2 16/16 selftests/bpf: Add MSan annotations
In reply to Ilya LeoshkevicheBPF selftests produce a few false positives with MSan. 3 of them have to do with sending uninitalized data via a socket. Another one is PERF_EVENT_IOC_QUERY_BPF, which is not known to MSan. Silence all of them using libbpf_mark_mem_written().
--- tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 3 +++ tools/testing/selftests/bpf/prog_tests/send_signal.c | 2 ++ tools/testing/selftests/bpf/prog_tests/tp_attach_query.c | 4 ++++ tools/testing/selftests/bpf/prog_tests/xdp_bonding.c | 3 +++ 4 files changed, 12 insertions(+)
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +3 -0
@@ -4,6 +4,7 @@#include <linux/err.h> #include <netinet/tcp.h> #include <test_progs.h> +#include <bpf/libbpf_internal.h> #include "network_helpers.h" #include "bpf_dctcp.skel.h" #include "bpf_cubic.skel.h"
@@ -39,6 +40,8 @@ static void *server(void *arg)ssize_t nr_sent =0 , bytes =0 ;char batch[1500 ]; +libbpf_mark_mem_written (batch,sizeof (batch)); + fd =accept (lfd,NULL ,NULL );while (fd ==-1 ) {if (errno ==EINTR )
tools/testing/selftests/bpf/prog_tests/send_signal.c +2 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <test_progs.h> +#include <bpf/libbpf_internal.h> #include <sys/time.h> #include <sys/resource.h> #include "test_send_signal_kern.skel.h"
@@ -58,6 +59,7 @@ static void test_send_signal_common(struct perf_event_attr *attr,ASSERT_OK (setpriority (PRIO_PROCESS ,0 ,-20 ),"setpriority" );/* notify parent signal handler is installed */ +libbpf_mark_mem_written (buf,1 );ASSERT_EQ (write (pipe_c2p[1 ], buf,1 ),1 ,"pipe_write" );/* make sure parent enabled bpf program to send_signal */
tools/testing/selftests/bpf/prog_tests/tp_attach_query.c +4 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <test_progs.h> +#include <bpf/libbpf_internal.h> void serial_test_tp_attach_query (void ) {
@@ -66,6 +67,7 @@ void serial_test_tp_attach_query(void)if (i ==0 ) {/* check NULL prog array query */ query->ids_len = num_progs; +libbpf_mark_var_written (query->prog_cnt); err =ioctl (pmu_fd[i],PERF_EVENT_IOC_QUERY_BPF , query); if (CHECK(err || query->prog_cnt != 0, "perf_event_ioc_query_bpf",
@@ -115,6 +117,8 @@ void serial_test_tp_attach_query(void) "err %d errno %d query->prog_cnt %u\n", err, errno, query->prog_cnt)) goto cleanup3; +libbpf_mark_mem_written (query->ids, + query->ids_len *sizeof (__u32));for (j =0 ; j < i +1 ; j++) if (CHECK(saved_prog_ids[j] != query->ids[j], "perf_event_ioc_query_bpf",
tools/testing/selftests/bpf/prog_tests/xdp_bonding.c +3 -0
@@ -14,6 +14,7 @@#include <net/if.h> #include <linux/if_link.h> #include "test_progs.h" +#include "bpf/libbpf_internal.h" #include "network_helpers.h" #include <linux/if_bonding.h> #include <linux/limits.h>
@@ -224,6 +225,8 @@ static int send_udp_packets(int vary_dst_ip)int i, s =-1 ;int ifindex; +libbpf_mark_mem_written (buf,sizeof (buf)); + s =socket (AF_PACKET ,SOCK_RAW ,IPPROTO_RAW );if (!ASSERT_GE (s,0 ,"socket" )) goto err;
Signature · 1 line
2.39.1
PATCH v2 14/16 libbpf: Factor out is_percpu_bpf_map_type()
In reply to Ilya LeoshkevichThis will be useful for unpoisoning map values for Memory Sanitizer.
--- tools/lib/bpf/libbpf.c | 11 ++--------- tools/lib/bpf/libbpf_internal.h | 8 ++++++++ 2 files changed, 10 insertions(+), 9 deletions(-)
tools/lib/bpf/libbpf.c +2 -9
@@ -9432,11 +9432,7 @@ static int validate_map_op(const struct bpf_map *map, size_t key_sz,if (!check_value_sz)return 0 ; -switch (map->def.type) { -case BPF_MAP_TYPE_PERCPU_ARRAY : -case BPF_MAP_TYPE_PERCPU_HASH : -case BPF_MAP_TYPE_LRU_PERCPU_HASH : -case BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE : { +if (is_percpu_bpf_map_type (map->def.type)) {int num_cpu =libbpf_num_possible_cpus ();size_t elem_sz =roundup (map->def.value_size,8 );
@@ -9445,15 +9441,12 @@ static int validate_map_op(const struct bpf_map *map, size_t key_sz, map->name, value_sz, num_cpu, elem_sz, num_cpu * elem_sz);return -EINVAL ; } -break ; - } -default : + }else {if (map->def.value_size != value_sz) {pr_warn ("map '%s': unexpected value size %zu provided, expected %u\n" , map->name, value_sz, map->def.value_size);return -EINVAL ; } -break ; }return 0 ; }
tools/lib/bpf/libbpf_internal.h +8 -0
@@ -577,4 +577,12 @@ static inline bool is_pow_of_2(size_t x)#define PROG_LOAD_ATTEMPTS 5int sys_bpf_prog_load (union bpf_attr *attr,unsigned int size,int attempts); +static inline bool is_percpu_bpf_map_type (__u32 type) +{ +return type ==BPF_MAP_TYPE_PERCPU_HASH || + type ==BPF_MAP_TYPE_LRU_PERCPU_HASH || + type ==BPF_MAP_TYPE_PERCPU_ARRAY || + type ==BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE ; +} +#endif /* __LIBBPF_LIBBPF_INTERNAL_H */
Signature · 1 line
2.39.1
PATCH v2 10/16 bpftool: Use bpf_{btf,link,map,prog}_get_info_by_fd()
In reply to Ilya LeoshkevichUse the new type-safe wrappers around bpf_obj_get_info_by_fd(). lease enter the commit message for your changes. Lines starting
--- tools/bpf/bpftool/btf.c | 13 ++++++++----- tools/bpf/bpftool/btf_dumper.c | 4 ++-- tools/bpf/bpftool/cgroup.c | 4 ++-- tools/bpf/bpftool/common.c | 13 +++++++------ tools/bpf/bpftool/link.c | 4 ++-- tools/bpf/bpftool/main.h | 3 ++- tools/bpf/bpftool/map.c | 8 ++++---- tools/bpf/bpftool/prog.c | 24 +++++++++++++----------- tools/bpf/bpftool/struct_ops.c | 6 +++--- 9 files changed, 43 insertions(+), 36 deletions(-)
tools/bpf/bpftool/btf.c +8 -5
@@ -537,7 +537,7 @@ static bool btf_is_kernel_module(__u32 btf_id) len =sizeof (btf_info); btf_info.name =ptr_to_u64 (btf_name); btf_info.name_len =sizeof (btf_name); - err =bpf_obj_get_info_by_fd (btf_fd, &btf_info, &len); + err =bpf_btf_get_info_by_fd (btf_fd, &btf_info, &len);close (btf_fd);if (err) {p_err ("can't get BTF (ID %u) object info: %s" , btf_id,strerror (errno));
@@ -606,7 +606,7 @@ static int do_dump(int argc, char **argv)if (fd <0 )return -1 ; - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_prog_get_info_by_fd (fd, &info, &len);if (err) {p_err ("can't get prog info: %s" ,strerror (errno)); goto done;
@@ -789,7 +789,10 @@ build_btf_type_table(struct hashmap *tab, enum bpf_obj_type type, }memset (info,0 , *len); - err =bpf_obj_get_info_by_fd (fd, info, len); +if (type ==BPF_OBJ_PROG ) + err =bpf_prog_get_info_by_fd (fd, info, len); +else + err =bpf_map_get_info_by_fd (fd, info, len);close (fd);if (err) { p_err("can't get %s info: %s", names[type],
@@ -931,7 +934,7 @@ show_btf(int fd, struct hashmap *btf_prog_table,int err;memset (&info,0 ,sizeof (info)); - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_btf_get_info_by_fd (fd, &info, &len);if (err) {p_err ("can't get BTF object info: %s" ,strerror (errno));return -1 ;
@@ -943,7 +946,7 @@ show_btf(int fd, struct hashmap *btf_prog_table, info.name =ptr_to_u64 (name); len =sizeof (info); - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_btf_get_info_by_fd (fd, &info, &len);if (err) {p_err ("can't get BTF object info: %s" ,strerror (errno));return -1 ;
tools/bpf/bpftool/btf_dumper.c +2 -2
@@ -57,7 +57,7 @@ static int dump_prog_id_as_func_ptr(const struct btf_dumper *d,if (prog_fd <0 ) goto print; - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (err) goto print;
@@ -70,7 +70,7 @@ static int dump_prog_id_as_func_ptr(const struct btf_dumper *d, info.func_info_rec_size = finfo_rec_size; info.func_info =ptr_to_u64 (&finfo); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (err) goto print;
tools/bpf/bpftool/cgroup.c +2 -2
@@ -82,7 +82,7 @@ static void guess_vmlinux_btf_id(__u32 attach_btf_obj_id)if (fd <0 )return ; - err =bpf_obj_get_info_by_fd (fd, &btf_info, &btf_len); + err =bpf_btf_get_info_by_fd (fd, &btf_info, &btf_len);if (err) goto out;
@@ -108,7 +108,7 @@ static int show_bpf_prog(int id, enum bpf_attach_type attach_type,if (prog_fd <0 )return -1 ; -if (bpf_obj_get_info_by_fd (prog_fd, &info, &info_len)) { +if (bpf_prog_get_info_by_fd (prog_fd, &info, &info_len)) {close (prog_fd);return -1 ; }
tools/bpf/bpftool/common.c +7 -6
@@ -353,7 +353,7 @@ void get_prog_full_name(const struct bpf_prog_info *prog_info, int prog_fd, info.func_info_rec_size =sizeof (finfo); info.func_info =ptr_to_u64 (&finfo); -if (bpf_obj_get_info_by_fd (prog_fd, &info, &info_len)) +if (bpf_prog_get_info_by_fd (prog_fd, &info, &info_len)) goto copy_name; prog_btf =btf__load_from_kernel_by_id (info.btf_id);
@@ -488,7 +488,7 @@ static int do_build_table_cb(const char *fpath, const struct stat *sb, goto out_close;memset (&pinned_info,0 ,sizeof (pinned_info)); -if (bpf_obj_get_info_by_fd (fd, &pinned_info, &len)) +if (bpf_prog_get_info_by_fd (fd, &pinned_info, &len)) goto out_close; path =strdup (fpath);
@@ -756,7 +756,7 @@ static int prog_fd_by_nametag(void *nametag, int **fds, bool tag) goto err_close_fds; } - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_prog_get_info_by_fd (fd, &info, &len);if (err) {p_err ("can't get prog info (%u): %s" , id,strerror (errno));
@@ -916,7 +916,7 @@ static int map_fd_by_name(char *name, int **fds) goto err_close_fds; } - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_map_get_info_by_fd (fd, &info, &len);if (err) {p_err ("can't get map info (%u): %s" , id,strerror (errno));
@@ -1026,7 +1026,8 @@ int map_parse_fd(int *argc, char ***argv)return fd; } -int map_parse_fd_and_info (int *argc,char ***argv,void *info,__u32 *info_len) +int map_parse_fd_and_info (int *argc,char ***argv,struct bpf_map_info *info, +__u32 *info_len) {int err;int fd;
@@ -1035,7 +1036,7 @@ int map_parse_fd_and_info(int *argc, char ***argv, void *info, __u32 *info_len)if (fd <0 )return -1 ; - err =bpf_obj_get_info_by_fd (fd, info, info_len); + err =bpf_map_get_info_by_fd (fd, info, info_len);if (err) {p_err ("can't get map info: %s" ,strerror (errno));close (fd);
tools/bpf/bpftool/link.c +2 -2
@@ -145,7 +145,7 @@ static int get_prog_info(int prog_id, struct bpf_prog_info *info)return prog_fd;memset (info,0 ,sizeof (*info)); - err =bpf_obj_get_info_by_fd (prog_fd, info, &len); + err =bpf_prog_get_info_by_fd (prog_fd, info, &len);if (err)p_err ("can't get prog info: %s" ,strerror (errno));close (prog_fd);
@@ -327,7 +327,7 @@ static int do_show_link(int fd)memset (&info,0 ,sizeof (info)); again: - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_link_get_info_by_fd (fd, &info, &len);if (err) {p_err ("can't get link info: %s" ,strerror (errno));
tools/bpf/bpftool/main.h +2 -1
@@ -168,7 +168,8 @@ int prog_parse_fd(int *argc, char ***argv);int prog_parse_fds (int *argc,char ***argv,int **fds);int map_parse_fd (int *argc,char ***argv);int map_parse_fds (int *argc,char ***argv,int **fds); -int map_parse_fd_and_info (int *argc,char ***argv,void *info,__u32 *info_len); +int map_parse_fd_and_info (int *argc,char ***argv,struct bpf_map_info *info, +__u32 *info_len);struct bpf_prog_linfo ;#if defined(HAVE_LLVM_SUPPORT ) || defined(HAVE_LIBBFD_SUPPORT )
tools/bpf/bpftool/map.c +4 -4
@@ -638,7 +638,7 @@ static int do_show_subset(int argc, char **argv)if (json_output && nb_fds >1 )jsonw_start_array (json_wtr);/* root array */ for (i =0 ; i < nb_fds; i++) { - err =bpf_obj_get_info_by_fd (fds[i], &info, &len); + err =bpf_map_get_info_by_fd (fds[i], &info, &len);if (err) {p_err ("can't get map info: %s" ,strerror (errno));
@@ -708,7 +708,7 @@ static int do_show(int argc, char **argv)break ; } - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_map_get_info_by_fd (fd, &info, &len);if (err) {p_err ("can't get map info: %s" ,strerror (errno));close (fd);
@@ -764,7 +764,7 @@ static int maps_have_btf(int *fds, int nb_fds)int err, i;for (i =0 ; i < nb_fds; i++) { - err =bpf_obj_get_info_by_fd (fds[i], &info, &len); + err =bpf_map_get_info_by_fd (fds[i], &info, &len);if (err) {p_err ("can't get map info: %s" ,strerror (errno));return -1 ;
@@ -925,7 +925,7 @@ static int do_dump(int argc, char **argv)if (wtr && nb_fds >1 )jsonw_start_array (wtr);/* root array */ for (i =0 ; i < nb_fds; i++) { -if (bpf_obj_get_info_by_fd (fds[i], &info, &len)) { +if (bpf_map_get_info_by_fd (fds[i], &info, &len)) {p_err ("can't get map info: %s" ,strerror (errno));break ; }
tools/bpf/bpftool/prog.c +13 -11
@@ -198,7 +198,7 @@ static void show_prog_maps(int fd, __u32 num_maps) info.nr_map_ids = num_maps; info.map_ids =ptr_to_u64 (map_ids); - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_prog_get_info_by_fd (fd, &info, &len);if (err || !info.nr_map_ids)return ;
@@ -231,7 +231,7 @@ static void *find_metadata(int prog_fd, struct bpf_map_info *map_info)memset (&prog_info,0 ,sizeof (prog_info)); prog_info_len =sizeof (prog_info); - ret =bpf_obj_get_info_by_fd (prog_fd, &prog_info, &prog_info_len); + ret =bpf_prog_get_info_by_fd (prog_fd, &prog_info, &prog_info_len);if (ret)return NULL ;
@@ -248,7 +248,7 @@ static void *find_metadata(int prog_fd, struct bpf_map_info *map_info) prog_info.map_ids =ptr_to_u64 (map_ids); prog_info_len =sizeof (prog_info); - ret =bpf_obj_get_info_by_fd (prog_fd, &prog_info, &prog_info_len); + ret =bpf_prog_get_info_by_fd (prog_fd, &prog_info, &prog_info_len);if (ret) goto free_map_ids;
@@ -259,7 +259,7 @@ static void *find_metadata(int prog_fd, struct bpf_map_info *map_info)memset (map_info,0 ,sizeof (*map_info)); map_info_len =sizeof (*map_info); - ret =bpf_obj_get_info_by_fd (map_fd, map_info, &map_info_len); + ret =bpf_map_get_info_by_fd (map_fd, map_info, &map_info_len);if (ret <0 ) {close (map_fd); goto free_map_ids;
@@ -580,7 +580,7 @@ static int show_prog(int fd)__u32 len =sizeof (info);int err; - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_prog_get_info_by_fd (fd, &info, &len);if (err) {p_err ("can't get prog info: %s" ,strerror (errno));return -1 ;
@@ -949,7 +949,7 @@ static int do_dump(int argc, char **argv)for (i =0 ; i < nb_fds; i++) {memset (&info,0 ,sizeof (info)); - err =bpf_obj_get_info_by_fd (fds[i], &info, &info_len); + err =bpf_prog_get_info_by_fd (fds[i], &info, &info_len);if (err) {p_err ("can't get prog info: %s" ,strerror (errno));break ;
@@ -961,7 +961,7 @@ static int do_dump(int argc, char **argv)break ; } - err =bpf_obj_get_info_by_fd (fds[i], &info, &info_len); + err =bpf_prog_get_info_by_fd (fds[i], &info, &info_len);if (err) {p_err ("can't get prog info: %s" ,strerror (errno));break ;
@@ -2170,9 +2170,10 @@ static char *profile_target_name(int tgt_fd)char *name =NULL ;int err; - err =bpf_obj_get_info_by_fd (tgt_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (tgt_fd, &info, &info_len);if (err) { -p_err ("failed to bpf_obj_get_info_by_fd for prog FD %d" , tgt_fd); +p_err ("failed to bpf_prog_get_info_by_fd for prog FD %d" , + tgt_fd); goto out; }
@@ -2183,7 +2184,8 @@ static char *profile_target_name(int tgt_fd) func_info_rec_size = info.func_info_rec_size;if (info.nr_func_info ==0 ) { -p_err ("bpf_obj_get_info_by_fd for prog FD %d found 0 func_info" , tgt_fd); +p_err ("bpf_prog_get_info_by_fd for prog FD %d found 0 func_info" , + tgt_fd); goto out; }
@@ -2192,7 +2194,7 @@ static char *profile_target_name(int tgt_fd) info.func_info_rec_size = func_info_rec_size; info.func_info =ptr_to_u64 (&func_info); - err =bpf_obj_get_info_by_fd (tgt_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (tgt_fd, &info, &info_len);if (err) {p_err ("failed to get func_info for prog FD %d" , tgt_fd); goto out;
tools/bpf/bpftool/struct_ops.c +3 -3
@@ -151,7 +151,7 @@ static int get_next_struct_ops_map(const char *name, int *res_fd,return -1 ; } - err =bpf_obj_get_info_by_fd (fd, info, &info_len); + err =bpf_map_get_info_by_fd (fd, info, &info_len);if (err) {p_err ("can't get map info: %s" ,strerror (errno));close (fd);
@@ -262,7 +262,7 @@ static struct res do_one_id(const char *id_str, work_func func, void *data, goto done; } -if (bpf_obj_get_info_by_fd (fd, info, &info_len)) { +if (bpf_map_get_info_by_fd (fd, info, &info_len)) {p_err ("can't get map info: %s" ,strerror (errno)); res.nr_errs++; goto done;
@@ -522,7 +522,7 @@ static int do_register(int argc, char **argv)bpf_link__disconnect (link);bpf_link__destroy (link); -if (!bpf_obj_get_info_by_fd (bpf_map__fd (map), &info, +if (!bpf_map_get_info_by_fd (bpf_map__fd (map), &info, &info_len)) p_info("Registered %s %s id %u", get_kern_struct_ops_name(&info),
Signature · 1 line
2.39.1
PATCH v2 13/16 selftests/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd()
In reply to Ilya LeoshkevichUse the new type-safe wrappers around bpf_obj_get_info_by_fd(). Fix a prog/map mixup in prog_holds_map().
--- .../bpf/map_tests/map_in_map_batch_ops.c | 2 +- .../selftests/bpf/prog_tests/bpf_iter.c | 8 +++---- .../selftests/bpf/prog_tests/bpf_obj_id.c | 20 ++++++++-------- tools/testing/selftests/bpf/prog_tests/btf.c | 24 +++++++++---------- .../selftests/bpf/prog_tests/btf_map_in_map.c | 2 +- .../selftests/bpf/prog_tests/check_mtu.c | 2 +- .../selftests/bpf/prog_tests/enable_stats.c | 2 +- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 14 +++++------ .../bpf/prog_tests/flow_dissector_reattach.c | 10 ++++---- .../bpf/prog_tests/libbpf_get_fd_by_id_opts.c | 4 ++-- .../selftests/bpf/prog_tests/lsm_cgroup.c | 3 ++- .../selftests/bpf/prog_tests/metadata.c | 8 +++---- tools/testing/selftests/bpf/prog_tests/mmap.c | 2 +- .../selftests/bpf/prog_tests/perf_link.c | 2 +- .../selftests/bpf/prog_tests/pinning.c | 2 +- .../selftests/bpf/prog_tests/prog_run_opts.c | 2 +- .../selftests/bpf/prog_tests/recursion.c | 4 ++-- .../selftests/bpf/prog_tests/sockmap_basic.c | 6 ++--- .../bpf/prog_tests/task_local_storage.c | 8 +++---- .../testing/selftests/bpf/prog_tests/tc_bpf.c | 4 ++-- .../bpf/prog_tests/tp_attach_query.c | 5 ++-- .../bpf/prog_tests/unpriv_bpf_disabled.c | 8 +++---- .../selftests/bpf/prog_tests/verif_stats.c | 5 ++-- .../selftests/bpf/prog_tests/xdp_attach.c | 4 ++-- .../bpf/prog_tests/xdp_cpumap_attach.c | 8 +++---- .../bpf/prog_tests/xdp_devmap_attach.c | 8 +++---- .../selftests/bpf/prog_tests/xdp_info.c | 2 +- .../selftests/bpf/prog_tests/xdp_link.c | 10 ++++---- tools/testing/selftests/bpf/test_maps.c | 2 +- .../selftests/bpf/test_skb_cgroup_id_user.c | 2 +- .../bpf/test_tcp_check_syncookie_user.c | 2 +- tools/testing/selftests/bpf/test_verifier.c | 8 +++---- tools/testing/selftests/bpf/testing_helpers.c | 2 +- tools/testing/selftests/bpf/xdp_synproxy.c | 15 +++++++----- 34 files changed, 109 insertions(+), 101 deletions(-)
tools/testing/selftests/bpf/map_tests/map_in_map_batch_ops.c +1 -1
@@ -18,7 +18,7 @@ static __u32 get_map_id_from_fd(int map_fd)uint32_t info_len =sizeof (map_info);int ret; - ret =bpf_obj_get_info_by_fd (map_fd, &map_info, &info_len); + ret =bpf_map_get_info_by_fd (map_fd, &map_info, &info_len);CHECK (ret <0 ,"Finding map info failed" ,"error:%s\n" ,strerror (errno));
tools/testing/selftests/bpf/prog_tests/bpf_iter.c +4 -4
@@ -195,8 +195,8 @@ static void check_bpf_link_info(const struct bpf_program *prog)return ; info_len =sizeof (info); - err =bpf_obj_get_info_by_fd (bpf_link__fd (link), &info, &info_len); -ASSERT_OK (err,"bpf_obj_get_info_by_fd" ); + err =bpf_link_get_info_by_fd (bpf_link__fd (link), &info, &info_len); +ASSERT_OK (err,"bpf_link_get_info_by_fd" );ASSERT_EQ (info.iter.task.tid,getpid (),"check_task_tid" );bpf_link__destroy (link);
@@ -684,13 +684,13 @@ static void test_overflow(bool test_e2big_overflow, bool ret1)/* setup filtering map_id in bpf program */ map_info_len =sizeof (map_info); - err =bpf_obj_get_info_by_fd (map1_fd, &map_info, &map_info_len); + err =bpf_map_get_info_by_fd (map1_fd, &map_info, &map_info_len);if (CHECK (err,"get_map_info" ,"get map info failed: %s\n" ,strerror (errno))) goto free_map2; skel->bss->map1_id = map_info.id; - err =bpf_obj_get_info_by_fd (map2_fd, &map_info, &map_info_len); + err =bpf_map_get_info_by_fd (map2_fd, &map_info, &map_info_len);if (CHECK (err,"get_map_info" ,"get map info failed: %s\n" ,strerror (errno))) goto free_map2;
tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c +10 -10
@@ -44,7 +44,7 @@ void serial_test_bpf_obj_id(void)CHECK (err >=0 || errno !=ENOENT ,"get-fd-by-notexist-link-id" ,"err %d errno %d\n" , err, errno); -/* Check bpf_obj_get_info_by_fd() */ +/* Check bpf_map_get_info_by_fd() */ bzero (zeros,sizeof (zeros));for (i =0 ; i < nr_iters; i++) { now =time (NULL );
@@ -79,7 +79,7 @@ void serial_test_bpf_obj_id(void)/* Check getting map info */ info_len =sizeof (struct bpf_map_info ) *2 ;bzero (&map_infos[i], info_len); - err =bpf_obj_get_info_by_fd (map_fds[i], &map_infos[i], + err =bpf_map_get_info_by_fd (map_fds[i], &map_infos[i], &info_len); if (CHECK(err || map_infos[i].type != BPF_MAP_TYPE_ARRAY ||
@@ -118,8 +118,8 @@ void serial_test_bpf_obj_id(void) err =clock_gettime (CLOCK_BOOTTIME , &boot_time_ts);if (CHECK_FAIL (err)) goto done; - err =bpf_obj_get_info_by_fd (prog_fds[i], &prog_infos[i], - &info_len); + err =bpf_prog_get_info_by_fd (prog_fds[i], &prog_infos[i], + &info_len); load_time = (real_time_ts.tv_sec - boot_time_ts.tv_sec) + (prog_infos[i].load_time / nsec_per_sec); if (CHECK(err ||
@@ -161,8 +161,8 @@ void serial_test_bpf_obj_id(void)bzero (&link_infos[i], info_len); link_infos[i].raw_tracepoint.tp_name =ptr_to_u64 (&tp_name); link_infos[i].raw_tracepoint.tp_name_len =sizeof (tp_name); - err =bpf_obj_get_info_by_fd (bpf_link__fd (links[i]), - &link_infos[i], &info_len); + err =bpf_link_get_info_by_fd (bpf_link__fd (links[i]), + &link_infos[i], &info_len); if (CHECK(err || link_infos[i].type != BPF_LINK_TYPE_RAW_TRACEPOINT || link_infos[i].prog_id != prog_infos[i].id ||
@@ -217,7 +217,7 @@ void serial_test_bpf_obj_id(void)* prog_info.map_ids = NULL */ prog_info.nr_map_ids =1 ; - err =bpf_obj_get_info_by_fd (prog_fd, &prog_info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &prog_info, &info_len);if (CHECK (!err || errno !=EFAULT ,"get-prog-fd-bad-nr-map-ids" ,"err %d errno %d(%d)" , err, errno,EFAULT ))
@@ -228,7 +228,7 @@ void serial_test_bpf_obj_id(void) saved_map_id = *(int *)((long )prog_infos[i].map_ids); prog_info.map_ids = prog_infos[i].map_ids; prog_info.nr_map_ids =2 ; - err =bpf_obj_get_info_by_fd (prog_fd, &prog_info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &prog_info, &info_len); prog_infos[i].jited_prog_insns =0 ; prog_infos[i].xlated_prog_insns =0 ; CHECK(err || info_len != sizeof(struct bpf_prog_info) ||
@@ -277,7 +277,7 @@ void serial_test_bpf_obj_id(void)if (CHECK_FAIL (err)) goto done; - err =bpf_obj_get_info_by_fd (map_fd, &map_info, &info_len); + err =bpf_map_get_info_by_fd (map_fd, &map_info, &info_len); CHECK(err || info_len != sizeof(struct bpf_map_info) || memcmp(&map_info, &map_infos[i], info_len) || array_value != array_magic_value,
@@ -322,7 +322,7 @@ void serial_test_bpf_obj_id(void) nr_id_found++; - err =bpf_obj_get_info_by_fd (link_fd, &link_info, &info_len); + err =bpf_link_get_info_by_fd (link_fd, &link_info, &info_len); cmp_res =memcmp (&link_info, &link_infos[i], offsetof(struct bpf_link_info , raw_tracepoint)); CHECK(err || info_len != sizeof(link_info) || cmp_res,
tools/testing/selftests/bpf/prog_tests/btf.c +12 -12
@@ -4422,7 +4422,7 @@ static int test_big_btf_info(unsigned int test_num) info->btf =ptr_to_u64 (user_btf); info->btf_size = raw_btf_size; - err =bpf_obj_get_info_by_fd (btf_fd, info, &info_len); + err =bpf_btf_get_info_by_fd (btf_fd, info, &info_len);if (CHECK (!err,"!err" )) { err =-1 ; goto done;
@@ -4435,7 +4435,7 @@ static int test_big_btf_info(unsigned int test_num)* to userspace. */ info_garbage.garbage =0 ; - err =bpf_obj_get_info_by_fd (btf_fd, info, &info_len); + err =bpf_btf_get_info_by_fd (btf_fd, info, &info_len);if (CHECK (err || info_len !=sizeof (*info),"err:%d errno:%d info_len:%u sizeof(*info):%zu" , err, errno, info_len,sizeof (*info))) {
@@ -4499,7 +4499,7 @@ static int test_btf_id(unsigned int test_num)/* Test BPF_OBJ_GET_INFO_BY_ID on btf_id */ info_len =sizeof (info[0 ]); - err =bpf_obj_get_info_by_fd (btf_fd[0 ], &info[0 ], &info_len); + err =bpf_btf_get_info_by_fd (btf_fd[0 ], &info[0 ], &info_len);if (CHECK (err,"errno:%d" , errno)) { err =-1 ; goto done;
@@ -4512,7 +4512,7 @@ static int test_btf_id(unsigned int test_num) } ret =0 ; - err =bpf_obj_get_info_by_fd (btf_fd[1 ], &info[1 ], &info_len); + err =bpf_btf_get_info_by_fd (btf_fd[1 ], &info[1 ], &info_len); if (CHECK(err || info[0].id != info[1].id || info[0].btf_size != info[1].btf_size || (ret = memcmp(user_btf[0], user_btf[1], info[0].btf_size)),
@@ -4535,7 +4535,7 @@ static int test_btf_id(unsigned int test_num) } info_len =sizeof (map_info); - err =bpf_obj_get_info_by_fd (map_fd, &map_info, &info_len); + err =bpf_map_get_info_by_fd (map_fd, &map_info, &info_len); if (CHECK(err || map_info.btf_id != info[0].id || map_info.btf_key_type_id != 1 || map_info.btf_value_type_id != 2, "err:%d errno:%d info.id:%u btf_id:%u btf_key_type_id:%u btf_value_type_id:%u",
@@ -4638,7 +4638,7 @@ static void do_test_get_info(unsigned int test_num) info.btf_size = user_btf_size; ret =0 ; - err =bpf_obj_get_info_by_fd (btf_fd, &info, &info_len); + err =bpf_btf_get_info_by_fd (btf_fd, &info, &info_len); if (CHECK(err || !info.id || info_len != sizeof(info) || info.btf_size != raw_btf_size || (ret = memcmp(raw_btf, user_btf, expected_nbytes)),
@@ -4755,7 +4755,7 @@ static void do_test_file(unsigned int test_num)/* get necessary program info */ info_len =sizeof (struct bpf_prog_info ); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (CHECK (err <0 ,"invalid get info (1st) errno:%d" , errno)) {fprintf (stderr,"%s\n" , btf_log_buf);
@@ -4787,7 +4787,7 @@ static void do_test_file(unsigned int test_num) info.func_info_rec_size = rec_size; info.func_info =ptr_to_u64 (func_info); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (CHECK (err <0 ,"invalid get info (2nd) errno:%d" , errno)) {fprintf (stderr,"%s\n" , btf_log_buf);
@@ -6405,7 +6405,7 @@ static int test_get_finfo(const struct prog_info_raw_test *test,/* get necessary lens */ info_len =sizeof (struct bpf_prog_info ); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (CHECK (err <0 ,"invalid get info (1st) errno:%d" , errno)) {fprintf (stderr,"%s\n" , btf_log_buf);return -1 ;
@@ -6435,7 +6435,7 @@ static int test_get_finfo(const struct prog_info_raw_test *test, info.nr_func_info = nr_func_info; info.func_info_rec_size = rec_size; info.func_info =ptr_to_u64 (func_info); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (CHECK (err <0 ,"invalid get info (2nd) errno:%d" , errno)) {fprintf (stderr,"%s\n" , btf_log_buf); err =-1 ;
@@ -6499,7 +6499,7 @@ static int test_get_linfo(const struct prog_info_raw_test *test, nr_jited_func_lens = nr_jited_ksyms; info_len =sizeof (struct bpf_prog_info ); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (CHECK (err <0 ,"err:%d errno:%d" , err, errno)) { err =-1 ; goto done;
@@ -6573,7 +6573,7 @@ static int test_get_linfo(const struct prog_info_raw_test *test, info.jited_func_lens =ptr_to_u64 (jited_func_lens); } - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);/* * Only recheck the info.*line_info* fields.
tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c +1 -1
@@ -14,7 +14,7 @@ static __u32 bpf_map_id(struct bpf_map *map)int err;memset (&info,0 , info_len); - err =bpf_obj_get_info_by_fd (bpf_map__fd (map), &info, &info_len); + err =bpf_map_get_info_by_fd (bpf_map__fd (map), &info, &info_len);if (err)return 0 ;return info.id;
tools/testing/selftests/bpf/prog_tests/check_mtu.c +1 -1
@@ -59,7 +59,7 @@ static void test_check_mtu_xdp_attach(void)memset (&link_info,0 ,sizeof (link_info)); fd =bpf_link__fd (link); - err =bpf_obj_get_info_by_fd (fd, &link_info, &link_info_len); + err =bpf_link_get_info_by_fd (fd, &link_info, &link_info_len);if (CHECK (err,"link_info" ,"failed: %d\n" , err)) goto out;
tools/testing/selftests/bpf/prog_tests/enable_stats.c +1 -1
@@ -28,7 +28,7 @@ void test_enable_stats(void) prog_fd =bpf_program__fd (skel->progs.test_enable_stats);memset (&info,0 , info_len); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (CHECK (err,"get_prog_info" ,"failed to get bpf_prog_info for fd %d\n" , prog_fd)) goto cleanup;
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +7 -7
@@ -79,7 +79,7 @@ static void test_fexit_bpf2bpf_common(const char *obj_file,return ; info_len =sizeof (prog_info); - err =bpf_obj_get_info_by_fd (tgt_fd, &prog_info, &info_len); + err =bpf_prog_get_info_by_fd (tgt_fd, &prog_info, &info_len);if (!ASSERT_OK (err,"tgt_fd_get_info" )) goto close_prog;
@@ -136,8 +136,8 @@ static void test_fexit_bpf2bpf_common(const char *obj_file, info_len =sizeof (link_info);memset (&link_info,0 ,sizeof (link_info)); - err =bpf_obj_get_info_by_fd (bpf_link__fd (link[i]), - &link_info, &info_len); + err =bpf_link_get_info_by_fd (bpf_link__fd (link[i]), + &link_info, &info_len);ASSERT_OK (err,"link_fd_get_info" ); ASSERT_EQ(link_info.tracing.attach_type, bpf_program__expected_attach_type(prog[i]),
@@ -417,7 +417,7 @@ static int find_prog_btf_id(const char *name, __u32 attach_prog_fd)struct btf *btf;int ret; - ret =bpf_obj_get_info_by_fd (attach_prog_fd, &info, &info_len); + ret =bpf_prog_get_info_by_fd (attach_prog_fd, &info, &info_len);if (ret)return ret;
@@ -483,12 +483,12 @@ static void test_fentry_to_cgroup_bpf(void)if (!ASSERT_GE (fentry_fd,0 ,"load_fentry" )) goto cleanup; -/* Make sure bpf_obj_get_info_by_fd works correctly when attaching +/* Make sure bpf_prog_get_info_by_fd works correctly when attaching * to another BPF program. */ -ASSERT_OK (bpf_obj_get_info_by_fd (fentry_fd, &info, &info_len), -"bpf_obj_get_info_by_fd" ); +ASSERT_OK (bpf_prog_get_info_by_fd (fentry_fd, &info, &info_len), +"bpf_prog_get_info_by_fd" );ASSERT_EQ (info.btf_id,0 ,"info.btf_id" );ASSERT_EQ (info.attach_btf_id, btf_id,"info.attach_btf_id" );
tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c +5 -5
@@ -60,9 +60,9 @@ static __u32 query_prog_id(int prog)__u32 info_len =sizeof (info);int err; - err =bpf_obj_get_info_by_fd (prog, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog, &info, &info_len);if (CHECK_FAIL (err || info_len !=sizeof (info))) { -perror ("bpf_obj_get_info_by_fd" ); +perror ("bpf_prog_get_info_by_fd" );return 0 ; }
@@ -497,7 +497,7 @@ static void test_link_get_info(int netns, int prog1, int prog2) } info_len =sizeof (info); - err =bpf_obj_get_info_by_fd (link, &info, &info_len); + err =bpf_link_get_info_by_fd (link, &info, &info_len);if (CHECK_FAIL (err)) {perror ("bpf_obj_get_info" ); goto out_unlink;
@@ -521,7 +521,7 @@ static void test_link_get_info(int netns, int prog1, int prog2) link_id = info.id; info_len =sizeof (info); - err =bpf_obj_get_info_by_fd (link, &info, &info_len); + err =bpf_link_get_info_by_fd (link, &info, &info_len);if (CHECK_FAIL (err)) {perror ("bpf_obj_get_info" ); goto out_unlink;
@@ -546,7 +546,7 @@ static void test_link_get_info(int netns, int prog1, int prog2) netns =-1 ; info_len =sizeof (info); - err =bpf_obj_get_info_by_fd (link, &info, &info_len); + err =bpf_link_get_info_by_fd (link, &info, &info_len);if (CHECK_FAIL (err)) {perror ("bpf_obj_get_info" ); goto out_unlink;
tools/testing/selftests/bpf/prog_tests/libbpf_get_fd_by_id_opts.c +2 -2
@@ -29,9 +29,9 @@ void test_libbpf_get_fd_by_id_opts(void)if (!ASSERT_OK (ret,"test_libbpf_get_fd_by_id_opts__attach" )) goto close_prog; - ret =bpf_obj_get_info_by_fd (bpf_map__fd (skel->maps.data_input), + ret =bpf_map_get_info_by_fd (bpf_map__fd (skel->maps.data_input), &info_m, &len); -if (!ASSERT_OK (ret,"bpf_obj_get_info_by_fd" )) +if (!ASSERT_OK (ret,"bpf_map_get_info_by_fd" )) goto close_prog; fd =bpf_map_get_fd_by_id (info_m.id);
tools/testing/selftests/bpf/prog_tests/lsm_cgroup.c +2 -1
@@ -47,7 +47,8 @@ static __u32 query_prog_cnt(int cgroup_fd, const char *attach_func) fd =bpf_prog_get_fd_by_id (p.prog_ids[i]);ASSERT_GE (fd,0 ,"prog_get_fd_by_id" ); -ASSERT_OK (bpf_obj_get_info_by_fd (fd, &info, &info_len),"prog_info_by_fd" ); +ASSERT_OK (bpf_prog_get_info_by_fd (fd, &info, &info_len), +"prog_info_by_fd" );close (fd); if (info.attach_btf_id ==
tools/testing/selftests/bpf/prog_tests/metadata.c +4 -4
@@ -16,7 +16,7 @@ static int duration;static int prog_holds_map (int prog_fd,int map_fd) {struct bpf_prog_info prog_info = {}; -struct bpf_prog_info map_info = {}; +struct bpf_map_info map_info = {};__u32 prog_info_len;__u32 map_info_len;__u32 *map_ids;
@@ -25,12 +25,12 @@ static int prog_holds_map(int prog_fd, int map_fd)int i; map_info_len =sizeof (map_info); - ret =bpf_obj_get_info_by_fd (map_fd, &map_info, &map_info_len); + ret =bpf_map_get_info_by_fd (map_fd, &map_info, &map_info_len);if (ret)return -errno; prog_info_len =sizeof (prog_info); - ret =bpf_obj_get_info_by_fd (prog_fd, &prog_info, &prog_info_len); + ret =bpf_prog_get_info_by_fd (prog_fd, &prog_info, &prog_info_len);if (ret)return -errno;
@@ -44,7 +44,7 @@ static int prog_holds_map(int prog_fd, int map_fd) prog_info.map_ids =ptr_to_u64 (map_ids); prog_info_len =sizeof (prog_info); - ret =bpf_obj_get_info_by_fd (prog_fd, &prog_info, &prog_info_len); + ret =bpf_prog_get_info_by_fd (prog_fd, &prog_info, &prog_info_len);if (ret) { ret = -errno; goto free_map_ids;
tools/testing/selftests/bpf/prog_tests/mmap.c +1 -1
@@ -64,7 +64,7 @@ void test_mmap(void)/* get map's ID */ memset (&map_info,0 , map_info_sz); - err =bpf_obj_get_info_by_fd (data_map_fd, &map_info, &map_info_sz); + err =bpf_map_get_info_by_fd (data_map_fd, &map_info, &map_info_sz);if (CHECK (err,"map_get_info" ,"failed %d\n" , errno)) goto cleanup; data_map_id = map_info.id;
tools/testing/selftests/bpf/prog_tests/perf_link.c +1 -1
@@ -54,7 +54,7 @@ void serial_test_perf_link(void) goto cleanup;memset (&info,0 ,sizeof (info)); - err =bpf_obj_get_info_by_fd (link_fd, &info, &info_len); + err =bpf_link_get_info_by_fd (link_fd, &info, &info_len);if (!ASSERT_OK (err,"link_get_info" )) goto cleanup;
tools/testing/selftests/bpf/prog_tests/pinning.c +1 -1
@@ -18,7 +18,7 @@ __u32 get_map_id(struct bpf_object *obj, const char *name)if (CHECK (!map,"find map" ,"NULL map" ))return 0 ; - err =bpf_obj_get_info_by_fd (bpf_map__fd (map), + err =bpf_map_get_info_by_fd (bpf_map__fd (map), &map_info, &map_info_len);CHECK (err,"get map info" ,"err %d errno %d" , err, errno);return map_info.id;
tools/testing/selftests/bpf/prog_tests/prog_run_opts.c +1 -1
@@ -12,7 +12,7 @@ static void check_run_cnt(int prog_fd, __u64 run_cnt)__u32 info_len =sizeof (info);int err; - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (CHECK (err,"get_prog_info" ,"failed to get bpf_prog_info for fd %d\n" , prog_fd))return ;
tools/testing/selftests/bpf/prog_tests/recursion.c +2 -2
@@ -31,8 +31,8 @@ void test_recursion(void)bpf_map_delete_elem (bpf_map__fd (skel->maps.hash2), &key);ASSERT_EQ (skel->bss->pass2,2 ,"pass2 == 2" ); - err =bpf_obj_get_info_by_fd (bpf_program__fd (skel->progs.on_delete), - &prog_info, &prog_info_len); + err =bpf_prog_get_info_by_fd (bpf_program__fd (skel->progs.on_delete), + &prog_info, &prog_info_len);if (!ASSERT_OK (err,"get_prog_info" )) goto out;ASSERT_EQ (prog_info.recursion_misses,2 ,"recursion_misses" );
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +3 -3
@@ -299,9 +299,9 @@ static __u32 query_prog_id(int prog_fd)__u32 info_len =sizeof (info);int err; - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); -if (!ASSERT_OK (err,"bpf_obj_get_info_by_fd" ) || - !ASSERT_EQ (info_len,sizeof (info),"bpf_obj_get_info_by_fd" )) + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len); +if (!ASSERT_OK (err,"bpf_prog_get_info_by_fd" ) || + !ASSERT_EQ (info_len,sizeof (info),"bpf_prog_get_info_by_fd" ))return 0 ;return info.id;
tools/testing/selftests/bpf/prog_tests/task_local_storage.c +4 -4
@@ -119,19 +119,19 @@ static void test_recursion(void) prog_fd =bpf_program__fd (skel->progs.on_lookup);memset (&info,0 ,sizeof (info)); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);ASSERT_OK (err,"get prog info" );ASSERT_GT (info.recursion_misses,0 ,"on_lookup prog recursion" ); prog_fd =bpf_program__fd (skel->progs.on_update);memset (&info,0 ,sizeof (info)); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);ASSERT_OK (err,"get prog info" );ASSERT_EQ (info.recursion_misses,0 ,"on_update prog recursion" ); prog_fd =bpf_program__fd (skel->progs.on_enter);memset (&info,0 ,sizeof (info)); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);ASSERT_OK (err,"get prog info" );ASSERT_EQ (info.recursion_misses,0 ,"on_enter prog recursion" );
@@ -221,7 +221,7 @@ static void test_nodeadlock(void) info_len =sizeof (info); prog_fd =bpf_program__fd (skel->progs.socket_post_create); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);ASSERT_OK (err,"get prog info" );ASSERT_EQ (info.recursion_misses,0 ,"prog recursion" );
tools/testing/selftests/bpf/prog_tests/tc_bpf.c +2 -2
@@ -29,8 +29,8 @@ static int test_tc_bpf_basic(const struct bpf_tc_hook *hook, int fd)__u32 info_len =sizeof (info);int ret; - ret =bpf_obj_get_info_by_fd (fd, &info, &info_len); -if (!ASSERT_OK (ret,"bpf_obj_get_info_by_fd" )) + ret =bpf_prog_get_info_by_fd (fd, &info, &info_len); +if (!ASSERT_OK (ret,"bpf_prog_get_info_by_fd" ))return ret; ret =bpf_tc_attach (hook, &opts);
tools/testing/selftests/bpf/prog_tests/tp_attach_query.c +3 -2
@@ -45,8 +45,9 @@ void serial_test_tp_attach_query(void) prog_info.xlated_prog_len =0 ; prog_info.nr_map_ids =0 ; info_len =sizeof (prog_info); - err =bpf_obj_get_info_by_fd (prog_fd[i], &prog_info, &info_len); -if (CHECK (err,"bpf_obj_get_info_by_fd" ,"err %d errno %d\n" , + err =bpf_prog_get_info_by_fd (prog_fd[i], &prog_info, + &info_len); +if (CHECK (err,"bpf_prog_get_info_by_fd" ,"err %d errno %d\n" , err, errno)) goto cleanup1; saved_prog_ids[i] = prog_info.id;
tools/testing/selftests/bpf/prog_tests/unpriv_bpf_disabled.c +4 -4
@@ -179,7 +179,7 @@ static void test_unpriv_bpf_disabled_negative(struct test_unpriv_bpf_disabled *sASSERT_EQ (bpf_prog_get_next_id (prog_id, &next), -EPERM ,"prog_get_next_id_fails" );ASSERT_EQ (bpf_prog_get_next_id (0 , &next), -EPERM ,"prog_get_next_id_fails" ); -if (ASSERT_OK (bpf_obj_get_info_by_fd (map_fds[0 ], &map_info, &map_info_len), +if (ASSERT_OK (bpf_map_get_info_by_fd (map_fds[0 ], &map_info, &map_info_len),"obj_get_info_by_fd" )) {ASSERT_EQ (bpf_map_get_fd_by_id (map_info.id), -EPERM ,"map_get_fd_by_id_fails" ); ASSERT_EQ(bpf_map_get_next_id(map_info.id, &next), -EPERM,
@@ -187,8 +187,8 @@ static void test_unpriv_bpf_disabled_negative(struct test_unpriv_bpf_disabled *s }ASSERT_EQ (bpf_map_get_next_id (0 , &next), -EPERM ,"map_get_next_id_fails" ); -if (ASSERT_OK (bpf_obj_get_info_by_fd (bpf_link__fd (skel->links.sys_nanosleep_enter), - &link_info, &link_info_len), +if (ASSERT_OK (bpf_link_get_info_by_fd (bpf_link__fd (skel->links.sys_nanosleep_enter), + &link_info, &link_info_len),"obj_get_info_by_fd" )) {ASSERT_EQ (bpf_link_get_fd_by_id (link_info.id), -EPERM ,"link_get_fd_by_id_fails" ); ASSERT_EQ(bpf_link_get_next_id(link_info.id, &next), -EPERM,
@@ -269,7 +269,7 @@ void test_unpriv_bpf_disabled(void) } prog_fd =bpf_program__fd (skel->progs.sys_nanosleep_enter); -ASSERT_OK (bpf_obj_get_info_by_fd (prog_fd, &prog_info, &prog_info_len), +ASSERT_OK (bpf_prog_get_info_by_fd (prog_fd, &prog_info, &prog_info_len),"obj_get_info_by_fd" ); prog_id = prog_info.id;ASSERT_GT (prog_id,0 ,"valid_prog_id" );
tools/testing/selftests/bpf/prog_tests/verif_stats.c +3 -2
@@ -16,8 +16,9 @@ void test_verif_stats(void)if (!ASSERT_OK_PTR (skel,"trace_vprintk__open_and_load" )) goto cleanup; - err =bpf_obj_get_info_by_fd (skel->progs.sys_enter.prog_fd, &info, &len); -if (!ASSERT_OK (err,"bpf_obj_get_info_by_fd" )) + err =bpf_prog_get_info_by_fd (skel->progs.sys_enter.prog_fd, + &info, &len); +if (!ASSERT_OK (err,"bpf_prog_get_info_by_fd" )) goto cleanup;if (!ASSERT_GT (info.verified_insns,0 ,"verified_insns" ))
tools/testing/selftests/bpf/prog_tests/xdp_attach.c +2 -2
@@ -18,7 +18,7 @@ void serial_test_xdp_attach(void) err =bpf_prog_test_load (file,BPF_PROG_TYPE_XDP , &obj1, &fd1);if (CHECK_FAIL (err))return ; - err =bpf_obj_get_info_by_fd (fd1, &info, &len); + err =bpf_prog_get_info_by_fd (fd1, &info, &len);if (CHECK_FAIL (err)) goto out_1; id1 = info.id;
@@ -28,7 +28,7 @@ void serial_test_xdp_attach(void) goto out_1;memset (&info,0 ,sizeof (info)); - err =bpf_obj_get_info_by_fd (fd2, &info, &len); + err =bpf_prog_get_info_by_fd (fd2, &info, &len);if (CHECK_FAIL (err)) goto out_2; id2 = info.id;
tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c +4 -4
@@ -33,8 +33,8 @@ static void test_xdp_with_cpumap_helpers(void) prog_fd =bpf_program__fd (skel->progs.xdp_dummy_cm); map_fd =bpf_map__fd (skel->maps.cpu_map); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &len); -if (!ASSERT_OK (err,"bpf_obj_get_info_by_fd" )) + err =bpf_prog_get_info_by_fd (prog_fd, &info, &len); +if (!ASSERT_OK (err,"bpf_prog_get_info_by_fd" )) goto out_close; val.bpf_prog.fd = prog_fd;
@@ -85,8 +85,8 @@ static void test_xdp_with_cpumap_frags_helpers(void) frags_prog_fd =bpf_program__fd (skel->progs.xdp_dummy_cm_frags); map_fd =bpf_map__fd (skel->maps.cpu_map); - err =bpf_obj_get_info_by_fd (frags_prog_fd, &info, &len); -if (!ASSERT_OK (err,"bpf_obj_get_info_by_fd" )) + err =bpf_prog_get_info_by_fd (frags_prog_fd, &info, &len); +if (!ASSERT_OK (err,"bpf_prog_get_info_by_fd" )) goto out_close; val.bpf_prog.fd = frags_prog_fd;
tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c +4 -4
@@ -35,8 +35,8 @@ static void test_xdp_with_devmap_helpers(void) dm_fd =bpf_program__fd (skel->progs.xdp_dummy_dm); map_fd =bpf_map__fd (skel->maps.dm_ports); - err =bpf_obj_get_info_by_fd (dm_fd, &info, &len); -if (!ASSERT_OK (err,"bpf_obj_get_info_by_fd" )) + err =bpf_prog_get_info_by_fd (dm_fd, &info, &len); +if (!ASSERT_OK (err,"bpf_prog_get_info_by_fd" )) goto out_close; val.bpf_prog.fd = dm_fd;
@@ -98,8 +98,8 @@ static void test_xdp_with_devmap_frags_helpers(void) dm_fd_frags =bpf_program__fd (skel->progs.xdp_dummy_dm_frags); map_fd =bpf_map__fd (skel->maps.dm_ports); - err =bpf_obj_get_info_by_fd (dm_fd_frags, &info, &len); -if (!ASSERT_OK (err,"bpf_obj_get_info_by_fd" )) + err =bpf_prog_get_info_by_fd (dm_fd_frags, &info, &len); +if (!ASSERT_OK (err,"bpf_prog_get_info_by_fd" )) goto out_close; val.bpf_prog.fd = dm_fd_frags;
tools/testing/selftests/bpf/prog_tests/xdp_info.c +1 -1
@@ -34,7 +34,7 @@ void serial_test_xdp_info(void)if (CHECK_FAIL (err))return ; - err =bpf_obj_get_info_by_fd (prog_fd, &info, &len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &len);if (CHECK (err,"get_prog_info" ,"errno=%d\n" , errno)) goto out_close;
tools/testing/selftests/bpf/prog_tests/xdp_link.c +6 -4
@@ -29,13 +29,13 @@ void serial_test_xdp_link(void) prog_fd2 =bpf_program__fd (skel2->progs.xdp_handler);memset (&prog_info,0 ,sizeof (prog_info)); - err =bpf_obj_get_info_by_fd (prog_fd1, &prog_info, &prog_info_len); + err =bpf_prog_get_info_by_fd (prog_fd1, &prog_info, &prog_info_len);if (!ASSERT_OK (err,"fd_info1" )) goto cleanup; id1 = prog_info.id;memset (&prog_info,0 ,sizeof (prog_info)); - err =bpf_obj_get_info_by_fd (prog_fd2, &prog_info, &prog_info_len); + err =bpf_prog_get_info_by_fd (prog_fd2, &prog_info, &prog_info_len);if (!ASSERT_OK (err,"fd_info2" )) goto cleanup; id2 = prog_info.id;
@@ -119,7 +119,8 @@ void serial_test_xdp_link(void) goto cleanup;memset (&link_info,0 ,sizeof (link_info)); - err =bpf_obj_get_info_by_fd (bpf_link__fd (link), &link_info, &link_info_len); + err =bpf_link_get_info_by_fd (bpf_link__fd (link), + &link_info, &link_info_len);if (!ASSERT_OK (err,"link_info" )) goto cleanup;
@@ -137,7 +138,8 @@ void serial_test_xdp_link(void) goto cleanup;memset (&link_info,0 ,sizeof (link_info)); - err =bpf_obj_get_info_by_fd (bpf_link__fd (link), &link_info, &link_info_len); + err =bpf_link_get_info_by_fd (bpf_link__fd (link), + &link_info, &link_info_len);ASSERT_OK (err,"link_info" );ASSERT_EQ (link_info.prog_id, id1,"link_prog_id" );
tools/testing/selftests/bpf/test_maps.c +1 -1
@@ -1275,7 +1275,7 @@ static void test_map_in_map(void) goto out_map_in_map; } - err =bpf_obj_get_info_by_fd (fd, &info, &len); + err =bpf_map_get_info_by_fd (fd, &info, &len);if (err) {printf ("Failed to get map info by fd %d: %d" , fd, errno);
tools/testing/selftests/bpf/test_skb_cgroup_id_user.c +1 -1
@@ -93,7 +93,7 @@ int get_map_fd_by_prog_id(int prog_id) info.nr_map_ids =1 ; info.map_ids = (__u64 ) (unsigned long ) map_ids; -if (bpf_obj_get_info_by_fd (prog_fd, &info, &info_len)) { +if (bpf_prog_get_info_by_fd (prog_fd, &info, &info_len)) {log_err ("Failed to get info by prog fd %d" , prog_fd); goto err; }
tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c +1 -1
@@ -96,7 +96,7 @@ static int get_map_fd_by_prog_id(int prog_id, bool *xdp) info.nr_map_ids =1 ; info.map_ids = (__u64 )(unsigned long )map_ids; -if (bpf_obj_get_info_by_fd (prog_fd, &info, &info_len)) { +if (bpf_prog_get_info_by_fd (prog_fd, &info, &info_len)) {log_err ("Failed to get info by prog fd %d" , prog_fd); goto err; }
tools/testing/selftests/bpf/test_verifier.c +4 -4
@@ -1239,8 +1239,8 @@ static int get_xlated_program(int fd_prog, struct bpf_insn **buf, int *cnt)__u32 xlated_prog_len;__u32 buf_element_size =sizeof (struct bpf_insn ); -if (bpf_obj_get_info_by_fd (fd_prog, &info, &info_len)) { -perror ("bpf_obj_get_info_by_fd failed" ); +if (bpf_prog_get_info_by_fd (fd_prog, &info, &info_len)) { +perror ("bpf_prog_get_info_by_fd failed" );return -1 ; }
@@ -1261,8 +1261,8 @@ static int get_xlated_program(int fd_prog, struct bpf_insn **buf, int *cnt)bzero (&info,sizeof (info)); info.xlated_prog_len = xlated_prog_len; info.xlated_prog_insns = (__u64 )(unsigned long )*buf; -if (bpf_obj_get_info_by_fd (fd_prog, &info, &info_len)) { -perror ("second bpf_obj_get_info_by_fd failed" ); +if (bpf_prog_get_info_by_fd (fd_prog, &info, &info_len)) { +perror ("second bpf_prog_get_info_by_fd failed" ); goto out_free_buf; }
tools/testing/selftests/bpf/testing_helpers.c +1 -1
@@ -164,7 +164,7 @@ __u32 link_info_prog_id(const struct bpf_link *link, struct bpf_link_info *info)int err;memset (info,0 ,sizeof (*info)); - err =bpf_obj_get_info_by_fd (bpf_link__fd (link), info, &info_len); + err =bpf_link_get_info_by_fd (bpf_link__fd (link), info, &info_len);if (err) {printf ("failed to get link info: %d\n" , -errno);return 0 ;
tools/testing/selftests/bpf/xdp_synproxy.c +9 -6
@@ -217,9 +217,10 @@ static int syncookie_attach(const char *argv0, unsigned int ifindex, bool tc) prog_fd =bpf_program__fd (prog); - err =bpf_obj_get_info_by_fd (prog_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &info, &info_len);if (err <0 ) { -fprintf (stderr,"Error: bpf_obj_get_info_by_fd: %s\n" ,strerror (-err)); +fprintf (stderr,"Error: bpf_prog_get_info_by_fd: %s\n" , +strerror (-err)); goto out; } attached_tc = tc;
@@ -292,9 +293,10 @@ static int syncookie_open_bpf_maps(__u32 prog_id, int *values_map_fd, int *ports }; info_len =sizeof (prog_info); - err =bpf_obj_get_info_by_fd (prog_fd, &prog_info, &info_len); + err =bpf_prog_get_info_by_fd (prog_fd, &prog_info, &info_len);if (err !=0 ) { -fprintf (stderr,"Error: bpf_obj_get_info_by_fd: %s\n" ,strerror (-err)); +fprintf (stderr,"Error: bpf_prog_get_info_by_fd: %s\n" , +strerror (-err)); goto out; }
@@ -317,9 +319,10 @@ static int syncookie_open_bpf_maps(__u32 prog_id, int *values_map_fd, int *ports map_fd = err; info_len =sizeof (map_info); - err =bpf_obj_get_info_by_fd (map_fd, &map_info, &info_len); + err =bpf_map_get_info_by_fd (map_fd, &map_info, &info_len);if (err !=0 ) { -fprintf (stderr,"Error: bpf_obj_get_info_by_fd: %s\n" ,strerror (-err)); +fprintf (stderr,"Error: bpf_map_get_info_by_fd: %s\n" , +strerror (-err));close (map_fd); goto err_close_map_fds; }
Signature · 1 line
2.39.1
Re: [PATCH bpf-next v2 10/16] bpftool: Use bpf_{btf,link,map,prog}_get_info_by_fd()
In reply to Ilya LeoshkevichQuoted 2 lines · Ilya Leoshkevich
Use the new type-safe wrappers around
bpf_obj_get_info_by_fd(). lease enter the commit message for your changes. Lines starting
Not sure what happened here, but this line needs to go. I'll fix this in v3 if we decide to keep this patch.
Quoted 12 lines
Signed-off-by Ilya Leoshkevich <[email protected]>---
tools/bpf/bpftool/btf.c | 13 ++++++++-----tools/bpf/bpftool/btf_dumper.c| 4 ++-- tools/bpf/bpftool/cgroup.c | 4 ++-- tools/bpf/bpftool/common.c | 13 +++++++------ tools/bpf/bpftool/link.c | 4 ++-- tools/bpf/bpftool/main.h | 3 ++- tools/bpf/bpftool/map.c | 8 ++++---- tools/bpf/bpftool/prog.c | 24 +++++++++++++-----------tools/bpf/bpftool/struct_ops.c| 6 +++---9 files changed, 43 insertions(+), 36 deletions(-)
[...]
Re: [PATCH bpf-next v2 10/16] bpftool: Use bpf_{btf,link,map,prog}_get_info_by_fd()
In reply to Ilya Leoshkevich2023-02-10 01:12 UTC+0100 ~ Ilya Leoshkevich <[email protected]>
Quoted 4 lines
Use the new type-safe wrappers around
bpf_obj_get_info_by_fd(). lease enter the commit message for your changes. Lines startingSigned-off-by Ilya Leoshkevich <[email protected]>
Hi, here are a few comments from my side inline below. Other than these, the patch looks good to me, thanks.
Quoted 16 lines
--- tools/bpf/bpftool/btf.c | 13 ++++++++----- tools/bpf/bpftool/btf_dumper.c | 4 ++-- tools/bpf/bpftool/cgroup.c | 4 ++-- tools/bpf/bpftool/common.c | 13 +++++++------ tools/bpf/bpftool/link.c | 4 ++-- tools/bpf/bpftool/main.h | 3 ++- tools/bpf/bpftool/map.c | 8 ++++---- tools/bpf/bpftool/prog.c | 24 +++++++++++++----------- tools/bpf/bpftool/struct_ops.c | 6 +++--- 9 files changed, 43 insertions(+), 36 deletions(-)tools/bpf/bpftool/btf.c +0
-0
[...]
tools/bpf/bpftool/btf.c build_btf_type_table(struct hashmap *tab, enum bpf_obj_type type, · line 795
Quoted 9 lines
tools/bpf/bpftool/btf.c +4
-1@@ -789,7 +789,10 @@ build_btf_type_table(struct hashmap *tab, enum bpf_obj_type type, }memset (info,0 , *len); - err =bpf_obj_get_info_by_fd (fd, info, len); +if (type ==BPF_OBJ_PROG ) + err =bpf_prog_get_info_by_fd (fd, info, len); +else + err =bpf_map_get_info_by_fd (fd, info, len);
Not obvious to me why we should change this one, I suppose knowing the type helps with the Memory Sanitizer?
[...]
Quoted 4 lines
tools/bpf/bpftool/common.c +0
-0
[...]
tools/bpf/bpftool/common.c int map_parse_fd(int *argc, char ***argv) · line 1030
Quoted 7 lines
tools/bpf/bpftool/common.c +2
-1@@ -1026,7 +1026,8 @@ int map_parse_fd(int *argc, char ***argv)return fd; } -int map_parse_fd_and_info (int *argc,char ***argv,void *info,__u32 *info_len) +int map_parse_fd_and_info (int *argc,char ***argv,struct bpf_map_info *info, +__u32 *info_len)
This is not strictly related to the other changes, please don't forget to mention it when you fix the commit description.
Quoted 3 lines
tools/bpf/bpftool/common.c +0
-0{int err;int fd;
[...]
Quoted 4 lines
tools/bpf/bpftool/prog.c +0
-0
[...]
tools/bpf/bpftool/prog.c static char *profile_target_name(int tgt_fd) · line 2176
Quoted 10 lines
tools/bpf/bpftool/prog.c +3
-2@@ -2170,9 +2170,10 @@ static char *profile_target_name(int tgt_fd)char *name =NULL ;int err; - err =bpf_obj_get_info_by_fd (tgt_fd, &info, &info_len); + err =bpf_prog_get_info_by_fd (tgt_fd, &info, &info_len);if (err) { -p_err ("failed to bpf_obj_get_info_by_fd for prog FD %d" , tgt_fd); +p_err ("failed to bpf_prog_get_info_by_fd for prog FD %d" , + tgt_fd);
Nit: Maybe just drop the function name here, and keep "failed to get info for prog FD [...]"? Same below.
Quoted 13 lines
tools/bpf/bpftool/prog.c +2
-1goto out; }@@ -2183,7 +2184,8 @@ static char *profile_target_name(int tgt_fd) func_info_rec_size = info.func_info_rec_size;if (info.nr_func_info ==0 ) { -p_err ("bpf_obj_get_info_by_fd for prog FD %d found 0 func_info" , tgt_fd); +p_err ("bpf_prog_get_info_by_fd for prog FD %d found 0 func_info" , + tgt_fd); goto out; }
[...]
Re: [PATCH bpf-next v2 11/16] perf: Use bpf_{btf,link,map,prog}_get_info_by_fd()
In reply to Ilya LeoshkevichQuoted 5 lines · Ilya Leoshkevich
Use the new type-safe wrappers around
bpf_obj_get_info_by_fd().Signed-off-by Ilya Leoshkevich <[email protected]>---
This will cause unnecessary pain for perf for a small gain. perf supports linking libbpf dynamically, so using some very recent APIs is a complication. So please drop this patch. Samples and bpftool conversion is totally fine, IMO.
Quoted 5 lines
tools/perf/util/bpf-utils.c | 4 ++-- tools/perf/util/bpf_counter.c | 2 +- tools/perf/util/bpf_counter.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
[...]
Quoted 15 lines · Ilya Leoshkevich
v1: https://lore.kernel.org/bpf/[email protected]/
v1 -> v2:
- Apply runqslower'sEXTRA_CFLAGSandEXTRA_LDFLAGSunconditionally.
- Use u64 foruretprobe_byname2_rc.
- UseBPF_UPROBE()instead ofPT_REGS_xxx().
- Use void * instead of char * for pointer arithmetic.
- Renamelibbpf_mark_defined()to__libbpf_mark_mem_written(), add convenience wrappers.
- Add a comment aboutdefined(__has_feature)&&__has_feature(memory_sanitizer).
- Extractis_percpu_bpf_map_type().
- Introduce bpf_get_{map,prog,link,btf}_info_by_fd() and convert all code to use them. If it's too early for that, in particular for samples and perf, the respective patches can be dropped.
perf is too early, the rest is fine
I applied first 7 patches for now, I'll go review the rest a bit later.
Quoted 174 lines
- Unpoison infos returned by these functions, paying attention to potentially missing fields. Use macros to reduce boilerplate.
- Movecapget()unpoisoning to LLVM [5].
- With that, only a few cases remain where data needs to be unpoisoned in selftests.Hi,
This series adds support for building selftests with Memory Sanitizer
[1] - a compiler instrumentation for detecting usages of undefined memory.The primary motivation is to make sure that such usages do not occur during testing, since the ones that have not been caught yet are likely to affect the CI results on s390x. The secondary motivation is to be able to use libbpf in applications instrumented with MSan (it requires all code running in a process to be instrumented).
MSan has found one real issue (fixed by patch 7), and of course a number of false positives. This rest of this series deals with preparing the build infrastructure and adding MSan annotations to libbpf and selftests.
The setup I'm using is as follows:
- Instrumented zlib-ng and patched elfutils [2].
- Patched LLVM [3, 4, 5].
- Clang-built kernel.
- Building tests with MSan:make \ -C tools/testing/selftests/bpf \ CC="ccache clang-17" \ LD=ld \ HOSTCC="ccache clang-17" \ HOSTLD=ld \ LLVM=1 \ LLVM_SUFFIX=-17 \ OBJCOPY=objcopy \ CLANG="ccache clang-17" \ LLVM_STRIP=llvm-strip-17 \ LLC=llc-17 \ BPF_GCC= \ SAN_CFLAGS="-fsanitize=memory \ -fsanitize-memory-track-origins \ -I$PWD/../zlib-ng/dist/include \ -I$PWD/../elfutils/dist/include" \ SAN_LDFLAGS="-fsanitize=memory \ -fsanitize-memory-track-origins \ -L$PWD/../zlib-ng/dist/lib \ -L$PWD/../elfutils/dist/lib" \ CROSS_COMPILE=s390x-linux-gnu-It's a lot of options, but most of them are trivial: setting up LLVM toolchain, taking in account s390x quirks, setting up MSan and disabling bpf-gcc. The
CROSS_COMPILEone is a hack: instrumenting bpftool turned out to be too complicated from the build system perspective, so havingCROSS_COMPILEforces compiling the host libbpf uninstrumented and guest libbpf instrumented.- Running tests with MSan on s390x:
LD_LIBRARY_PATH=<instrumented libs> ./test_progs ... Summary: 282/1624 PASSED, 23 SKIPPED, 4 FAILEDThe 4 failures happen without MSan too, they are already known and denylisted.
Best regards,
Ilya[1] https://clang.llvm.org/docs/MemorySanitizer.html
[2] https://sourceware.org/pipermail/elfutils-devel/2023q1/005831.html
[3] https://reviews.llvm.org/D143296
[4] https://reviews.llvm.org/D143330
[5] https://reviews.llvm.org/D143660Ilya Leoshkevich (16):
selftests/bpf: Quote host tools
tools: runqslower: AddEXTRA_CFLAGSandEXTRA_LDFLAGSsupport selftests/bpf: SplitSAN_CFLAGSandSAN_LDFLAGSselftests/bpf: ForwardSAN_CFLAGSandSAN_LDFLAGSto runqslower and
libbpf
selftests/bpf: Attach to fopen()/fclose() inuprobe_autoattachselftests/bpf: Attach to fopen()/fclose() inattach_probe
libbpf: Fix alen calculation inlibbpf_nla_dump_errormsg()
libbpf: Introduce bpf_{btf,link,map,prog}_get_info_by_fd()
libbpf: Use bpf_{btf,link,map,prog}_get_info_by_fd()
bpftool: Use bpf_{btf,link,map,prog}_get_info_by_fd()
perf: Use bpf_{btf,link,map,prog}_get_info_by_fd()samples/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd() selftests/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd()
libbpf: Factor outis_percpu_bpf_map_type()
libbpf: Add MSan annotations
selftests/bpf: Add MSan annotationssamples/bpf/test_map_in_map_user.c | 2 +- samples/bpf/xdp1_user.c | 2 +- samples/bpf/xdp_adjust_tail_user.c | 2 +- samples/bpf/xdp_fwd_user.c | 4 +- samples/bpf/xdp_redirect_cpu_user.c | 4 +- samples/bpf/xdp_rxq_info_user.c | 2 +- samples/bpf/xdp_sample_pkts_user.c | 2 +- samples/bpf/xdp_tx_iptunnel_user.c | 2 +- tools/bpf/bpftool/btf.c | 13 +- tools/bpf/bpftool/btf_dumper.c | 4 +- tools/bpf/bpftool/cgroup.c | 4 +- tools/bpf/bpftool/common.c | 13 +- tools/bpf/bpftool/link.c | 4 +- tools/bpf/bpftool/main.h | 3 +- tools/bpf/bpftool/map.c | 8 +- tools/bpf/bpftool/prog.c | 24 +-- tools/bpf/bpftool/struct_ops.c | 6 +- tools/bpf/runqslower/Makefile | 2 + tools/lib/bpf/bpf.c | 179 +++++++++++++++++- tools/lib/bpf/bpf.h | 13 ++ tools/lib/bpf/btf.c | 9 +- tools/lib/bpf/libbpf.c | 26 +-- tools/lib/bpf/libbpf.map | 5 + tools/lib/bpf/libbpf_internal.h | 46 +++++ tools/lib/bpf/netlink.c | 2 +- tools/lib/bpf/nlattr.c | 2 +- tools/lib/bpf/ringbuf.c | 4 +- tools/perf/util/bpf-utils.c | 4 +- tools/perf/util/bpf_counter.c | 2 +- tools/perf/util/bpf_counter.h | 6 +- tools/testing/selftests/bpf/Makefile | 17 +- .../bpf/map_tests/map_in_map_batch_ops.c | 2 +- .../selftests/bpf/prog_tests/attach_probe.c | 10 +- .../selftests/bpf/prog_tests/bpf_iter.c | 8 +- .../selftests/bpf/prog_tests/bpf_obj_id.c | 20 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 3 + tools/testing/selftests/bpf/prog_tests/btf.c | 24 +-- .../selftests/bpf/prog_tests/btf_map_in_map.c | 2 +- .../selftests/bpf/prog_tests/check_mtu.c | 2 +- .../selftests/bpf/prog_tests/enable_stats.c | 2 +- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 14 +- .../bpf/prog_tests/flow_dissector_reattach.c | 10 +- .../bpf/prog_tests/libbpf_get_fd_by_id_opts.c | 4 +- .../selftests/bpf/prog_tests/lsm_cgroup.c | 3 +- .../selftests/bpf/prog_tests/metadata.c | 8 +- tools/testing/selftests/bpf/prog_tests/mmap.c | 2 +- .../selftests/bpf/prog_tests/perf_link.c | 2 +- .../selftests/bpf/prog_tests/pinning.c | 2 +- .../selftests/bpf/prog_tests/prog_run_opts.c | 2 +- .../selftests/bpf/prog_tests/recursion.c | 4 +- .../selftests/bpf/prog_tests/send_signal.c | 2 + .../selftests/bpf/prog_tests/sockmap_basic.c | 6 +- .../bpf/prog_tests/task_local_storage.c | 8 +- .../testing/selftests/bpf/prog_tests/tc_bpf.c | 4 +- .../bpf/prog_tests/tp_attach_query.c | 9 +- .../bpf/prog_tests/unpriv_bpf_disabled.c | 8 +- .../bpf/prog_tests/uprobe_autoattach.c | 14 +- .../selftests/bpf/prog_tests/verif_stats.c | 5 +- .../selftests/bpf/prog_tests/xdp_attach.c | 4 +- .../selftests/bpf/prog_tests/xdp_bonding.c | 3 + .../bpf/prog_tests/xdp_cpumap_attach.c | 8 +- .../bpf/prog_tests/xdp_devmap_attach.c | 8 +- .../selftests/bpf/prog_tests/xdp_info.c | 2 +- .../selftests/bpf/prog_tests/xdp_link.c | 10 +- .../selftests/bpf/progs/test_attach_probe.c | 11 +- .../bpf/progs/test_uprobe_autoattach.c | 16 +- tools/testing/selftests/bpf/test_maps.c | 2 +- .../selftests/bpf/test_skb_cgroup_id_user.c | 2 +- .../bpf/test_tcp_check_syncookie_user.c | 2 +- tools/testing/selftests/bpf/test_verifier.c | 8 +- tools/testing/selftests/bpf/testing_helpers.c | 2 +- tools/testing/selftests/bpf/xdp_synproxy.c | 15 +- 72 files changed, 478 insertions(+), 211 deletions(-)--
2.39.1
This series was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:
Quoted 20 lines · On Fri, 10 Feb 2023 01:11:54 +0100 you wrote:
v1: https://lore.kernel.org/bpf/[email protected]/
v1 -> v2:
- Apply runqslower'sEXTRA_CFLAGSandEXTRA_LDFLAGSunconditionally.
- Use u64 foruretprobe_byname2_rc.
- UseBPF_UPROBE()instead ofPT_REGS_xxx().
- Use void * instead of char * for pointer arithmetic.
- Renamelibbpf_mark_defined()to__libbpf_mark_mem_written(), add convenience wrappers.
- Add a comment aboutdefined(__has_feature)&&__has_feature(memory_sanitizer).
- Extractis_percpu_bpf_map_type().
- Introduce bpf_get_{map,prog,link,btf}_info_by_fd() and convert all code to use them. If it's too early for that, in particular for samples and perf, the respective patches can be dropped.
- Unpoison infos returned by these functions, paying attention to potentially missing fields. Use macros to reduce boilerplate.
- Movecapget()unpoisoning to LLVM [5].
- With that, only a few cases remain where data needs to be unpoisoned in selftests.
Quoted 1 line
[...]
Here is the summary with links:
- [bpf-next,v2,01/16] selftests/bpf: Quote host tools
https://git.kernel.org/bpf/bpf-next/c/795deb3f9747 - [bpf-next,v2,02/16] tools: runqslower: Add EXTRA_CFLAGS and EXTRA_LDFLAGS support https://git.kernel.org/bpf/bpf-next/c/585bf4640ebe - [bpf-next,v2,03/16] selftests/bpf: Split SAN_CFLAGS and SAN_LDFLAGS https://git.kernel.org/bpf/bpf-next/c/0589d16475ae - [bpf-next,v2,04/16] selftests/bpf: Forward SAN_CFLAGS and SAN_LDFLAGS to runqslower and libbpf https://git.kernel.org/bpf/bpf-next/c/24a87b477c65 - [bpf-next,v2,05/16] selftests/bpf: Attach to fopen()/fclose() in uprobe_autoattach https://git.kernel.org/bpf/bpf-next/c/907300c7a66b - [bpf-next,v2,06/16] selftests/bpf: Attach to fopen()/fclose() in attach_probe https://git.kernel.org/bpf/bpf-next/c/202702e890a4 - [bpf-next,v2,07/16] libbpf: Fix alen calculation in libbpf_nla_dump_errormsg() https://git.kernel.org/bpf/bpf-next/c/17bcd27a08a2
- [bpf-next,v2,08/16] libbpf: Introduce bpf_{btf,link,map,prog}_get_info_by_fd() (no matching commit)
- [bpf-next,v2,09/16] libbpf: Use bpf_{btf,link,map,prog}_get_info_by_fd() (no matching commit)
- [bpf-next,v2,10/16] bpftool: Use bpf_{btf,link,map,prog}_get_info_by_fd() (no matching commit)
- [bpf-next,v2,11/16] perf: Use bpf_{btf,link,map,prog}_get_info_by_fd() (no matching commit)
- [bpf-next,v2,12/16] samples/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd() (no matching commit)
- [bpf-next,v2,13/16] selftests/bpf: Use bpf_{btf,link,map,prog}_get_info_by_fd() (no matching commit)
- [bpf-next,v2,14/16] libbpf: Factor out is_percpu_bpf_map_type() (no matching commit)
- [bpf-next,v2,15/16] libbpf: Add MSan annotations
(no matching commit)
- [bpf-next,v2,16/16] selftests/bpf: Add MSan annotations
(no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html