Commit 14fc6fcd authored by Geliang Tang's avatar Geliang Tang Committed by Martin KaFai Lau
Browse files

selftests/bpf: Use start_server_str in sk_lookup 



This patch uses public helper start_server_str() to simplify make_server()
in prog_tests/sk_lookup.c.

Add a callback setsockopts() to do all sockopts, set it to post_socket_cb
pointer of struct network_helper_opts. And add a new struct cb_opts to save
the data needed to pass to the callback. Then pass this network_helper_opts
to start_server_str().

Also use ASSERT_OK_FD() to check fd returned by start_server_str().

Acked-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/5981539f5591d2c4998c962ef2bf45f34c940548.1720515893.git.tanggeliang@kylinos.cn


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent adae187e

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

+34 −24
Original line number Diff line number Diff line
@@ -77,6 +77,12 @@ struct test { 
	bool reuseport_has_conns; /* Add a connected socket to reuseport group */

};



struct cb_opts {

	int family;

	int sotype;

	bool reuseport;

};



static __u32 duration;		/* for CHECK macro */



static bool is_ipv6(const char *ip)
@@ -142,19 +148,14 @@ static int make_socket(int sotype, const char *ip, int port, 
	return fd;

}



static int make_server(int sotype, const char *ip, int port,

		       struct bpf_program *reuseport_prog)

static int setsockopts(int fd, void *opts)

{

	struct sockaddr_storage addr = {0};

	struct cb_opts *co = (struct cb_opts *)opts;

	const int one = 1;

	int err, fd = -1;



	fd = make_socket(sotype, ip, port, &addr);

	if (fd < 0)

		return -1;

	int err = 0;



	/* Enabled for UDPv6 sockets for IPv4-mapped IPv6 to work. */

	if (sotype == SOCK_DGRAM) {

	if (co->sotype == SOCK_DGRAM) {

		err = setsockopt(fd, SOL_IP, IP_RECVORIGDSTADDR, &one,

				 sizeof(one));

		if (CHECK(err, "setsockopt(IP_RECVORIGDSTADDR)", "failed\n")) {
@@ -163,7 +164,7 @@ static int make_server(int sotype, const char *ip, int port, 
		}

	}



	if (sotype == SOCK_DGRAM && addr.ss_family == AF_INET6) {

	if (co->sotype == SOCK_DGRAM && co->family == AF_INET6) {

		err = setsockopt(fd, SOL_IPV6, IPV6_RECVORIGDSTADDR, &one,

				 sizeof(one));

		if (CHECK(err, "setsockopt(IPV6_RECVORIGDSTADDR)", "failed\n")) {
@@ -172,7 +173,7 @@ static int make_server(int sotype, const char *ip, int port, 
		}

	}



	if (sotype == SOCK_STREAM) {

	if (co->sotype == SOCK_STREAM) {

		err = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one,

				 sizeof(one));

		if (CHECK(err, "setsockopt(SO_REUSEADDR)", "failed\n")) {
@@ -181,7 +182,7 @@ static int make_server(int sotype, const char *ip, int port, 
		}

	}



	if (reuseport_prog) {

	if (co->reuseport) {

		err = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &one,

				 sizeof(one));

		if (CHECK(err, "setsockopt(SO_REUSEPORT)", "failed\n")) {
@@ -190,19 +191,28 @@ static int make_server(int sotype, const char *ip, int port, 
		}

	}



	err = bind(fd, (void *)&addr, inetaddr_len(&addr));

	if (CHECK(err, "bind", "failed\n")) {

		log_err("failed to bind listen socket");

		goto fail;

fail:

	return err;

}



	if (sotype == SOCK_STREAM) {

		err = listen(fd, SOMAXCONN);

		if (CHECK(err, "make_server", "listen")) {

			log_err("failed to listen on port %d", port);

			goto fail;

		}

	}

static int make_server(int sotype, const char *ip, int port,

		       struct bpf_program *reuseport_prog)

{

	struct cb_opts cb_opts = {

		.family = is_ipv6(ip) ? AF_INET6 : AF_INET,

		.sotype = sotype,

		.reuseport = reuseport_prog,

	};

	struct network_helper_opts opts = {

		.backlog	= SOMAXCONN,

		.post_socket_cb = setsockopts,

		.cb_opts	= &cb_opts,

	};

	int err, fd;



	fd = start_server_str(cb_opts.family, sotype, ip, port, &opts);

	if (!ASSERT_OK_FD(fd, "start_server_str"))

		return -1;



	/* Late attach reuseport prog so we can have one init path */

	if (reuseport_prog) {