diff options
| author | Yafang Shao <laoar.shao@gmail.com> | 2022-04-09 12:59:56 +0000 |
|---|---|---|
| committer | Andrii Nakryiko <andrii@kernel.org> | 2022-04-10 20:17:16 -0700 |
| commit | b858ba8c52b64c038de156c455a39a89bfd214e8 (patch) | |
| tree | 6d6349f4307e1eee298beedd206d849830dac77c /tools/testing/selftests/bpf/flow_dissector_load.c | |
| parent | b25acdafd3730110254f8452b113a6311ab5cf2d (diff) | |
| download | linux-b858ba8c52b64c038de156c455a39a89bfd214e8.tar.bz2 | |
selftests/bpf: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK
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. After
this change, the header tools/testing/selftests/bpf/bpf_rlimit.h can be
removed.
This patch also removes the useless header sys/resource.h from many files
in tools/testing/selftests/bpf/.
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220409125958.92629-3-laoar.shao@gmail.com
Diffstat (limited to 'tools/testing/selftests/bpf/flow_dissector_load.c')
| -rw-r--r-- | tools/testing/selftests/bpf/flow_dissector_load.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/testing/selftests/bpf/flow_dissector_load.c b/tools/testing/selftests/bpf/flow_dissector_load.c index 87fd1aa323a9..c8be6406777f 100644 --- a/tools/testing/selftests/bpf/flow_dissector_load.c +++ b/tools/testing/selftests/bpf/flow_dissector_load.c @@ -11,7 +11,6 @@ #include <bpf/bpf.h> #include <bpf/libbpf.h> -#include "bpf_rlimit.h" #include "flow_dissector_load.h" const char *cfg_pin_path = "/sys/fs/bpf/flow_dissector"; @@ -25,9 +24,8 @@ static void load_and_attach_program(void) int prog_fd, ret; struct bpf_object *obj; - ret = libbpf_set_strict_mode(LIBBPF_STRICT_ALL); - if (ret) - error(1, 0, "failed to enable libbpf strict mode: %d", ret); + /* Use libbpf 1.0 API mode */ + libbpf_set_strict_mode(LIBBPF_STRICT_ALL); ret = bpf_flow_load(&obj, cfg_path_name, cfg_prog_name, cfg_map_name, NULL, &prog_fd, NULL); |