Commit 54635bd0 authored by Benjamin Hesmans's avatar Benjamin Hesmans Committed by Jakub Kicinski
Browse files

mptcp: add TCP_FASTOPEN_CONNECT socket option 



Set the option for the first subflow only. For the other subflows TFO
can't be used because a mapping would be needed to cover the data in the
SYN.

Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarBenjamin Hesmans <benjamin.hesmans@tessares.net>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 63a8bf85

net/mptcp/sockopt.c

+18 −1
Original line number Diff line number Diff line
@@ -559,6 +559,7 @@ static bool mptcp_supported_sockopt(int level, int optname) 
		case TCP_NOTSENT_LOWAT:

		case TCP_TX_DELAY:

		case TCP_INQ:

		case TCP_FASTOPEN_CONNECT:

			return true;

		}
@@ -567,7 +568,7 @@ static bool mptcp_supported_sockopt(int level, int optname) 
		/* TCP_REPAIR, TCP_REPAIR_QUEUE, TCP_QUEUE_SEQ, TCP_REPAIR_OPTIONS,

		 * TCP_REPAIR_WINDOW are not supported, better avoid this mess

		 */

		/* TCP_FASTOPEN_KEY, TCP_FASTOPEN TCP_FASTOPEN_CONNECT, TCP_FASTOPEN_NO_COOKIE,

		/* TCP_FASTOPEN_KEY, TCP_FASTOPEN, TCP_FASTOPEN_NO_COOKIE,

		 * are not supported fastopen is currently unsupported

		 */

	}
@@ -768,6 +769,19 @@ static int mptcp_setsockopt_sol_tcp_defer(struct mptcp_sock *msk, sockptr_t optv 
	return tcp_setsockopt(listener->sk, SOL_TCP, TCP_DEFER_ACCEPT, optval, optlen);

}



static int mptcp_setsockopt_sol_tcp_fastopen_connect(struct mptcp_sock *msk, sockptr_t optval,

						     unsigned int optlen)

{

	struct socket *sock;



	/* Limit to first subflow */

	sock = __mptcp_nmpc_socket(msk);

	if (!sock)

		return -EINVAL;



	return tcp_setsockopt(sock->sk, SOL_TCP, TCP_FASTOPEN_CONNECT, optval, optlen);

}



static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname,

				    sockptr_t optval, unsigned int optlen)

{
@@ -796,6 +810,8 @@ static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname, 
		return mptcp_setsockopt_sol_tcp_nodelay(msk, optval, optlen);

	case TCP_DEFER_ACCEPT:

		return mptcp_setsockopt_sol_tcp_defer(msk, optval, optlen);

	case TCP_FASTOPEN_CONNECT:

		return mptcp_setsockopt_sol_tcp_fastopen_connect(msk, optval, optlen);

	}



	return -EOPNOTSUPP;
@@ -1157,6 +1173,7 @@ static int mptcp_getsockopt_sol_tcp(struct mptcp_sock *msk, int optname, 
	case TCP_INFO:

	case TCP_CC_INFO:

	case TCP_DEFER_ACCEPT:

	case TCP_FASTOPEN_CONNECT:

		return mptcp_getsockopt_first_sf_only(msk, SOL_TCP, optname,

						      optval, optlen);

	case TCP_INQ: