Remove libcap dependency from bpf selftests
Subsystems (3)
v2 cover Remove libcap dependency from bpf selftests
After upgrading to the newer libcap (>= 2.60),
the libcap commit aca076443591 ("Make cap_t operations thread safe.") added a "__u8 mutex;" to the "struct _cap_struct". It caused a few byte shift that breaks the assumption made in the "struct libcap" definition in test_verifier.c.
This set is to remove the libcap dependency from the bpf selftests.
v2:
- Define CAP_PERFMON and CAP_BPF when the older <linux/capability.h> does not have them. (Andrii)
Martin KaFai Lau (3):
bpf: selftests: Add helpers to directly use the capget and capset
syscall
bpf: selftests: Remove libcap usage from test_verifier
bpf: selftests: Remove libcap usage from test_progs
tools/testing/selftests/bpf/Makefile | 8 +- tools/testing/selftests/bpf/cap_helpers.c | 67 ++++++++++++++ tools/testing/selftests/bpf/cap_helpers.h | 19 ++++ .../selftests/bpf/prog_tests/bind_perm.c | 44 ++-------- tools/testing/selftests/bpf/test_verifier.c | 88 ++++++------------- 5 files changed, 124 insertions(+), 102 deletions(-) create mode 100644 tools/testing/selftests/bpf/cap_helpers.c create mode 100644 tools/testing/selftests/bpf/cap_helpers.h
Signature · 1 line
2.30.2
PATCH v2 1/3 bpf: selftests: Add helpers to directly use the capget and capset syscall
After upgrading to the newer libcap (>= 2.60),
the libcap commit aca076443591 ("Make cap_t operations thread safe.") added a "__u8 mutex;" to the "struct _cap_struct". It caused a few byte shift that breaks the assumption made in the "struct libcap" definition in test_verifier.c.
The bpf selftest usage only needs to enable and disable the effective caps of the running task. It is easier to directly syscall the capget and capset instead. It can also remove the libcap library dependency.
The cap_helpers.{c,h} is added. One __u64 is used for all CAP_* bits instead of two __u32.
--- tools/testing/selftests/bpf/cap_helpers.c | 67 +++++++++++++++++++++++ tools/testing/selftests/bpf/cap_helpers.h | 19 +++++++ 2 files changed, 86 insertions(+) create mode 100644 tools/testing/selftests/bpf/cap_helpers.c create mode 100644 tools/testing/selftests/bpf/cap_helpers.h
tools/testing/selftests/bpf/cap_helpers.c new file +67 -0
@@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "cap_helpers.h" + +/* Avoid including <sys/capability.h> from the libcap-devel package, +* so directly declare them here and use them from glibc. +*/ +int capget (cap_user_header_t header,cap_user_data_t data); +int capset (cap_user_header_t header,const cap_user_data_t data); + +int cap_enable_effective (__u64 caps,__u64 *old_caps) +{ +struct __user_cap_data_struct data[_LINUX_CAPABILITY_U32S_3]; +struct __user_cap_header_struct hdr = { + .version = _LINUX_CAPABILITY_VERSION_3, + }; +__u32 cap0 = caps; +__u32 cap1 = caps >>32 ; +int err; + + err =capget (&hdr, data); +if (err) +return err; + +if (old_caps) + *old_caps = (__u64)(data[1 ].effective) <<32 | data[0 ].effective; + +if ((data[0 ].effective & cap0) == cap0 && + (data[1 ].effective & cap1) == cap1) +return 0 ; + + data[0 ].effective |= cap0; + data[1 ].effective |= cap1; + err =capset (&hdr, data); +if (err) +return err; + +return 0 ; +} + +int cap_disable_effective (__u64 caps,__u64 *old_caps) +{ +struct __user_cap_data_struct data[_LINUX_CAPABILITY_U32S_3]; +struct __user_cap_header_struct hdr = { + .version = _LINUX_CAPABILITY_VERSION_3, + }; +__u32 cap0 = caps; +__u32 cap1 = caps >>32 ; +int err; + + err =capget (&hdr, data); +if (err) +return err; + +if (old_caps) + *old_caps = (__u64)(data[1 ].effective) <<32 | data[0 ].effective; + +if (!(data[0 ].effective & cap0) && !(data[1 ].effective & cap1)) +return 0 ; + + data[0 ].effective &= ~cap0; + data[1 ].effective &= ~cap1; + err =capset (&hdr, data); +if (err) +return err; + +return 0 ; +}
tools/testing/selftests/bpf/cap_helpers.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __CAP_HELPERS_H +#define __CAP_HELPERS_H + +#include <linux/types.h> +#include <linux/capability.h> + +#ifndef CAP_PERFMON +#define CAP_PERFMON 38 +#endif + +#ifndef CAP_BPF +#define CAP_BPF 39 +#endif + +int cap_enable_effective (__u64 caps,__u64 *old_caps); +int cap_disable_effective (__u64 caps,__u64 *old_caps); + +#endif
Signature · 1 line
2.30.2
PATCH v2 2/3 bpf: selftests: Remove libcap usage from test_verifier
In reply to Martin KaFai LauThis patch removes the libcap usage from test_verifier. The cap_*_effective() helpers added in the earlier patch are used instead.
--- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/test_verifier.c | 88 ++++++--------------- 2 files changed, 27 insertions(+), 64 deletions(-)
tools/testing/selftests/bpf/Makefile +2 -1
@@ -195,6 +195,7 @@ $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): $(BPFOBJ) CGROUP_HELPERS := $(OUTPUT)/cgroup_helpers.o TESTING_HELPERS := $(OUTPUT)/testing_helpers.o TRACE_HELPERS := $(OUTPUT)/trace_helpers.o +CAP_HELPERS := $(OUTPUT)/cap_helpers.o $(OUTPUT)/test_dev_cgroup: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_skb_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS)
@@ -211,7 +212,7 @@ $(OUTPUT)/test_lirc_mode2_user: $(TESTING_HELPERS) $(OUTPUT)/xdping: $(TESTING_HELPERS) $(OUTPUT)/flow_dissector_load: $(TESTING_HELPERS) $(OUTPUT)/test_maps: $(TESTING_HELPERS) -$(OUTPUT)/test_verifier: $(TESTING_HELPERS) +$(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS) BPFTOOL ?= $(DEFAULT_BPFTOOL) $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \
tools/testing/selftests/bpf/test_verifier.c +25 -63
123 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH v2 3/3 bpf: selftests: Remove libcap usage from test_progs
In reply to Martin KaFai LauThis patch removes the libcap usage from test_progs. bind_perm.c is the only user. cap_*_effective() helpers added in the earlier patch are directly used instead.
No other selftest binary is using libcap, so '-lcap' is also removed from the Makefile.
--- tools/testing/selftests/bpf/Makefile | 5 ++- .../selftests/bpf/prog_tests/bind_perm.c | 44 ++++--------------- 2 files changed, 11 insertions(+), 38 deletions(-)
tools/testing/selftests/bpf/Makefile +3 -2
@@ -25,7 +25,7 @@ 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) -LDLIBS += -lcap -lelf -lz -lrt -lpthread +LDLIBS += -lelf -lz -lrt -lpthread # Silence some warnings when compiled with clang ifneq ($(LLVM),)
@@ -480,7 +480,8 @@ TRUNNER_TESTS_DIR := prog_tests TRUNNER_BPF_PROGS_DIR := progs TRUNNER_EXTRA_SOURCES := test_progs.c cgroup_helpers.c trace_helpers.c \ network_helpers.c testing_helpers.c \ - btf_helpers.c flow_dissector_load.h + btf_helpers.c flow_dissector_load.h \ + cap_helpers.c TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read $(OUTPUT)/bpf_testmod.ko \ ima_setup.sh \ $(wildcard progs/btf_dump_test_case_*.c)
tools/testing/selftests/bpf/prog_tests/bind_perm.c +8 -36
73 lines not on this page · raw message
Signature · 1 line
2.30.2
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Wed, 16 Mar 2022 10:38:16 -0700 you wrote:
After upgrading to the newer libcap (>= 2.60),
the libcap commitaca076443591("Makecap_toperations thread safe.") added a "__u8mutex;" to the "struct_cap_struct". It caused a few byte shift that breaks the assumption made in the "struct libcap" definition intest_verifier.c.This set is to remove the libcap dependency from the bpf selftests.
[...]
Here is the summary with links:
- [v2,bpf-next,1/3] bpf: selftests: Add helpers to directly use the capget and capset syscall
https://git.kernel.org/bpf/bpf-next/c/663af70aabb7 - [v2,bpf-next,2/3] bpf: selftests: Remove libcap usage from test_verifier https://git.kernel.org/bpf/bpf-next/c/b1c2768a82b9 - [v2,bpf-next,3/3] bpf: selftests: Remove libcap usage from test_progs https://git.kernel.org/bpf/bpf-next/c/82cb2b30773e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html