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

selftests/bpf: Add pairs_redir_to_connected helper 



Extract duplicate code from these four functions

 unix_redir_to_connected()
 udp_redir_to_connected()
 inet_unix_redir_to_connected()
 unix_inet_redir_to_connected()

to generate a new helper pairs_redir_to_connected(). Create the
different socketpairs in these four functions, then pass the
socketpairs info to the new common helper to do the connections.

Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Link: https://lore.kernel.org/r/54bb28dcf764e7d4227ab160883931d2173f4f3d.1696588133.git.geliang.tang@suse.com


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

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

+31 −115
Original line number Diff line number Diff line
@@ -1336,53 +1336,59 @@ static void test_redir(struct test_sockmap_listen *skel, struct bpf_map *map, 
	}

}



static void unix_redir_to_connected(int sotype, int sock_mapfd,

			       int verd_mapfd, enum redir_mode mode)

static void pairs_redir_to_connected(int cli0, int peer0, int cli1, int peer1,

				     int sock_mapfd, int verd_mapfd, enum redir_mode mode)

{

	const char *log_prefix = redir_mode_str(mode);

	int c0, c1, p0, p1;

	unsigned int pass;

	int err, n;

	int sfd[2];

	u32 key;

	char b;



	zero_verdict_count(verd_mapfd);



	if (socketpair(AF_UNIX, sotype | SOCK_NONBLOCK, 0, sfd))

		return;

	c0 = sfd[0], p0 = sfd[1];



	if (socketpair(AF_UNIX, sotype | SOCK_NONBLOCK, 0, sfd))

		goto close0;

	c1 = sfd[0], p1 = sfd[1];



	err = add_to_sockmap(sock_mapfd, p0, p1);

	err = add_to_sockmap(sock_mapfd, peer0, peer1);

	if (err)

		goto close;

		return;



	n = write(c1, "a", 1);

	n = write(cli1, "a", 1);

	if (n < 0)

		FAIL_ERRNO("%s: write", log_prefix);

	if (n == 0)

		FAIL("%s: incomplete write", log_prefix);

	if (n < 1)

		goto close;

		return;



	key = SK_PASS;

	err = xbpf_map_lookup_elem(verd_mapfd, &key, &pass);

	if (err)

		goto close;

		return;

	if (pass != 1)

		FAIL("%s: want pass count 1, have %d", log_prefix, pass);



	n = recv_timeout(mode == REDIR_INGRESS ? p0 : c0, &b, 1, 0, IO_TIMEOUT_SEC);

	n = recv_timeout(mode == REDIR_INGRESS ? peer0 : cli0, &b, 1, 0, IO_TIMEOUT_SEC);

	if (n < 0)

		FAIL_ERRNO("%s: recv_timeout", log_prefix);

	if (n == 0)

		FAIL("%s: incomplete recv", log_prefix);

}



static void unix_redir_to_connected(int sotype, int sock_mapfd,

			       int verd_mapfd, enum redir_mode mode)

