Commit 7395724b authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Alexei Starovoitov
Browse files

selftests: bpf: break up test_progs - pkt access 



Move pkt access prog tests into separate files.

Signed-off-by: default avatarStanislav Fomichev <sdf@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 3f306588

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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <test_progs.h>



void test_pkt_access(void)

{

	const char *file = "./test_pkt_access.o";

	struct bpf_object *obj;

	__u32 duration, retval;

	int err, prog_fd;



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

	if (err) {

		error_cnt++;

		return;

	}



	err = bpf_prog_test_run(prog_fd, 100000, &pkt_v4, sizeof(pkt_v4),

				NULL, NULL, &retval, &duration);

	CHECK(err || retval, "ipv4",

	      "err %d errno %d retval %d duration %d\n",

	      err, errno, retval, duration);



	err = bpf_prog_test_run(prog_fd, 100000, &pkt_v6, sizeof(pkt_v6),

				NULL, NULL, &retval, &duration);

	CHECK(err || retval, "ipv6",

	      "err %d errno %d retval %d duration %d\n",

	      err, errno, retval, duration);

	bpf_object__close(obj);

}

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

0 → 100644
+24 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <test_progs.h>



void test_pkt_md_access(void)

{

	const char *file = "./test_pkt_md_access.o";

	struct bpf_object *obj;

	__u32 duration, retval;

	int err, prog_fd;



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

	if (err) {

		error_cnt++;

		return;

	}



	err = bpf_prog_test_run(prog_fd, 10, &pkt_v4, sizeof(pkt_v4),

				NULL, NULL, &retval, &duration);

	CHECK(err || retval, "",

	      "err %d errno %d retval %d duration %d\n",

	      err, errno, retval, duration);



	bpf_object__close(obj);

}

tools/testing/selftests/bpf/test_progs.c

+0 −51
Original line number Diff line number Diff line
@@ -40,33 +40,6 @@ int bpf_find_map(const char *test, struct bpf_object *obj, const char *name) 
	return bpf_map__fd(map);

}



static void test_pkt_access(void)

{

	const char *file = "./test_pkt_access.o";

	struct bpf_object *obj;

	__u32 duration, retval;

	int err, prog_fd;



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

	if (err) {

		error_cnt++;

		return;

	}



	err = bpf_prog_test_run(prog_fd, 100000, &pkt_v4, sizeof(pkt_v4),

				NULL, NULL, &retval, &duration);

	CHECK(err || retval, "ipv4",

	      "err %d errno %d retval %d duration %d\n",

	      err, errno, retval, duration);



	err = bpf_prog_test_run(prog_fd, 100000, &pkt_v6, sizeof(pkt_v6),

				NULL, NULL, &retval, &duration);

	CHECK(err || retval, "ipv6",

	      "err %d errno %d retval %d duration %d\n",

	      err, errno, retval, duration);

	bpf_object__close(obj);

}



static void test_prog_run_xattr(void)

{

	const char *file = "./test_pkt_access.o";
@@ -648,28 +621,6 @@ static void test_bpf_obj_id(void) 
		bpf_object__close(objs[i]);

}



static void test_pkt_md_access(void)

{

	const char *file = "./test_pkt_md_access.o";

	struct bpf_object *obj;

	__u32 duration, retval;

	int err, prog_fd;



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

	if (err) {

		error_cnt++;

		return;

	}



	err = bpf_prog_test_run(prog_fd, 10, &pkt_v4, sizeof(pkt_v4),

				NULL, NULL, &retval, &duration);

	CHECK(err || retval, "",

	      "err %d errno %d retval %d duration %d\n",

	      err, errno, retval, duration);



	bpf_object__close(obj);

}



static void test_obj_name(void)

{

	struct {
@@ -2095,7 +2046,6 @@ int main(void) 
#define CALL

#include <prog_tests/tests.h>

#undef CALL

	test_pkt_access();

	test_prog_run_xattr();

	test_xdp();

	test_xdp_adjust_tail();
@@ -2103,7 +2053,6 @@ int main(void) 
	test_xdp_noinline();

	test_tcp_estats();

	test_bpf_obj_id();

	test_pkt_md_access();

	test_obj_name();

	test_tp_attach_query();

	test_stacktrace_map();