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/test_sockmap.c | |
| parent | samples/bpf: Use libbpf 1.0 API mode instead of RLIMIT_MEMLOCK (diff) | |
| download | wireguard-linux-b858ba8c52b64c038de156c455a39a89bfd214e8.tar.xz wireguard-linux-b858ba8c52b64c038de156c455a39a89bfd214e8.zip | |
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/test_sockmap.c')
| -rw-r--r-- | tools/testing/selftests/bpf/test_sockmap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c index dfb4f5c0fcb9..0fbaccdc8861 100644 --- a/tools/testing/selftests/bpf/test_sockmap.c +++ b/tools/testing/selftests/bpf/test_sockmap.c @@ -18,7 +18,6 @@ #include <sched.h> #include <sys/time.h> -#include <sys/resource.h> #include <sys/types.h> #include <sys/sendfile.h> @@ -37,7 +36,6 @@ #include <bpf/libbpf.h> #include "bpf_util.h" -#include "bpf_rlimit.h" #include "cgroup_helpers.h" int running; @@ -2017,6 +2015,9 @@ int main(int argc, char **argv) cg_created = 1; } + /* Use libbpf 1.0 API mode */ + libbpf_set_strict_mode(LIBBPF_STRICT_ALL); + if (test == SELFTESTS) { err = test_selftest(cg_fd, &options); goto out; |