Commit 5b0764b2 authored by Roman Gushchin's avatar Roman Gushchin Committed by Alexei Starovoitov
Browse files

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: default avatarRoman Gushchin <guro@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20201201215900.3569844-35-guro@fb.com
parent 3ac1f01b

samples/bpf/map_perf_test_user.c

+0 −6
Original line number Diff line number Diff line
@@ -421,7 +421,6 @@ static void fixup_map(struct bpf_object *obj) 


int main(int argc, char **argv)

{

	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};

	int nr_cpus = sysconf(_SC_NPROCESSORS_ONLN);

	struct bpf_link *links[8];

	struct bpf_program *prog;
@@ -430,11 +429,6 @@ int main(int argc, char **argv) 
	char filename[256];

	int i = 0;



	if (setrlimit(RLIMIT_MEMLOCK, &r)) {

		perror("setrlimit(RLIMIT_MEMLOCK)");

		return 1;

	}



	if (argc > 1)

		test_flags = atoi(argv[1]) ? : test_flags;

samples/bpf/offwaketime_user.c

+0 −6
Original line number Diff line number Diff line
@@ -95,18 +95,12 @@ static void int_exit(int sig) 


int main(int argc, char **argv)

{

	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};

	struct bpf_object *obj = NULL;

	struct bpf_link *links[2];

	struct bpf_program *prog;

	int delay = 1, i = 0;

	char filename[256];



	if (setrlimit(RLIMIT_MEMLOCK, &r)) {

		perror("setrlimit(RLIMIT_MEMLOCK)");

		return 1;

	}



	if (load_kallsyms()) {

		printf("failed to process /proc/kallsyms\n");

		return 2;

samples/bpf/sockex2_user.c

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ struct pair { 


int main(int ac, char **argv)

{

	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};

	struct bpf_object *obj;

	int map_fd, prog_fd;

	char filename[256];
@@ -24,7 +23,6 @@ int main(int ac, char **argv) 
	FILE *f;



	snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);

	setrlimit(RLIMIT_MEMLOCK, &r);



	if (bpf_prog_load(filename, BPF_PROG_TYPE_SOCKET_FILTER,

			  &obj, &prog_fd))

samples/bpf/sockex3_user.c

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ struct pair { 
int main(int argc, char **argv)

{

	int i, sock, key, fd, main_prog_fd, jmp_table_fd, hash_map_fd;

	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};

	struct bpf_program *prog;

	struct bpf_object *obj;

	const char *section;
@@ -34,7 +33,6 @@ int main(int argc, char **argv) 
	FILE *f;



	snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);

	setrlimit(RLIMIT_MEMLOCK, &r);



	obj = bpf_object__open_file(filename, NULL);

	if (libbpf_get_error(obj)) {

samples/bpf/spintest_user.c

+0 −6
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


int main(int ac, char **argv)

{

	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};

	char filename[256], symbol[256];

	struct bpf_object *obj = NULL;

	struct bpf_link *links[20];
@@ -20,11 +19,6 @@ int main(int ac, char **argv) 
	const char *section;

	struct ksym *sym;



	if (setrlimit(RLIMIT_MEMLOCK, &r)) {

		perror("setrlimit(RLIMIT_MEMLOCK)");

		return 1;

	}



	if (load_kallsyms()) {

		printf("failed to process /proc/kallsyms\n");

		return 2;