Commit e1ee5a48 authored by Geliang Tang's avatar Geliang Tang Committed by Andrii Nakryiko
Browse files

selftests/bpf: Drop must_fail from network_helper_opts 



The struct member "must_fail" of network_helper_opts() is only used in
cgroup_v1v2 tests, it makes sense to drop it from network_helper_opts.

Return value (fd) of connect_to_fd_opts() and the expect errno (EPERM)
can be checked in cgroup_v1v2.c directly, no need to check them in
connect_fd_to_addr() in network_helpers.c.

This also makes connect_fd_to_addr() function useless. It can be replaced
by connect().

Suggested-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/3faf336019a9a48e2e8951f4cdebf19e3ac6e441.1721282219.git.tanggeliang@kylinos.cn


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parent a63507f3

tools/testing/selftests/bpf/network_helpers.c

+8 −34
Original line number Diff line number Diff line
@@ -277,33 +277,6 @@ int client_socket(int family, int type, 
	return -1;

}



static int connect_fd_to_addr(int fd,

			      const struct sockaddr_storage *addr,

			      socklen_t addrlen, const bool must_fail)

{

	int ret;



	errno = 0;

	ret = connect(fd, (const struct sockaddr *)addr, addrlen);

	if (must_fail) {

		if (!ret) {

			log_err("Unexpected success to connect to server");

			return -1;

		}

		if (errno != EPERM) {

			log_err("Unexpected error from connect to server");

			return -1;

		}

	} else {

		if (ret) {

			log_err("Failed to connect to server");

			return -1;

		}

	}



	return 0;

}



int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addrlen,

		    const struct network_helper_opts *opts)

{
@@ -318,16 +291,15 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t add 
		return -1;

	}



	if (connect_fd_to_addr(fd, addr, addrlen, opts->must_fail))

		goto error_close;



	return fd;



error_close:

	if (connect(fd, (const struct sockaddr *)addr, addrlen)) {

		log_err("Failed to connect to server");

		save_errno_close(fd);

		return -1;

	}



	return fd;

}



int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts)

{

	struct sockaddr_storage addr;
@@ -383,8 +355,10 @@ int connect_fd_to_fd(int client_fd, int server_fd, int timeout_ms) 
		return -1;

	}



	if (connect_fd_to_addr(client_fd, &addr, len, false))

	if (connect(client_fd, (const struct sockaddr *)&addr, len)) {

		log_err("Failed to connect to server");

		return -1;

	}



	return 0;

}

tools/testing/selftests/bpf/network_helpers.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ typedef __u16 __sum16; 


struct network_helper_opts {

	int timeout_ms;

	bool must_fail;

	int proto;

	/* +ve: Passed to listen() as-is.

	 *   0: Default when the test does not set

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

+8 −6
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 


static int run_test(int cgroup_fd, int server_fd, bool classid)

{

	struct network_helper_opts opts = {

		.must_fail = true,

	};

	struct connect4_dropper *skel;

	int fd, err = 0;
@@ -32,11 +29,16 @@ static int run_test(int cgroup_fd, int server_fd, bool classid) 
		goto out;

	}



	fd = connect_to_fd_opts(server_fd, &opts);

	if (fd < 0)

	errno = 0;

	fd = connect_to_fd_opts(server_fd, NULL);

	if (fd >= 0) {

		log_err("Unexpected success to connect to server");

		err = -1;

	else

		close(fd);

	} else if (errno != EPERM) {

		log_err("Unexpected errno from connect to server");

		err = -1;

	}

out:

	connect4_dropper__destroy(skel);

	return err;