Commit f870fa0b authored by Mat Martineau's avatar Mat Martineau Committed by David S. Miller
Browse files

mptcp: Add MPTCP socket stubs 



Implements the infrastructure for MPTCP sockets.

MPTCP sockets open one in-kernel TCP socket per subflow. These subflow
sockets are only managed by the MPTCP socket that owns them and are not
visible from userspace. This commit allows a userspace program to open
an MPTCP socket with:

  sock = socket(AF_INET, SOCK_STREAM, IPPROTO_MPTCP);

The resulting socket is simply a wrapper around a single regular TCP
socket, without any of the MPTCP protocol implemented over the wire.

Co-developed-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Co-developed-by: default avatarPeter Krystad <peter.krystad@linux.intel.com>
Signed-off-by: default avatarPeter Krystad <peter.krystad@linux.intel.com>
Co-developed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Co-developed-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarChristoph Paasch <cpaasch@apple.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23f4eacd

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -11583,6 +11583,7 @@ W: https://github.com/multipath-tcp/mptcp_net-next/wiki 
B:	https://github.com/multipath-tcp/mptcp_net-next/issues

S:	Maintained

F:	include/net/mptcp.h

F:	net/mptcp/















NETWORKING [TCP]















M:	Eric Dumazet <edumazet@google.com>

































include/net/mptcp.h



+16
−0






























Original line number
Diff line number
Diff line








@@ -28,6 +28,8 @@ struct mptcp_ext {





























#ifdef CONFIG_MPTCP





























void mptcp_init(void);





























/* move the skb extension owership, with the assumption that 'to' is















 * newly allocated















 */










@@ -70,6 +72,10 @@ static inline bool mptcp_skb_can_collapse(const struct sk_buff *to,





























#else





























static inline void mptcp_init(void)













{













}





























static inline void mptcp_skb_ext_move(struct sk_buff *to,















				      const struct sk_buff *from)















{









@@ -82,4 +88,14 @@ static inline bool mptcp_skb_can_collapse(const struct sk_buff *to,













}































#endif /* CONFIG_MPTCP */



























#if IS_ENABLED(CONFIG_MPTCP_IPV6)













int mptcpv6_init(void);













#elif IS_ENABLED(CONFIG_IPV6)













static inline int mptcpv6_init(void)













{













	return 0;













}













#endif





























#endif /* __NET_MPTCP_H */
























net/Kconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -91,6 +91,7 @@ if INET













source "net/ipv4/Kconfig"















source "net/ipv6/Kconfig"















source "net/netlabel/Kconfig"













source "net/mptcp/Kconfig"































endif # if INET

















































net/Makefile



+1
−0






























Original line number
Diff line number
Diff line








@@ -87,3 +87,4 @@ endif













obj-$(CONFIG_QRTR)		+= qrtr/















obj-$(CONFIG_NET_NCSI)		+= ncsi/















obj-$(CONFIG_XDP_SOCKETS)	+= xdp/













obj-$(CONFIG_MPTCP)		+= mptcp/
























net/ipv4/tcp.c



+2
−0






























Original line number
Diff line number
Diff line








@@ -271,6 +271,7 @@













#include <net/icmp.h>















#include <net/inet_common.h>















#include <net/tcp.h>













#include <net/mptcp.h>















#include <net/xfrm.h>















#include <net/ip.h>















#include <net/sock.h>










@@ -4021,4 +4022,5 @@ void __init tcp_init(void)













	tcp_metrics_init();















	BUG_ON(tcp_register_congestion_control(&tcp_reno) != 0);















	tcp_tasklet_init();













	mptcp_init();















}
































































CRA Git | Maintained and supported by SUSTech CRA and CCSE