Commit 89f97118 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mptcp-more-socket-options' 



Mat Martineau says:

====================
mptcp: More socket option support

These patches add MPTCP socket support for a few additional socket
options: IP_TOS, IP_FREEBIND, IP_TRANSPARENT, IPV6_FREEBIND, and
IPV6_TRANSPARENT.

Patch 1 exposes __ip_sock_set_tos() for use in patch 2.

Patch 2 adds IP_TOS support.

Patches 3 and 4 add the freebind and transparent support, with a
selftest for the latter.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 979594c5 5fb62e9c

include/net/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -783,5 +783,6 @@ int ip_sock_set_mtu_discover(struct sock *sk, int val); 
void ip_sock_set_pktinfo(struct sock *sk);

void ip_sock_set_recverr(struct sock *sk);

void ip_sock_set_tos(struct sock *sk, int val);

void  __ip_sock_set_tos(struct sock *sk, int val);



#endif	/* _IP_H */

net/ipv4/ip_sockglue.c

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len) 
	return err;

}



static void __ip_sock_set_tos(struct sock *sk, int val)

void __ip_sock_set_tos(struct sock *sk, int val)

{

	if (sk->sk_type == SOCK_STREAM) {

		val &= ~INET_ECN_MASK;

net/mptcp/sockopt.c

+105 −1
Original line number Diff line number Diff line
@@ -390,6 +390,8 @@ static int mptcp_setsockopt_v6(struct mptcp_sock *msk, int optname, 


	switch (optname) {

	case IPV6_V6ONLY:

	case IPV6_TRANSPARENT:

	case IPV6_FREEBIND:

		lock_sock(sk);

		ssock = __mptcp_nmpc_socket(msk);

		if (!ssock) {
@@ -398,8 +400,24 @@ static int mptcp_setsockopt_v6(struct mptcp_sock *msk, int optname, 
		}



		ret = tcp_setsockopt(ssock->sk, SOL_IPV6, optname, optval, optlen);

		if (ret == 0)

		if (ret != 0) {

			release_sock(sk);

			return ret;

		}



		sockopt_seq_inc(msk);



		switch (optname) {

		case IPV6_V6ONLY:

			sk->sk_ipv6only = ssock->sk->sk_ipv6only;

			break;

		case IPV6_TRANSPARENT:

			inet_sk(sk)->transparent = inet_sk(ssock->sk)->transparent;

			break;

		case IPV6_FREEBIND:

			inet_sk(sk)->freebind = inet_sk(ssock->sk)->freebind;

			break;

		}



		release_sock(sk);

		break;
@@ -598,6 +616,85 @@ static int mptcp_setsockopt_sol_tcp_congestion(struct mptcp_sock *msk, sockptr_t 
	return ret;

}



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

						   sockptr_t optval, unsigned int optlen)

{

	struct sock *sk = (struct sock *)msk;

	struct inet_sock *issk;

	struct socket *ssock;

	int err;



	err = ip_setsockopt(sk, SOL_IP, optname, optval, optlen);

	if (err != 0)

		return err;



	lock_sock(sk);



	ssock = __mptcp_nmpc_socket(msk);

	if (!ssock) {

		release_sock(sk);

		return -EINVAL;

	}



	issk = inet_sk(ssock->sk);



	switch (optname) {

	case IP_FREEBIND:

		issk->freebind = inet_sk(sk)->freebind;

		break;

	case IP_TRANSPARENT:

		issk->transparent = inet_sk(sk)->transparent;

		break;

	default:

		release_sock(sk);

		WARN_ON_ONCE(1);

		return -EOPNOTSUPP;

	}



	sockopt_seq_inc(msk);

	release_sock(sk);

	return 0;

}



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

				       sockptr_t optval, unsigned int optlen)

{

	struct mptcp_subflow_context *subflow;

	struct sock *sk = (struct sock *)msk;

	int err, val;



	err = ip_setsockopt(sk, SOL_IP, optname, optval, optlen);



	if (err != 0)

		return err;



	lock_sock(sk);

	sockopt_seq_inc(msk);

	val = inet_sk(sk)->tos;

	mptcp_for_each_subflow(msk, subflow) {

		struct sock *ssk = mptcp_subflow_tcp_sock(subflow);



		__ip_sock_set_tos(ssk, val);

	}

	release_sock(sk);



	return err;

}



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

			       sockptr_t optval, unsigned int optlen)

{

	switch (optname) {

	case IP_FREEBIND:

	case IP_TRANSPARENT:

		return mptcp_setsockopt_sol_ip_set_transparent(msk, optname, optval, optlen);

	case IP_TOS:

		return mptcp_setsockopt_v4_set_tos(msk, optname, optval, optlen);

	}



	return -EOPNOTSUPP;

}



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

				    sockptr_t optval, unsigned int optlen)

{
@@ -637,6 +734,9 @@ int mptcp_setsockopt(struct sock *sk, int level, int optname, 
	if (ssk)

		return tcp_setsockopt(ssk, level, optname, optval, optlen);



	if (level == SOL_IP)

		return mptcp_setsockopt_v4(msk, optname, optval, optlen);



	if (level == SOL_IPV6)

		return mptcp_setsockopt_v6(msk, optname, optval, optlen);
@@ -1003,6 +1103,7 @@ static void sync_socket_options(struct mptcp_sock *msk, struct sock *ssk) 
	ssk->sk_priority = sk->sk_priority;

	ssk->sk_bound_dev_if = sk->sk_bound_dev_if;

	ssk->sk_incoming_cpu = sk->sk_incoming_cpu;

	__ip_sock_set_tos(ssk, inet_sk(sk)->tos);



	if (sk->sk_userlocks & tx_rx_locks) {

		ssk->sk_userlocks |= sk->sk_userlocks & tx_rx_locks;
@@ -1028,6 +1129,9 @@ static void sync_socket_options(struct mptcp_sock *msk, struct sock *ssk) 


	if (inet_csk(sk)->icsk_ca_ops != inet_csk(ssk)->icsk_ca_ops)

		tcp_set_congestion_control(ssk, msk->ca_name, false, true);



	inet_sk(ssk)->transparent = inet_sk(sk)->transparent;

	inet_sk(ssk)->freebind = inet_sk(sk)->freebind;

}



static void __mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk)

net/mptcp/subflow.c

+2 −1
Original line number Diff line number Diff line
@@ -1425,6 +1425,8 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, 
	if (addr.ss_family == AF_INET6)

		addrlen = sizeof(struct sockaddr_in6);

#endif

	mptcp_sockopt_sync(msk, ssk);



	ssk->sk_bound_dev_if = ifindex;

	err = kernel_bind(sf, (struct sockaddr *)&addr, addrlen);

	if (err)
@@ -1441,7 +1443,6 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, 
	mptcp_info2sockaddr(remote, &addr, ssk->sk_family);



	mptcp_add_pending_subflow(msk, subflow);

	mptcp_sockopt_sync(msk, ssk);

	err = kernel_connect(sf, (struct sockaddr *)&addr, addrlen, O_NONBLOCK);

	if (err && err != -EINPROGRESS)

		goto failed_unlink;

tools/testing/selftests/net/mptcp/config

+6 −2
Original line number Diff line number Diff line
@@ -13,5 +13,9 @@ CONFIG_NFT_COUNTER=m 
CONFIG_NFT_COMPAT=m

CONFIG_NETFILTER_XTABLES=m

CONFIG_NETFILTER_XT_MATCH_BPF=m

CONFIG_NF_TABLES_IPV4=y

CONFIG_NF_TABLES_IPV6=y
 
CONFIG_NF_TABLES_INET=y

CONFIG_NFT_TPROXY=m

CONFIG_NFT_SOCKET=m

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IPV6_MULTIPLE_TABLES=y