{

	int c0, c1, p0, p1;

	int sfd[2];



	if (socketpair(AF_UNIX, sotype | SOCK_NONBLOCK, 0, sfd))

		return;

	c0 = sfd[0], p0 = sfd[1];



	if (socketpair(AF_UNIX, sotype | SOCK_NONBLOCK, 0, sfd))

		goto close0;

	c1 = sfd[0], p1 = sfd[1];



	pairs_redir_to_connected(c0, p0, c1, p1, sock_mapfd, verd_mapfd, mode);



close:

	xclose(c1);

	xclose(p1);

close0:
@@ -1661,14 +1667,8 @@ static int inet_socketpair(int family, int type, int *s, int *c) 
static void udp_redir_to_connected(int family, int sock_mapfd, int verd_mapfd,

				   enum redir_mode mode)

{

	const char *log_prefix = redir_mode_str(mode);

	int c0, c1, p0, p1;

	unsigned int pass;

	int err, n;

	u32 key;

	char b;



	zero_verdict_count(verd_mapfd);

	int err;



	err = inet_socketpair(family, SOCK_DGRAM, &p0, &c0);

	if (err)
@@ -1677,32 +1677,8 @@ static void udp_redir_to_connected(int family, int sock_mapfd, int verd_mapfd, 
	if (err)

		goto close_cli0;



	err = add_to_sockmap(sock_mapfd, p0, p1);

	if (err)

		goto close_cli1;



	n = write(c1, "a", 1);

	if (n < 0)

		FAIL_ERRNO("%s: write", log_prefix);

	if (n == 0)

		FAIL("%s: incomplete write", log_prefix);

	if (n < 1)

		goto close_cli1;



	key = SK_PASS;

	err = xbpf_map_lookup_elem(verd_mapfd, &key, &pass);

	if (err)

		goto close_cli1;

	if (pass != 1)

		FAIL("%s: want pass count 1, have %d", log_prefix, pass);

	pairs_redir_to_connected(c0, p0, c1, p1, sock_mapfd, verd_mapfd, mode);



	n = recv_timeout(mode == REDIR_INGRESS ? p0 : c0, &b, 1, 0, IO_TIMEOUT_SEC);

	if (n < 0)

		FAIL_ERRNO("%s: recv_timeout", log_prefix);

	if (n == 0)

		FAIL("%s: incomplete recv", log_prefix);



close_cli1:

	xclose(c1);

	xclose(p1);

close_cli0:
@@ -1747,15 +1723,9 @@ static void test_udp_redir(struct test_sockmap_listen *skel, struct bpf_map *map 
static void inet_unix_redir_to_connected(int family, int type, int sock_mapfd,

					int verd_mapfd, enum redir_mode mode)

{

	const char *log_prefix = redir_mode_str(mode);

	int c0, c1, p0, p1;

	unsigned int pass;

	int err, n;

	int sfd[2];

	u32 key;

	char b;



	zero_verdict_count(verd_mapfd);

	int err;



	if (socketpair(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0, sfd))

		return;
@@ -1765,32 +1735,8 @@ static void inet_unix_redir_to_connected(int family, int type, int sock_mapfd, 
	if (err)

		goto close;



	err = add_to_sockmap(sock_mapfd, p0, p1);

	if (err)

		goto close_cli1;



	n = write(c1, "a", 1);

	if (n < 0)

		FAIL_ERRNO("%s: write", log_prefix);

	if (n == 0)

		FAIL("%s: incomplete write", log_prefix);

	if (n < 1)

		goto close_cli1;



	key = SK_PASS;

	err = xbpf_map_lookup_elem(verd_mapfd, &key, &pass);

	if (err)

		goto close_cli1;

	if (pass != 1)

		FAIL("%s: want pass count 1, have %d", log_prefix, pass);



	n = recv_timeout(mode == REDIR_INGRESS ? p0 : c0, &b, 1, 0, IO_TIMEOUT_SEC);

	if (n < 0)

		FAIL_ERRNO("%s: recv_timeout", log_prefix);

	if (n == 0)

		FAIL("%s: incomplete recv", log_prefix);

	pairs_redir_to_connected(c0, p0, c1, p1, sock_mapfd, verd_mapfd, mode);



close_cli1:

	xclose(c1);

	xclose(p1);

close:
@@ -1827,15 +1773,9 @@ static void inet_unix_skb_redir_to_connected(struct test_sockmap_listen *skel, 
static void unix_inet_redir_to_connected(int family, int type, int sock_mapfd,

					int verd_mapfd, enum redir_mode mode)

{

	const char *log_prefix = redir_mode_str(mode);

	int c0, c1, p0, p1;

	unsigned int pass;

	int err, n;

	int sfd[2];

	u32 key;

	char b;



	zero_verdict_count(verd_mapfd);

	int err;



	err = inet_socketpair(family, SOCK_DGRAM, &p0, &c0);

	if (err)
@@ -1845,32 +1785,8 @@ static void unix_inet_redir_to_connected(int family, int type, int sock_mapfd, 
		goto close_cli0;

	c1 = sfd[0], p1 = sfd[1];



	err = add_to_sockmap(sock_mapfd, p0, p1);

	if (err)

		goto close;



	n = write(c1, "a", 1);

	if (n < 0)

		FAIL_ERRNO("%s: write", log_prefix);

	if (n == 0)

		FAIL("%s: incomplete write", log_prefix);

	if (n < 1)

		goto close;



	key = SK_PASS;

	err = xbpf_map_lookup_elem(verd_mapfd, &key, &pass);

	if (err)

		goto close;

	if (pass != 1)

		FAIL("%s: want pass count 1, have %d", log_prefix, pass);



	n = recv_timeout(mode == REDIR_INGRESS ? p0 : c0, &b, 1, 0, IO_TIMEOUT_SEC);

	if (n < 0)

		FAIL_ERRNO("%s: recv_timeout", log_prefix);

	if (n == 0)

		FAIL("%s: incomplete recv", log_prefix);

	pairs_redir_to_connected(c0, p0, c1, p1, sock_mapfd, verd_mapfd, mode);



close:

	xclose(c1);

	xclose(p1);

close_cli0: