aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/bpf/get_cgroup_id_user.c
diff options
context:
space:
mode:
authorAndrii Nakryiko <andrii@kernel.org>2022-04-10 20:17:16 -0700
committerAndrii Nakryiko <andrii@kernel.org>2022-04-10 20:17:17 -0700
commit33fc250c3e76f99015f5cdbee1de1dd8500d29cc (patch)
tree895366ef2583f8173d2ab2fa77f690eba84fb4f7 /tools/testing/selftests/bpf/get_cgroup_id_user.c
parentlibbpf: Fix a bug with checking bpf_probe_read_kernel() support in old kernels (diff)
parenttools/runqslower: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK (diff)
downloadlinux-dev-33fc250c3e76f99015f5cdbee1de1dd8500d29cc.tar.xz
linux-dev-33fc250c3e76f99015f5cdbee1de1dd8500d29cc.zip
Merge branch 'bpf: RLIMIT_MEMLOCK cleanups'
Yafang Shao says: ==================== We have switched to memcg-based memory accouting and thus the rlimit is not needed any more. LIBBPF_STRICT_AUTO_RLIMIT_MEMLOCK was introduced in libbpf for backward compatibility, so we can use it instead now. This patchset cleanups the usage of RLIMIT_MEMLOCK in tools/bpf/, tools/testing/selftests/bpf and samples/bpf. The file tools/testing/selftests/bpf/bpf_rlimit.h is removed. The included header sys/resource.h is removed from many files as it is useless in these files. - v4: Squash patches and use customary subject prefixes. (Andrii) - v3: Get rid of bpf_rlimit.h and fix some typos (Andrii) - v2: Use libbpf_set_strict_mode instead. (Andrii) - v1: https://lore.kernel.org/bpf/20220320060815.7716-2-laoar.shao@gmail.com/ ==================== Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/get_cgroup_id_user.c')
-rw-r--r--tools/testing/selftests/bpf/get_cgroup_id_user.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/get_cgroup_id_user.c b/tools/testing/selftests/bpf/get_cgroup_id_user.c
index 3a7b82bd9e94..e021cc67dc02 100644
--- a/tools/testing/selftests/bpf/get_cgroup_id_user.c
+++ b/tools/testing/selftests/bpf/get_cgroup_id_user.c
@@ -20,7 +20,6 @@
#include "cgroup_helpers.h"
#include "testing_helpers.h"
-#include "bpf_rlimit.h"
#define CHECK(condition, tag, format...) ({ \
int __ret = !!(condition); \
@@ -67,6 +66,9 @@ int main(int argc, char **argv)
if (CHECK(cgroup_fd < 0, "cgroup_setup_and_join", "err %d errno %d\n", cgroup_fd, errno))
return 1;
+ /* Use libbpf 1.0 API mode */
+ libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
+
err = bpf_prog_test_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj, &prog_fd);
if (CHECK(err, "bpf_prog_test_load", "err %d errno %d\n", err, errno))
goto cleanup_cgroup_env;