Commit cbdb1461 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

selftests/bpf: Use explicit bpf_prog_test_load() calls everywhere 



-Dbpf_prog_load_deprecated=bpf_prog_test_load trick is both ugly and
breaks when deprecation goes into effect due to macro magic. Convert all
the uses to explicit bpf_prog_test_load() calls which avoid deprecation
errors and makes everything less magical.

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarDave Marchevsky <davemarchevsky@fb.com>
Link: https://lore.kernel.org/bpf/20211103220845.2676888-12-andrii@kernel.org
parent f87c1930

tools/testing/selftests/bpf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ SAN_CFLAGS ?= 
CFLAGS += -g -O0 -rdynamic -Wall $(GENFLAGS) $(SAN_CFLAGS)		\

	  -I$(CURDIR) -I$(INCLUDE_DIR) -I$(GENDIR) -I$(LIBDIR)		\

	  -I$(TOOLSINCDIR) -I$(APIDIR) -I$(OUTPUT)			\

	  -Dbpf_prog_load_deprecated=bpf_prog_test_load			\

	  -Dbpf_load_program=bpf_test_load_program

LDLIBS += -lcap -lelf -lz -lrt -lpthread
@@ -207,6 +206,7 @@ $(OUTPUT)/test_lirc_mode2_user: testing_helpers.o 
$(OUTPUT)/xdping: testing_helpers.o

$(OUTPUT)/flow_dissector_load: testing_helpers.o

$(OUTPUT)/test_maps: testing_helpers.o

$(OUTPUT)/test_verifier: testing_helpers.o



BPFTOOL ?= $(DEFAULT_BPFTOOL)

$(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile)    \

tools/testing/selftests/bpf/flow_dissector_load.h

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


#include <bpf/bpf.h>

#include <bpf/libbpf.h>

#include "testing_helpers.h"



static inline int bpf_flow_load(struct bpf_object **obj,

				const char *path,
@@ -18,7 +19,7 @@ static inline int bpf_flow_load(struct bpf_object **obj, 
	int prog_array_fd;

	int ret, fd, i;



	ret = bpf_prog_load(path, BPF_PROG_TYPE_FLOW_DISSECTOR, obj,

	ret = bpf_prog_test_load(path, BPF_PROG_TYPE_FLOW_DISSECTOR, obj,

			    prog_fd);

	if (ret)

		return ret;

tools/testing/selftests/bpf/get_cgroup_id_user.c

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



#include "cgroup_helpers.h"

#include "testing_helpers.h"

#include "bpf_rlimit.h"



#define CHECK(condition, tag, format...) ({		\
@@ -66,8 +67,8 @@ 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;



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

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

	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;



	cgidmap_fd = bpf_find_map(__func__, obj, "cg_ids");

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void serial_test_bpf_obj_id(void) 
	bzero(zeros, sizeof(zeros));

	for (i = 0; i < nr_iters; i++) {

		now = time(NULL);

		err = bpf_prog_load(file, BPF_PROG_TYPE_RAW_TRACEPOINT,

		err = bpf_prog_test_load(file, BPF_PROG_TYPE_RAW_TRACEPOINT,

				    &objs[i], &prog_fds[i]);

		/* test_obj_id.o is a dumb prog. It should never fail

		 * to load.

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

+4 −4
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void test_fexit_bpf2bpf_common(const char *obj_file, 
	int err, tgt_fd, i;

	struct btf *btf;



	err = bpf_prog_load(target_obj_file, BPF_PROG_TYPE_UNSPEC,

	err = bpf_prog_test_load(target_obj_file, BPF_PROG_TYPE_UNSPEC,

			    &tgt_obj, &tgt_fd);

	if (!ASSERT_OK(err, "tgt_prog_load"))

		return;
@@ -224,7 +224,7 @@ static int test_second_attach(struct bpf_object *obj) 
	if (CHECK(!prog, "find_prog", "prog %s not found\n", prog_name))

		return -ENOENT;



	err = bpf_prog_load(tgt_obj_file, BPF_PROG_TYPE_UNSPEC,

	err = bpf_prog_test_load(tgt_obj_file, BPF_PROG_TYPE_UNSPEC,

			    &tgt_obj, &tgt_fd);

	if (CHECK(err, "second_prog_load", "file %s err %d errno %d\n",

		  tgt_obj_file, err, errno))
@@ -274,7 +274,7 @@ static void test_fmod_ret_freplace(void) 
	__u32 duration = 0;

	int err, pkt_fd, attach_prog_fd;



	err = bpf_prog_load(tgt_name, BPF_PROG_TYPE_UNSPEC,

	err = bpf_prog_test_load(tgt_name, BPF_PROG_TYPE_UNSPEC,

			    &pkt_obj, &pkt_fd);

	/* the target prog should load fine */

	if (CHECK(err, "tgt_prog_load", "file %s err %d errno %d\n",
@@ -341,7 +341,7 @@ static void test_obj_load_failure_common(const char *obj_file, 
	int err, pkt_fd;

	__u32 duration = 0;



	err = bpf_prog_load(target_obj_file, BPF_PROG_TYPE_UNSPEC,

	err = bpf_prog_test_load(target_obj_file, BPF_PROG_TYPE_UNSPEC,

			    &pkt_obj, &pkt_fd);

	/* the target prog should load fine */

	if (CHECK(err, "tgt_prog_load", "file %s err %d errno %d\n",