Commit 8039d353 authored by Nicolas Rybowski's avatar Nicolas Rybowski Committed by Andrii Nakryiko
Browse files

selftests/bpf: Add MPTCP test base 



This patch adds a base for MPTCP specific tests.

It is currently limited to the is_mptcp field in case of plain TCP
connection because there is no easy way to get the subflow sk from a msk
in userspace. This implies that we cannot lookup the sk_storage attached
to the subflow sk in the sockops program.

v4:
 - add copyright 2022 (Andrii)
 - use ASSERT_* instead of CHECK_FAIL (Andrii)
 - drop SEC("version") (Andrii)
 - use is_mptcp in tcp_sock, instead of bpf_tcp_sock (Martin & Andrii)

v5:
 - Drop connect_to_mptcp_fd (Martin)
 - Use BPF test skeleton (Andrii)
 - Use ASSERT_EQ (Andrii)
 - Drop the 'msg' parameter of verify_sk

Co-developed-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Signed-off-by: default avatarNicolas Rybowski <nicolas.rybowski@tessares.net>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Link: https://lore.kernel.org/bpf/20220519233016.105670-4-mathew.j.martineau@linux.intel.com
parent d3294cb1

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -13780,6 +13780,7 @@ F: include/net/mptcp.h 
F:	include/trace/events/mptcp.h

F:	include/uapi/linux/mptcp.h

F:	net/mptcp/

F:	tools/testing/selftests/bpf/*/*mptcp*.c

F:	tools/testing/selftests/net/mptcp/









NETWORKING [TCP]
































tools/testing/selftests/bpf/bpf_tcp_helpers.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -81,6 +81,7 @@ struct tcp_sock {







	__u32	lsndtime;









	__u32	prior_cwnd;









	__u64	tcp_mstamp;	/* most recent packet received/sent */









	bool	is_mptcp;









} __attribute__((preserve_access_index));



















static __always_inline struct inet_connection_sock *inet_csk(const struct sock *sk)
































tools/testing/selftests/bpf/config



+1
−0






























Original line number
Diff line number
Diff line







@@ -56,3 +56,4 @@ CONFIG_USERFAULTFD=y







CONFIG_FPROBE=y









CONFIG_IKCONFIG=y









CONFIG_IKCONFIG_PROC=y









CONFIG_MPTCP=y
























tools/testing/selftests/bpf/network_helpers.c



+31
−9






























Original line number
Diff line number
Diff line







@@ -21,6 +21,10 @@







#include "network_helpers.h"









#include "test_progs.h"



















#ifndef IPPROTO_MPTCP









#define IPPROTO_MPTCP 262









#endif



















#define clean_errno() (errno == 0 ? "None" : strerror(errno))









#define log_err(MSG, ...) ({						\









			int __save = errno;				\








@@ -73,13 +77,13 @@ int settimeo(int fd, int timeout_ms)

















#define save_errno_close(fd) ({ int __save = errno; close(fd); errno = __save; })



















static int __start_server(int type, const struct sockaddr *addr,









static int __start_server(int type, int protocol, const struct sockaddr *addr,









			  socklen_t addrlen, int timeout_ms, bool reuseport)









{









	int on = 1;









	int fd;



















	fd = socket(addr->sa_family, type, 0);









	fd = socket(addr->sa_family, type, protocol);









	if (fd < 0) {









		log_err("Failed to create server socket");









		return -1;








@@ -113,8 +117,8 @@ static int __start_server(int type, const struct sockaddr *addr,







	return -1;









}



















int start_server(int family, int type, const char *addr_str, __u16 port,









		 int timeout_ms)









static int start_server_proto(int family, int type, int protocol,









			      const char *addr_str, __u16 port, int timeout_ms)









{









	struct sockaddr_storage addr;









	socklen_t addrlen;








@@ -122,10 +126,23 @@ int start_server(int family, int type, const char *addr_str, __u16 port,







	if (make_sockaddr(family, addr_str, port, &addr, &addrlen))









		return -1;



















	return __start_server(type, (struct sockaddr *)&addr,









	return __start_server(type, protocol, (struct sockaddr *)&addr,









			      addrlen, timeout_ms, false);









}



















int start_server(int family, int type, const char *addr_str, __u16 port,









		 int timeout_ms)









{









	return start_server_proto(family, type, 0, addr_str, port, timeout_ms);









}



















int start_mptcp_server(int family, const char *addr_str, __u16 port,









		       int timeout_ms)









{









	return start_server_proto(family, SOCK_STREAM, IPPROTO_MPTCP, addr_str,









				  port, timeout_ms);









}



















int *start_reuseport_server(int family, int type, const char *addr_str,









			    __u16 port, int timeout_ms, unsigned int nr_listens)









{








@@ -144,7 +161,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,







	if (!fds)









		return NULL;



















	fds[0] = __start_server(type, (struct sockaddr *)&addr, addrlen,









	fds[0] = __start_server(type, 0, (struct sockaddr *)&addr, addrlen,









				timeout_ms, true);









	if (fds[0] == -1)









		goto close_fds;








@@ -154,7 +171,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,







		goto close_fds;



















	for (; nr_fds < nr_listens; nr_fds++) {









		fds[nr_fds] = __start_server(type, (struct sockaddr *)&addr,









		fds[nr_fds] = __start_server(type, 0, (struct sockaddr *)&addr,









					     addrlen, timeout_ms, true);









		if (fds[nr_fds] == -1)









			goto close_fds;








@@ -247,7 +264,7 @@ int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts)







	struct sockaddr_storage addr;









	struct sockaddr_in *addr_in;









	socklen_t addrlen, optlen;









	int fd, type;









	int fd, type, protocol;



















	if (!opts)









		opts = &default_opts;








@@ -258,6 +275,11 @@ int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts)







		return -1;









	}



















	if (getsockopt(server_fd, SOL_SOCKET, SO_PROTOCOL, &protocol, &optlen)) {









		log_err("getsockopt(SOL_PROTOCOL)");









		return -1;









	}



















	addrlen = sizeof(addr);









	if (getsockname(server_fd, (struct sockaddr *)&addr, &addrlen)) {









		log_err("Failed to get server addr");








@@ -265,7 +287,7 @@ int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts)







	}



















	addr_in = (struct sockaddr_in *)&addr;









	fd = socket(addr_in->sin_family, type, 0);









	fd = socket(addr_in->sin_family, type, protocol);









	if (fd < 0) {









		log_err("Failed to create client socket");









		return -1;
































tools/testing/selftests/bpf/network_helpers.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -42,6 +42,8 @@ extern struct ipv6_packet pkt_v6;







int settimeo(int fd, int timeout_ms);









int start_server(int family, int type, const char *addr, __u16 port,









		 int timeout_ms);









int start_mptcp_server(int family, const char *addr, __u16 port,









		       int timeout_ms);









int *start_reuseport_server(int family, int type, const char *addr_str,









			    __u16 port, int timeout_ms,









			    unsigned int nr_listens);