Skip to content

Commit 83f58da

Browse files
rgushchinkernel-patches-bot
rgushchin
authored and
kernel-patches-bot
committed
bpf: samples: do not touch RLIMIT_MEMLOCK
Since bpf is not using rlimit memlock for the memory accounting and control, do not change the limit in sample applications. Signed-off-by: Roman Gushchin <[email protected]> Acked-by: Song Liu <[email protected]>
1 parent 60b1ebe commit 83f58da

27 files changed

+0
-132
lines changed

‎samples/bpf/map_perf_test_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ static void fixup_map(struct bpf_object *obj)
421421

422422
int main(int argc, char **argv)
423423
{
424-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
425424
int nr_cpus = sysconf(_SC_NPROCESSORS_ONLN);
426425
struct bpf_link *links[8];
427426
struct bpf_program *prog;
@@ -430,11 +429,6 @@ int main(int argc, char **argv)
430429
char filename[256];
431430
int i = 0;
432431

433-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
434-
perror("setrlimit(RLIMIT_MEMLOCK)");
435-
return 1;
436-
}
437-
438432
if (argc > 1)
439433
test_flags = atoi(argv[1]) ? : test_flags;
440434

‎samples/bpf/offwaketime_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,12 @@ static void int_exit(int sig)
9595

9696
int main(int argc, char **argv)
9797
{
98-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
9998
struct bpf_object *obj = NULL;
10099
struct bpf_link *links[2];
101100
struct bpf_program *prog;
102101
int delay = 1, i = 0;
103102
char filename[256];
104103

105-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
106-
perror("setrlimit(RLIMIT_MEMLOCK)");
107-
return 1;
108-
}
109-
110104
if (load_kallsyms()) {
111105
printf("failed to process /proc/kallsyms\n");
112106
return 2;

‎samples/bpf/sockex2_user.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@ struct pair {
1616

1717
int main(int ac, char **argv)
1818
{
19-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
2019
struct bpf_object *obj;
2120
int map_fd, prog_fd;
2221
char filename[256];
2322
int i, sock;
2423
FILE *f;
2524

2625
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
27-
setrlimit(RLIMIT_MEMLOCK, &r);
2826

2927
if (bpf_prog_load(filename, BPF_PROG_TYPE_SOCKET_FILTER,
3028
&obj, &prog_fd))

‎samples/bpf/sockex3_user.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ struct pair {
2626
int main(int argc, char **argv)
2727
{
2828
int i, sock, key, fd, main_prog_fd, jmp_table_fd, hash_map_fd;
29-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
3029
struct bpf_program *prog;
3130
struct bpf_object *obj;
3231
const char *section;
3332
char filename[256];
3433
FILE *f;
3534

3635
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
37-
setrlimit(RLIMIT_MEMLOCK, &r);
3836

3937
obj = bpf_object__open_file(filename, NULL);
4038
if (libbpf_get_error(obj)) {

‎samples/bpf/spintest_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
int main(int ac, char **argv)
1212
{
13-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
1413
char filename[256], symbol[256];
1514
struct bpf_object *obj = NULL;
1615
struct bpf_link *links[20];
@@ -20,11 +19,6 @@ int main(int ac, char **argv)
2019
const char *section;
2120
struct ksym *sym;
2221

23-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
24-
perror("setrlimit(RLIMIT_MEMLOCK)");
25-
return 1;
26-
}
27-
2822
if (load_kallsyms()) {
2923
printf("failed to process /proc/kallsyms\n");
3024
return 2;

‎samples/bpf/syscall_tp_user.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ static int test(char *filename, int num_progs)
115115

116116
int main(int argc, char **argv)
117117
{
118-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
119118
int opt, num_progs = 1;
120119
char filename[256];
121120

@@ -131,7 +130,6 @@ int main(int argc, char **argv)
131130
}
132131
}
133132

134-
setrlimit(RLIMIT_MEMLOCK, &r);
135133
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
136134

137135
return test(filename, num_progs);

‎samples/bpf/task_fd_query_user.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -290,16 +290,11 @@ static int test_debug_fs_uprobe(char *binary_path, long offset, bool is_return)
290290

291291
int main(int argc, char **argv)
292292
{
293-
struct rlimit r = {1024*1024, RLIM_INFINITY};
294293
extern char __executable_start;
295294
char filename[256], buf[256];
296295
__u64 uprobe_file_offset;
297296

298297
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
299-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
300-
perror("setrlimit(RLIMIT_MEMLOCK)");
301-
return 1;
302-
}
303298

304299
if (load_kallsyms()) {
305300
printf("failed to process /proc/kallsyms\n");

‎samples/bpf/test_lru_dist.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@ static void test_parallel_lru_loss(int map_type, int map_flags, int nr_tasks)
489489

490490
int main(int argc, char **argv)
491491
{
492-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
493492
int map_flags[] = {0, BPF_F_NO_COMMON_LRU};
494493
const char *dist_file;
495494
int nr_tasks = 1;
@@ -508,8 +507,6 @@ int main(int argc, char **argv)
508507

509508
setbuf(stdout, NULL);
510509

511-
assert(!setrlimit(RLIMIT_MEMLOCK, &r));
512-
513510
srand(time(NULL));
514511

515512
nr_cpus = bpf_num_possible_cpus();

‎samples/bpf/test_map_in_map_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,11 @@ static void test_map_in_map(void)
114114

115115
int main(int argc, char **argv)
116116
{
117-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
118117
struct bpf_link *link = NULL;
119118
struct bpf_program *prog;
120119
struct bpf_object *obj;
121120
char filename[256];
122121

123-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
124-
perror("setrlimit(RLIMIT_MEMLOCK)");
125-
return 1;
126-
}
127-
128122
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
129123
obj = bpf_object__open_file(filename, NULL);
130124
if (libbpf_get_error(obj)) {

‎samples/bpf/test_overhead_user.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,10 @@ static void unload_progs(void)
125125

126126
int main(int argc, char **argv)
127127
{
128-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
129128
char filename[256];
130129
int num_cpu = 8;
131130
int test_flags = ~0;
132131

133-
setrlimit(RLIMIT_MEMLOCK, &r);
134132

135133
if (argc > 1)
136134
test_flags = atoi(argv[1]) ? : test_flags;

‎samples/bpf/trace_event_user.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,13 +294,11 @@ static void test_bpf_perf_event(void)
294294

295295
int main(int argc, char **argv)
296296
{
297-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
298297
struct bpf_object *obj = NULL;
299298
char filename[256];
300299
int error = 1;
301300

302301
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
303-
setrlimit(RLIMIT_MEMLOCK, &r);
304302

305303
signal(SIGINT, err_exit);
306304
signal(SIGTERM, err_exit);

‎samples/bpf/tracex2_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ static void int_exit(int sig)
116116

117117
int main(int ac, char **argv)
118118
{
119-
struct rlimit r = {1024*1024, RLIM_INFINITY};
120119
long key, next_key, value;
121120
struct bpf_link *links[2];
122121
struct bpf_program *prog;
@@ -125,11 +124,6 @@ int main(int ac, char **argv)
125124
int i, j = 0;
126125
FILE *f;
127126

128-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
129-
perror("setrlimit(RLIMIT_MEMLOCK)");
130-
return 1;
131-
}
132-
133127
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
134128
obj = bpf_object__open_file(filename, NULL);
135129
if (libbpf_get_error(obj)) {

‎samples/bpf/tracex3_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ static void print_hist(int fd)
107107

108108
int main(int ac, char **argv)
109109
{
110-
struct rlimit r = {1024*1024, RLIM_INFINITY};
111110
struct bpf_link *links[2];
112111
struct bpf_program *prog;
113112
struct bpf_object *obj;
@@ -127,11 +126,6 @@ int main(int ac, char **argv)
127126
}
128127
}
129128

130-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
131-
perror("setrlimit(RLIMIT_MEMLOCK)");
132-
return 1;
133-
}
134-
135129
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
136130
obj = bpf_object__open_file(filename, NULL);
137131
if (libbpf_get_error(obj)) {

‎samples/bpf/tracex4_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,12 @@ static void print_old_objects(int fd)
4848

4949
int main(int ac, char **argv)
5050
{
51-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
5251
struct bpf_link *links[2];
5352
struct bpf_program *prog;
5453
struct bpf_object *obj;
5554
char filename[256];
5655
int map_fd, i, j = 0;
5756

58-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
59-
perror("setrlimit(RLIMIT_MEMLOCK, RLIM_INFINITY)");
60-
return 1;
61-
}
62-
6357
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
6458
obj = bpf_object__open_file(filename, NULL);
6559
if (libbpf_get_error(obj)) {

‎samples/bpf/tracex5_user.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ static void install_accept_all_seccomp(void)
3434

3535
int main(int ac, char **argv)
3636
{
37-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
3837
struct bpf_link *link = NULL;
3938
struct bpf_program *prog;
4039
struct bpf_object *obj;
@@ -43,8 +42,6 @@ int main(int ac, char **argv)
4342
char filename[256];
4443
FILE *f;
4544

46-
setrlimit(RLIMIT_MEMLOCK, &r);
47-
4845
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
4946
obj = bpf_object__open_file(filename, NULL);
5047
if (libbpf_get_error(obj)) {

‎samples/bpf/tracex6_user.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,12 @@ static void test_bpf_perf_event(void)
175175

176176
int main(int argc, char **argv)
177177
{
178-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
179178
struct bpf_link *links[2];
180179
struct bpf_program *prog;
181180
struct bpf_object *obj;
182181
char filename[256];
183182
int i = 0;
184183

185-
setrlimit(RLIMIT_MEMLOCK, &r);
186-
187184
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
188185
obj = bpf_object__open_file(filename, NULL);
189186
if (libbpf_get_error(obj)) {

‎samples/bpf/xdp1_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ static void usage(const char *prog)
7979

8080
int main(int argc, char **argv)
8181
{
82-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
8382
struct bpf_prog_load_attr prog_load_attr = {
8483
.prog_type = BPF_PROG_TYPE_XDP,
8584
};
@@ -117,11 +116,6 @@ int main(int argc, char **argv)
117116
return 1;
118117
}
119118

120-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
121-
perror("setrlimit(RLIMIT_MEMLOCK)");
122-
return 1;
123-
}
124-
125119
ifindex = if_nametoindex(argv[optind]);
126120
if (!ifindex) {
127121
perror("if_nametoindex");

‎samples/bpf/xdp_adjust_tail_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ static void usage(const char *cmd)
8282

8383
int main(int argc, char **argv)
8484
{
85-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
8685
struct bpf_prog_load_attr prog_load_attr = {
8786
.prog_type = BPF_PROG_TYPE_XDP,
8887
};
@@ -143,11 +142,6 @@ int main(int argc, char **argv)
143142
}
144143
}
145144

146-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
147-
perror("setrlimit(RLIMIT_MEMLOCK, RLIM_INFINITY)");
148-
return 1;
149-
}
150-
151145
if (!ifindex) {
152146
fprintf(stderr, "Invalid ifname\n");
153147
return 1;

‎samples/bpf/xdp_monitor_user.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,6 @@ static void print_bpf_prog_info(void)
687687

688688
int main(int argc, char **argv)
689689
{
690-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
691690
struct bpf_program *prog;
692691
int longindex = 0, opt;
693692
int ret = EXIT_FAILURE;
@@ -719,10 +718,6 @@ int main(int argc, char **argv)
719718
}
720719

721720
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
722-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
723-
perror("setrlimit(RLIMIT_MEMLOCK)");
724-
return ret;
725-
}
726721

727722
/* Remove tracepoint program when program is interrupted or killed */
728723
signal(SIGINT, int_exit);

‎samples/bpf/xdp_redirect_cpu_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,6 @@ static int load_cpumap_prog(char *file_name, char *prog_name,
765765

766766
int main(int argc, char **argv)
767767
{
768-
struct rlimit r = {10 * 1024 * 1024, RLIM_INFINITY};
769768
char *prog_name = "xdp_cpu_map5_lb_hash_ip_pairs";
770769
char *mprog_filename = "xdp_redirect_kern.o";
771770
char *redir_interface = NULL, *redir_map = NULL;
@@ -804,11 +803,6 @@ int main(int argc, char **argv)
804803
snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
805804
prog_load_attr.file = filename;
806805

807-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
808-
perror("setrlimit(RLIMIT_MEMLOCK)");
809-
return 1;
810-
}
811-
812806
if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))
813807
return err;
814808

‎samples/bpf/xdp_redirect_map_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ static void usage(const char *prog)
9696

9797
int main(int argc, char **argv)
9898
{
99-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
10099
struct bpf_prog_load_attr prog_load_attr = {
101100
.prog_type = BPF_PROG_TYPE_XDP,
102101
};
@@ -135,11 +134,6 @@ int main(int argc, char **argv)
135134
return 1;
136135
}
137136

138-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
139-
perror("setrlimit(RLIMIT_MEMLOCK)");
140-
return 1;
141-
}
142-
143137
ifindex_in = if_nametoindex(argv[optind]);
144138
if (!ifindex_in)
145139
ifindex_in = strtoul(argv[optind], NULL, 0);

‎samples/bpf/xdp_redirect_user.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ static void usage(const char *prog)
9797

9898
int main(int argc, char **argv)
9999
{
100-
struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
101100
struct bpf_prog_load_attr prog_load_attr = {
102101
.prog_type = BPF_PROG_TYPE_XDP,
103102
};
@@ -136,11 +135,6 @@ int main(int argc, char **argv)
136135
return 1;
137136
}
138137

139-
if (setrlimit(RLIMIT_MEMLOCK, &r)) {
140-
perror("setrlimit(RLIMIT_MEMLOCK)");
141-
return 1;
142-
}
143-
144138
ifindex_in = if_nametoindex(argv[optind]);
145139
if (!ifindex_in)
146140
ifindex_in = strtoul(argv[optind], NULL, 0);

0 commit comments

Comments
 (0)