Commit b858ba8c authored by Yafang Shao's avatar Yafang Shao Committed by Andrii Nakryiko
Browse files

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: default avatarYafang Shao <laoar.shao@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220409125958.92629-3-laoar.shao@gmail.com
parent b25acdaf

tools/testing/selftests/bpf/bench.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <fcntl.h>

#include <pthread.h>

#include <sys/sysinfo.h>

#include <sys/resource.h>

#include <signal.h>

#include "bench.h"

#include "testing_helpers.h"

tools/testing/selftests/bpf/bpf_rlimit.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
#include <sys/resource.h>

#include <stdio.h>



static  __attribute__((constructor)) void bpf_rlimit_ctor(void)

{

	struct rlimit rlim_old, rlim_new = {

		.rlim_cur	= RLIM_INFINITY,

		.rlim_max	= RLIM_INFINITY,

	};



	getrlimit(RLIMIT_MEMLOCK, &rlim_old);

	/* For the sake of running the test cases, we temporarily

	 * set rlimit to infinity in order for kernel to focus on

	 * errors from actual test cases and not getting noise

	 * from hitting memlock limits. The limit is on per-process

	 * basis and not a global one, hence destructor not really

	 * needed here.

	 */

	if (setrlimit(RLIMIT_MEMLOCK, &rlim_new) < 0) {

		perror("Unable to lift memlock rlimit");

		/* Trying out lower limit, but expect potential test

		 * case failures from this!

		 */

		rlim_new.rlim_cur = rlim_old.rlim_cur + (1UL << 20);

		rlim_new.rlim_max = rlim_old.rlim_max + (1UL << 20);

		setrlimit(RLIMIT_MEMLOCK, &rlim_new);

	}

}

tools/testing/selftests/bpf/flow_dissector_load.c

+2 −4
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <bpf/bpf.h>

#include <bpf/libbpf.h>



#include "bpf_rlimit.h"

#include "flow_dissector_load.h"



const char *cfg_pin_path = "/sys/fs/bpf/flow_dissector";
@@ -25,9 +24,8 @@ static void load_and_attach_program(void) 
	int prog_fd, ret;

	struct bpf_object *obj;



	ret = libbpf_set_strict_mode(LIBBPF_STRICT_ALL);

	if (ret)

		error(1, 0, "failed to enable libbpf strict mode: %d", ret);

	/* Use libbpf 1.0 API mode */

	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);



	ret = bpf_flow_load(&obj, cfg_path_name, cfg_prog_name,

			    cfg_map_name, NULL, &prog_fd, NULL);

tools/testing/selftests/bpf/get_cgroup_id_user.c

+3 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


#include "cgroup_helpers.h"

#include "testing_helpers.h"

#include "bpf_rlimit.h"



#define CHECK(condition, tag, format...) ({		\

	int __ret = !!(condition);			\
@@ -67,6 +66,9 @@ int main(int argc, char **argv) 
	if (CHECK(cgroup_fd < 0, "cgroup_setup_and_join", "err %d errno %d\n", cgroup_fd, errno))

		return 1;



	/* Use libbpf 1.0 API mode */

	libbpf_set_strict_mode(LIBBPF_STRICT_ALL);



	err = bpf_prog_test_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj, &prog_fd);

	if (CHECK(err, "bpf_prog_test_load", "err %d errno %d\n", err, errno))

		goto cleanup_cgroup_env;

tools/testing/selftests/bpf/prog_tests/btf.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/filter.h>

#include <linux/unistd.h>

#include <bpf/bpf.h>

#include <sys/resource.h>

#include <libelf.h>

#include <gelf.h>

#include <string.h>