tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
authored by
Yafang Shao
and committed by
Andrii Nakryiko
b25acdaf
d252a4a4
+7
-42
-1
samples/bpf/cpustat_user.c
-1
samples/bpf/cpustat_user.c
+3
-2
samples/bpf/hbm.c
+3
-2
samples/bpf/hbm.c
···
34
34
#include <stdio.h>
35
35
#include <stdlib.h>
36
36
#include <assert.h>
37
-
#include <sys/resource.h>
38
37
#include <sys/time.h>
39
38
#include <unistd.h>
40
39
#include <errno.h>
···
45
46
#include <bpf/bpf.h>
46
47
#include <getopt.h>
47
48
48
-
#include "bpf_rlimit.h"
49
49
#include "cgroup_helpers.h"
50
50
#include "hbm.h"
51
51
#include "bpf_util.h"
···
507
509
if (optind < argc)
508
510
prog = argv[optind];
509
511
printf("HBM prog: %s\n", prog != NULL ? prog : "NULL");
512
+
513
+
/* Use libbpf 1.0 API mode */
514
+
libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
510
515
511
516
return run_bpf_prog(prog, cg_id);
512
517
}
-1
samples/bpf/ibumad_user.c
-1
samples/bpf/ibumad_user.c
-1
samples/bpf/map_perf_test_user.c
-1
samples/bpf/map_perf_test_user.c
-1
samples/bpf/offwaketime_user.c
-1
samples/bpf/offwaketime_user.c
-1
samples/bpf/sockex2_user.c
-1
samples/bpf/sockex2_user.c
-1
samples/bpf/sockex3_user.c
-1
samples/bpf/sockex3_user.c
-1
samples/bpf/spintest_user.c
-1
samples/bpf/spintest_user.c
-1
samples/bpf/syscall_tp_user.c
-1
samples/bpf/syscall_tp_user.c
-1
samples/bpf/task_fd_query_user.c
-1
samples/bpf/task_fd_query_user.c
-1
samples/bpf/test_lru_dist.c
-1
samples/bpf/test_lru_dist.c
-1
samples/bpf/test_map_in_map_user.c
-1
samples/bpf/test_map_in_map_user.c
-1
samples/bpf/test_overhead_user.c
-1
samples/bpf/test_overhead_user.c
-1
samples/bpf/tracex2_user.c
-1
samples/bpf/tracex2_user.c
-1
samples/bpf/tracex3_user.c
-1
samples/bpf/tracex3_user.c
-1
samples/bpf/tracex4_user.c
-1
samples/bpf/tracex4_user.c
-1
samples/bpf/tracex5_user.c
-1
samples/bpf/tracex5_user.c
-1
samples/bpf/tracex6_user.c
-1
samples/bpf/tracex6_user.c
-1
samples/bpf/xdp1_user.c
-1
samples/bpf/xdp1_user.c
-1
samples/bpf/xdp_adjust_tail_user.c
-1
samples/bpf/xdp_adjust_tail_user.c
-1
samples/bpf/xdp_monitor_user.c
-1
samples/bpf/xdp_monitor_user.c
-1
samples/bpf/xdp_redirect_cpu_user.c
-1
samples/bpf/xdp_redirect_cpu_user.c
-1
samples/bpf/xdp_redirect_map_multi_user.c
-1
samples/bpf/xdp_redirect_map_multi_user.c
-1
samples/bpf/xdp_redirect_user.c
-1
samples/bpf/xdp_redirect_user.c
-1
samples/bpf/xdp_router_ipv4_user.c
-1
samples/bpf/xdp_router_ipv4_user.c
-1
samples/bpf/xdp_rxq_info_user.c
-1
samples/bpf/xdp_rxq_info_user.c
-1
samples/bpf/xdp_sample_pkts_user.c
-1
samples/bpf/xdp_sample_pkts_user.c
-1
samples/bpf/xdp_sample_user.c
-1
samples/bpf/xdp_sample_user.c
-1
samples/bpf/xdp_tx_iptunnel_user.c
-1
samples/bpf/xdp_tx_iptunnel_user.c
+2
-7
samples/bpf/xdpsock_user.c
+2
-7
samples/bpf/xdpsock_user.c
···
25
25
#include <string.h>
26
26
#include <sys/capability.h>
27
27
#include <sys/mman.h>
28
-
#include <sys/resource.h>
29
28
#include <sys/socket.h>
30
29
#include <sys/types.h>
31
30
#include <sys/un.h>
···
1885
1886
{
1886
1887
struct __user_cap_header_struct hdr = { _LINUX_CAPABILITY_VERSION_3, 0 };
1887
1888
struct __user_cap_data_struct data[2] = { { 0 } };
1888
-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
1889
1889
bool rx = false, tx = false;
1890
1890
struct sched_param schparam;
1891
1891
struct xsk_umem_info *umem;
···
1915
1917
data[1].effective, data[1].inheritable, data[1].permitted);
1916
1918
}
1917
1919
} else {
1918
-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
1919
-
fprintf(stderr, "ERROR: setrlimit(RLIMIT_MEMLOCK) \"%s\"\n",
1920
-
strerror(errno));
1921
-
exit(EXIT_FAILURE);
1922
-
}
1920
+
/* Use libbpf 1.0 API mode */
1921
+
libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
1923
1922
1924
1923
if (opt_num_xsks > 1)
1925
1924
load_xdp_program(argv, &obj);
+2
-5
samples/bpf/xsk_fwd.c
+2
-5
samples/bpf/xsk_fwd.c
···
10
10
#include <stdlib.h>
11
11
#include <string.h>
12
12
#include <sys/mman.h>
13
-
#include <sys/resource.h>
14
13
#include <sys/socket.h>
15
14
#include <sys/types.h>
16
15
#include <time.h>
···
130
131
bpool_init(struct bpool_params *params,
131
132
struct xsk_umem_config *umem_cfg)
132
133
{
133
-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
134
134
u64 n_slabs, n_slabs_reserved, n_buffers, n_buffers_reserved;
135
135
u64 slabs_size, slabs_reserved_size;
136
136
u64 buffers_size, buffers_reserved_size;
···
138
140
u8 *p;
139
141
int status;
140
142
141
-
/* mmap prep. */
142
-
if (setrlimit(RLIMIT_MEMLOCK, &r))
143
-
return NULL;
143
+
/* Use libbpf 1.0 API mode */
144
+
libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
144
145
145
146
/* bpool internals dimensioning. */
146
147
n_slabs = (params->n_buffers + params->n_buffers_per_slab - 1) /