Commit 6459838a authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'mptcp-socket-option-updates' 

Mat Martineau says:

====================
mptcp: Socket option updates

Patches 1 and 3 refactor a recent socket option helper function for more
generic use, and make use of it in a couple of places.

Patch 2 adds TCP_FASTOPEN_NO_COOKIE functionality to MPTCP sockets,
similar to TCP_FASTOPEN_CONNECT support recently added in v6.1
====================

Link: https://lore.kernel.org/r/20221022004505.160988-1-mathew.j.martineau@linux.intel.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 818a2604 caea6467

net/mptcp/sockopt.c

+14 −20
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ static bool mptcp_supported_sockopt(int level, int optname) 
		case TCP_TX_DELAY:

		case TCP_INQ:

		case TCP_FASTOPEN_CONNECT:

		case TCP_FASTOPEN_NO_COOKIE:

			return true;

		}
@@ -568,8 +569,8 @@ 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_NO_COOKIE,

		 * are not supported fastopen is currently unsupported

		/* TCP_FASTOPEN_KEY, TCP_FASTOPEN are not supported because

		 * fastopen for the listener side is currently unsupported

		 */

	}

	return false;
@@ -757,29 +758,17 @@ static int mptcp_setsockopt_v4(struct mptcp_sock *msk, int optname, 
	return -EOPNOTSUPP;

}



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

					  unsigned int optlen)

{

	struct socket *listener;



	listener = __mptcp_nmpc_socket(msk);

	if (!listener)

		return 0; /* TCP_DEFER_ACCEPT does not fail */



	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)

static int mptcp_setsockopt_first_sf_only(struct mptcp_sock *msk, int level, int optname,

					  sockptr_t optval, unsigned int optlen)

{

	struct socket *sock;



	/* Limit to first subflow */

	/* Limit to first subflow, before the connection establishment */

	sock = __mptcp_nmpc_socket(msk);

	if (!sock)

		return -EINVAL;



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

	return tcp_setsockopt(sock->sk, level, optname, optval, optlen);

}



static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname,
@@ -809,9 +798,13 @@ static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname, 
	case TCP_NODELAY:

		return mptcp_setsockopt_sol_tcp_nodelay(msk, optval, optlen);

	case TCP_DEFER_ACCEPT:

		return mptcp_setsockopt_sol_tcp_defer(msk, optval, optlen);

		/* See tcp.c: TCP_DEFER_ACCEPT does not fail */

		mptcp_setsockopt_first_sf_only(msk, SOL_TCP, optname, optval, optlen);

		return 0;

	case TCP_FASTOPEN_CONNECT:

		return mptcp_setsockopt_sol_tcp_fastopen_connect(msk, optval, optlen);

	case TCP_FASTOPEN_NO_COOKIE:

		return mptcp_setsockopt_first_sf_only(msk, SOL_TCP, optname,

						      optval, optlen);

	}



	return -EOPNOTSUPP;
@@ -1174,6 +1167,7 @@ static int mptcp_getsockopt_sol_tcp(struct mptcp_sock *msk, int optname, 
	case TCP_CC_INFO:

	case TCP_DEFER_ACCEPT:

	case TCP_FASTOPEN_CONNECT:

	case TCP_FASTOPEN_NO_COOKIE:

		return mptcp_getsockopt_first_sf_only(msk, SOL_TCP, optname,

						      optval, optlen);

	case TCP_INQ: