Commit 8526f0d6 authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

Merge branch 'bpf/selftests: convert some tests to ASSERT_* macros' 



Wang Yufen says:

====================

Convert some tests to use the preferred ASSERT_* macros instead of the
deprecated CHECK().
====================

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents aa55dfd3 1fddca3d

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

+33 −54
Original line number Diff line number Diff line
@@ -27,21 +27,21 @@ static int connected_socket_v4(void) 
	int s, repair, err;



	s = socket(AF_INET, SOCK_STREAM, 0);

	if (CHECK_FAIL(s == -1))

	if (!ASSERT_GE(s, 0, "socket"))

		goto error;



	repair = TCP_REPAIR_ON;

	err = setsockopt(s, SOL_TCP, TCP_REPAIR, &repair, sizeof(repair));

	if (CHECK_FAIL(err))

	if (!ASSERT_OK(err, "setsockopt(TCP_REPAIR)"))

		goto error;



	err = connect(s, (struct sockaddr *)&addr, len);

	if (CHECK_FAIL(err))

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

		goto error;



	repair = TCP_REPAIR_OFF_NO_WP;

	err = setsockopt(s, SOL_TCP, TCP_REPAIR, &repair, sizeof(repair));

	if (CHECK_FAIL(err))

	if (!ASSERT_OK(err, "setsockopt(TCP_REPAIR)"))

		goto error;



	return s;
@@ -54,7 +54,7 @@ static int connected_socket_v4(void) 
static void compare_cookies(struct bpf_map *src, struct bpf_map *dst)

{

	__u32 i, max_entries = bpf_map__max_entries(src);

	int err, duration = 0, src_fd, dst_fd;

	int err, src_fd, dst_fd;



	src_fd = bpf_map__fd(src);

	dst_fd = bpf_map__fd(dst);
@@ -65,20 +65,18 @@ static void compare_cookies(struct bpf_map *src, struct bpf_map *dst) 
		err = bpf_map_lookup_elem(src_fd, &i, &src_cookie);

		if (err && errno == ENOENT) {

			err = bpf_map_lookup_elem(dst_fd, &i, &dst_cookie);

			CHECK(!err, "map_lookup_elem(dst)", "element %u not deleted\n", i);

			CHECK(err && errno != ENOENT, "map_lookup_elem(dst)", "%s\n",

			      strerror(errno));

			ASSERT_ERR(err, "map_lookup_elem(dst)");

			ASSERT_EQ(errno, ENOENT, "map_lookup_elem(dst)");

			continue;

		}

		if (CHECK(err, "lookup_elem(src)", "%s\n", strerror(errno)))

		if (!ASSERT_OK(err, "lookup_elem(src)"))

			continue;



		err = bpf_map_lookup_elem(dst_fd, &i, &dst_cookie);

		if (CHECK(err, "lookup_elem(dst)", "%s\n", strerror(errno)))

		if (!ASSERT_OK(err, "lookup_elem(dst)"))

			continue;



		CHECK(dst_cookie != src_cookie, "cookie mismatch",

		      "%llu != %llu (pos %u)\n", dst_cookie, src_cookie, i);

		ASSERT_EQ(dst_cookie, src_cookie, "cookie mismatch");

	}

}
@@ -89,20 +87,16 @@ static void test_sockmap_create_update_free(enum bpf_map_type map_type) 
	int s, map, err;



	s = connected_socket_v4();

	if (CHECK_FAIL(s < 0))

	if (!ASSERT_GE(s, 0, "connected_socket_v4"))

		return;



	map = bpf_map_create(map_type, NULL, sizeof(int), sizeof(int), 1, NULL);

	if (CHECK_FAIL(map < 0)) {

		perror("bpf_cmap_create");

	if (!ASSERT_GE(map, 0, "bpf_map_create"))

		goto out;

	}



	err = bpf_map_update_elem(map, &zero, &s, BPF_NOEXIST);

	if (CHECK_FAIL(err)) {

		perror("bpf_map_update");

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

		goto out;

	}



out:

	close(map);
@@ -115,32 +109,26 @@ static void test_skmsg_helpers(enum bpf_map_type map_type) 
	int err, map, verdict;



	skel = test_skmsg_load_helpers__open_and_load();

	if (CHECK_FAIL(!skel)) {

		perror("test_skmsg_load_helpers__open_and_load");

	if (!ASSERT_OK_PTR(skel, "test_skmsg_load_helpers__open_and_load"))

		return;

	}



	verdict = bpf_program__fd(skel->progs.prog_msg_verdict);

	map = bpf_map__fd(skel->maps.sock_map);



	err = bpf_prog_attach(verdict, map, BPF_SK_MSG_VERDICT, 0);

	if (CHECK_FAIL(err)) {

		perror("bpf_prog_attach");

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

		goto out;

	}



	err = bpf_prog_detach2(verdict, map, BPF_SK_MSG_VERDICT);

	if (CHECK_FAIL(err)) {

		perror("bpf_prog_detach2");

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

		goto out;

	}

out:

	test_skmsg_load_helpers__destroy(skel);

}



static void test_sockmap_update(enum bpf_map_type map_type)

{

	int err, prog, src, duration = 0;

	int err, prog, src;

	struct test_sockmap_update *skel;

	struct bpf_map *dst_map;

	const __u32 zero = 0;
@@ -153,11 +141,11 @@ static void test_sockmap_update(enum bpf_map_type map_type) 
	__s64 sk;



	sk = connected_socket_v4();

	if (CHECK(sk == -1, "connected_socket_v4", "cannot connect\n"))

	if (!ASSERT_NEQ(sk, -1, "connected_socket_v4"))

		return;



	skel = test_sockmap_update__open_and_load();

	if (CHECK(!skel, "open_and_load", "cannot load skeleton\n"))

	if (!ASSERT_OK_PTR(skel, "open_and_load"))

		goto close_sk;



	prog = bpf_program__fd(skel->progs.copy_sock_map);
@@ -168,7 +156,7 @@ static void test_sockmap_update(enum bpf_map_type map_type) 
		dst_map = skel->maps.dst_sock_hash;



	err = bpf_map_update_elem(src, &zero, &sk, BPF_NOEXIST);

	if (CHECK(err, "update_elem(src)", "errno=%u\n", errno))

	if (!ASSERT_OK(err, "update_elem(src)"))

		goto out;



	err = bpf_prog_test_run_opts(prog, &topts);
@@ -188,17 +176,16 @@ static void test_sockmap_update(enum bpf_map_type map_type) 
static void test_sockmap_invalid_update(void)

{

	struct test_sockmap_invalid_update *skel;

	int duration = 0;



	skel = test_sockmap_invalid_update__open_and_load();

	if (CHECK(skel, "open_and_load", "verifier accepted map_update\n"))

	if (!ASSERT_NULL(skel, "open_and_load"))

		test_sockmap_invalid_update__destroy(skel);

}



static void test_sockmap_copy(enum bpf_map_type map_type)

{

	DECLARE_LIBBPF_OPTS(bpf_iter_attach_opts, opts);

	int err, len, src_fd, iter_fd, duration = 0;

	int err, len, src_fd, iter_fd;

	union bpf_iter_link_info linfo = {};

	__u32 i, num_sockets, num_elems;

	struct bpf_iter_sockmap *skel;
@@ -208,7 +195,7 @@ static void test_sockmap_copy(enum bpf_map_type map_type) 
	char buf[64];



	skel = bpf_iter_sockmap__open_and_load();

	if (CHECK(!skel, "bpf_iter_sockmap__open_and_load", "skeleton open_and_load failed\n"))

	if (!ASSERT_OK_PTR(skel, "bpf_iter_sockmap__open_and_load"))

		return;



	if (map_type == BPF_MAP_TYPE_SOCKMAP) {
@@ -222,7 +209,7 @@ static void test_sockmap_copy(enum bpf_map_type map_type) 
	}



	sock_fd = calloc(num_sockets, sizeof(*sock_fd));

	if (CHECK(!sock_fd, "calloc(sock_fd)", "failed to allocate\n"))

	if (!ASSERT_OK_PTR(sock_fd, "calloc(sock_fd)"))

		goto out;



	for (i = 0; i < num_sockets; i++)
@@ -232,11 +219,11 @@ static void test_sockmap_copy(enum bpf_map_type map_type) 


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

		sock_fd[i] = connected_socket_v4();

		if (CHECK(sock_fd[i] == -1, "connected_socket_v4", "cannot connect\n"))

		if (!ASSERT_NEQ(sock_fd[i], -1, "connected_socket_v4"))

			goto out;



		err = bpf_map_update_elem(src_fd, &i, &sock_fd[i], BPF_NOEXIST);

		if (CHECK(err, "map_update", "failed: %s\n", strerror(errno)))

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

			goto out;

	}
@@ -248,22 +235,20 @@ static void test_sockmap_copy(enum bpf_map_type map_type) 
		goto out;



	iter_fd = bpf_iter_create(bpf_link__fd(link));

	if (CHECK(iter_fd < 0, "create_iter", "create_iter failed\n"))

	if (!ASSERT_GE(iter_fd, 0, "create_iter"))

		goto free_link;



	/* do some tests */

	while ((len = read(iter_fd, buf, sizeof(buf))) > 0)

		;

	if (CHECK(len < 0, "read", "failed: %s\n", strerror(errno)))

	if (!ASSERT_GE(len, 0, "read"))

		goto close_iter;



	/* test results */

	if (CHECK(skel->bss->elems != num_elems, "elems", "got %u expected %u\n",

		  skel->bss->elems, num_elems))

	if (!ASSERT_EQ(skel->bss->elems, num_elems, "elems"))

		goto close_iter;



	if (CHECK(skel->bss->socks != num_sockets, "socks", "got %u expected %u\n",

		  skel->bss->socks, num_sockets))

	if (!ASSERT_EQ(skel->bss->socks, num_sockets, "socks"))

		goto close_iter;



	compare_cookies(src, skel->maps.dst);
@@ -288,28 +273,22 @@ static void test_sockmap_skb_verdict_attach(enum bpf_attach_type first, 
	int err, map, verdict;



	skel = test_sockmap_skb_verdict_attach__open_and_load();

	if (CHECK_FAIL(!skel)) {

		perror("test_sockmap_skb_verdict_attach__open_and_load");

	if (!ASSERT_OK_PTR(skel, "open_and_load"))

		return;

	}



	verdict = bpf_program__fd(skel->progs.prog_skb_verdict);

	map = bpf_map__fd(skel->maps.sock_map);



	err = bpf_prog_attach(verdict, map, first, 0);

	if (CHECK_FAIL(err)) {

		perror("bpf_prog_attach");

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

		goto out;

	}



	err = bpf_prog_attach(verdict, map, second, 0);

	ASSERT_EQ(err, -EBUSY, "prog_attach_fail");



	err = bpf_prog_detach2(verdict, map, first);

	if (CHECK_FAIL(err)) {

		perror("bpf_prog_detach2");

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

		goto out;

	}

out:

	test_sockmap_skb_verdict_attach__destroy(skel);

}

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

+10 −29
Original line number Diff line number Diff line
@@ -15,16 +15,12 @@ static int tcp_server(int family) 
	int err, s;



	s = socket(family, SOCK_STREAM, 0);

	if (CHECK_FAIL(s == -1)) {

		perror("socket");

	if (!ASSERT_GE(s, 0, "socket"))

		return -1;

	}



	err = listen(s, SOMAXCONN);

	if (CHECK_FAIL(err)) {

		perror("listen");

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

		return -1;

	}



	return s;

}
@@ -48,44 +44,31 @@ static void test_sockmap_ktls_disconnect_after_delete(int family, int map) 
		return;



	err = getsockname(srv, (struct sockaddr *)&addr, &len);

	if (CHECK_FAIL(err)) {

		perror("getsockopt");

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

		goto close_srv;

	}



	cli = socket(family, SOCK_STREAM, 0);

	if (CHECK_FAIL(cli == -1)) {

		perror("socket");

	if (!ASSERT_GE(cli, 0, "socket"))

		goto close_srv;

	}



	err = connect(cli, (struct sockaddr *)&addr, len);

	if (CHECK_FAIL(err)) {

		perror("connect");

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

		goto close_cli;

	}



	err = bpf_map_update_elem(map, &zero, &cli, 0);

	if (CHECK_FAIL(err)) {

		perror("bpf_map_update_elem");

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

		goto close_cli;

	}



	err = setsockopt(cli, IPPROTO_TCP, TCP_ULP, "tls", strlen("tls"));

	if (CHECK_FAIL(err)) {

		perror("setsockopt(TCP_ULP)");

	if (!ASSERT_OK(err, "setsockopt(TCP_ULP)"))

		goto close_cli;

	}



	err = bpf_map_delete_elem(map, &zero);

	if (CHECK_FAIL(err)) {

		perror("bpf_map_delete_elem");

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

		goto close_cli;

	}



	err = disconnect(cli);

	if (CHECK_FAIL(err))

		perror("disconnect");

	ASSERT_OK(err, "disconnect");



close_cli:

	close(cli);
@@ -168,10 +151,8 @@ static void run_tests(int family, enum bpf_map_type map_type) 
	int map;



	map = bpf_map_create(map_type, NULL, sizeof(int), sizeof(int), 1, NULL);

	if (CHECK_FAIL(map < 0)) {

		perror("bpf_map_create");

	if (!ASSERT_GE(map, 0, "bpf_map_create"))

		return;

	}



	if (test__start_subtest(fmt_test_name("disconnect_after_delete", family, map_type)))

		test_sockmap_ktls_disconnect_after_delete(family, map);

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

+2 −2
Original line number Diff line number Diff line
@@ -972,12 +972,12 @@ void test_sockopt(void) 
	int cgroup_fd, i;



	cgroup_fd = test__join_cgroup("/sockopt");

	if (CHECK_FAIL(cgroup_fd < 0))

	if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup"))

		return;



	for (i = 0; i < ARRAY_SIZE(tests); i++) {

		test__start_subtest(tests[i].descr);

		CHECK_FAIL(run_test(cgroup_fd, &tests[i]));

		ASSERT_OK(run_test(cgroup_fd, &tests[i]), tests[i].descr);

	}



	close(cgroup_fd);

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

+13 −17
Original line number Diff line number Diff line
@@ -76,20 +76,16 @@ static void *server_thread(void *arg) 
	pthread_cond_signal(&server_started);

	pthread_mutex_unlock(&server_started_mtx);



	if (CHECK_FAIL(err < 0)) {

		perror("Failed to listed on socket");

	if (!ASSERT_GE(err, 0, "listed on socket"))

		return NULL;

	}



	err += verify_sockopt(fd, CUSTOM_INHERIT1, "listen", 1);

	err += verify_sockopt(fd, CUSTOM_INHERIT2, "listen", 1);

	err += verify_sockopt(fd, CUSTOM_LISTENER, "listen", 1);



	client_fd = accept(fd, (struct sockaddr *)&addr, &len);

	if (CHECK_FAIL(client_fd < 0)) {

		perror("Failed to accept client");

	if (!ASSERT_GE(client_fd, 0, "accept client"))

		return NULL;

	}



	err += verify_sockopt(client_fd, CUSTOM_INHERIT1, "accept", 1);

	err += verify_sockopt(client_fd, CUSTOM_INHERIT2, "accept", 1);
@@ -183,20 +179,20 @@ static void run_test(int cgroup_fd) 
		goto close_bpf_object;



	err = prog_attach(obj, cgroup_fd, "cgroup/getsockopt", "_getsockopt");

	if (CHECK_FAIL(err))

	if (!ASSERT_OK(err, "prog_attach _getsockopt"))

		goto close_bpf_object;



	err = prog_attach(obj, cgroup_fd, "cgroup/setsockopt", "_setsockopt");

	if (CHECK_FAIL(err))

	if (!ASSERT_OK(err, "prog_attach _setsockopt"))

		goto close_bpf_object;



	server_fd = start_server();

	if (CHECK_FAIL(server_fd < 0))

	if (!ASSERT_GE(server_fd, 0, "start_server"))

		goto close_bpf_object;



	pthread_mutex_lock(&server_started_mtx);

	if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread,

				      (void *)&server_fd))) {

	if (!ASSERT_OK(pthread_create(&tid, NULL, server_thread,

				      (void *)&server_fd), "pthread_create")) {

		pthread_mutex_unlock(&server_started_mtx);

		goto close_server_fd;

	}
@@ -204,17 +200,17 @@ static void run_test(int cgroup_fd) 
	pthread_mutex_unlock(&server_started_mtx);



	client_fd = connect_to_server(server_fd);

	if (CHECK_FAIL(client_fd < 0))

	if (!ASSERT_GE(client_fd, 0, "connect_to_server"))

		goto close_server_fd;



	CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_INHERIT1, "connect", 0));

	CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_INHERIT2, "connect", 0));

	CHECK_FAIL(verify_sockopt(client_fd, CUSTOM_LISTENER, "connect", 0));

	ASSERT_OK(verify_sockopt(client_fd, CUSTOM_INHERIT1, "connect", 0), "verify_sockopt1");

	ASSERT_OK(verify_sockopt(client_fd, CUSTOM_INHERIT2, "connect", 0), "verify_sockopt2");

	ASSERT_OK(verify_sockopt(client_fd, CUSTOM_LISTENER, "connect", 0), "verify_sockopt ener");



	pthread_join(tid, &server_err);



	err = (int)(long)server_err;

	CHECK_FAIL(err);

	ASSERT_OK(err, "pthread_join retval");



	close(client_fd);
@@ -229,7 +225,7 @@ void test_sockopt_inherit(void) 
	int cgroup_fd;



	cgroup_fd = test__join_cgroup("/sockopt_inherit");

	if (CHECK_FAIL(cgroup_fd < 0))

	if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup"))

		return;



	run_test(cgroup_fd);

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

+5 −5
Original line number Diff line number Diff line
@@ -303,11 +303,11 @@ void test_sockopt_multi(void) 
	int err = -1;



	cg_parent = test__join_cgroup("/parent");

	if (CHECK_FAIL(cg_parent < 0))

	if (!ASSERT_GE(cg_parent, 0, "join_cgroup /parent"))

		goto out;



	cg_child = test__join_cgroup("/parent/child");

	if (CHECK_FAIL(cg_child < 0))

	if (!ASSERT_GE(cg_child, 0, "join_cgroup /parent/child"))

		goto out;



	obj = bpf_object__open_file("sockopt_multi.bpf.o", NULL);
@@ -319,11 +319,11 @@ void test_sockopt_multi(void) 
		goto out;



	sock_fd = socket(AF_INET, SOCK_STREAM, 0);

	if (CHECK_FAIL(sock_fd < 0))

	if (!ASSERT_GE(sock_fd, 0, "socket"))

		goto out;



	CHECK_FAIL(run_getsockopt_test(obj, cg_parent, cg_child, sock_fd));

	CHECK_FAIL(run_setsockopt_test(obj, cg_parent, cg_child, sock_fd));

	ASSERT_OK(run_getsockopt_test(obj, cg_parent, cg_child, sock_fd), "getsockopt_test");

	ASSERT_OK(run_setsockopt_test(obj, cg_parent, cg_child, sock_fd), "setsockopt_test");



out:

	close(sock_fd);