diff options
| author |   Yafang Shao <laoar.shao@gmail.com> | 2022-04-09 12:59:55 +0000 |
|---|---|---|
| committer |   Andrii Nakryiko <andrii@kernel.org> | 2022-04-10 20:17:15 -0700 |
| commit | b25acdafd3730110254f8452b113a6311ab5cf2d (patch) | |
| tree | 7365487e69507af364ee8a5e65fe994011bd9ea6 /samples/bpf/xsk_fwd.c | |
| parent | libbpf: Fix a bug with checking bpf_probe_read_kernel() support in old kernels (diff) | |
| download | linux-dev-b25acdafd3730110254f8452b113a6311ab5cf2d.tar.xz linux-dev-b25acdafd3730110254f8452b113a6311ab5cf2d.zip | |
samples/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.
This patch also removes the useless header sys/resource.h from many files
in samples/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-2-laoar.shao@gmail.com
Diffstat (limited to '')
| -rw-r--r-- | samples/bpf/xsk_fwd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/samples/bpf/xsk_fwd.c b/samples/bpf/xsk_fwd.c index 2220509588a0..2324e18ccc7e 100644 --- a/samples/bpf/xsk_fwd.c +++ b/samples/bpf/xsk_fwd.c @@ -10,7 +10,6 @@ #include <stdlib.h> #include <string.h> #include <sys/mman.h> -#include <sys/resource.h> #include <sys/socket.h> #include <sys/types.h> #include <time.h> @@ -131,7 +130,6 @@ static struct bpool * bpool_init(struct bpool_params *params, struct xsk_umem_config *umem_cfg) { - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY}; u64 n_slabs, n_slabs_reserved, n_buffers, n_buffers_reserved; u64 slabs_size, slabs_reserved_size; u64 buffers_size, buffers_reserved_size; @@ -140,9 +138,8 @@ bpool_init(struct bpool_params *params, u8 *p; int status; - /* mmap prep. */ - if (setrlimit(RLIMIT_MEMLOCK, &r)) - return NULL; + /* Use libbpf 1.0 API mode */ + libbpf_set_strict_mode(LIBBPF_STRICT_ALL); /* bpool internals dimensioning. */ n_slabs = (params->n_buffers + params->n_buffers_per_slab - 1) / |