Unverified Commit d4b25743 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9371 MPTCP Upstream part 11 

Merge Pull Request from: @geliangtang 
 
mptcp: cleanup and support more ephemeral ports sockopts

Patch 1 is a cleanup one: mptcp_is_tcpsk() helper was modifying sock_ops
in some cases which is unexpected with that name.

Patch 2 to 4 add support for two socket options: IP_LOCAL_PORT_RANGE and
IP_BIND_ADDRESS_NO_PORT. The first one is a preparation patch, the
second one adds the support while the last one modifies an existing
selftest to validate the new features.
 
 
Link:https://gitee.com/openeuler/kernel/pulls/9371

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 498497b4 c2def959

net/mptcp/sockopt.c

+24 −4
Original line number Diff line number Diff line
@@ -440,6 +440,8 @@ static bool mptcp_supported_sockopt(int level, int optname) 
		/* should work fine */

		case IP_FREEBIND:

		case IP_TRANSPARENT:

		case IP_BIND_ADDRESS_NO_PORT:

		case IP_LOCAL_PORT_RANGE:



		/* the following are control cmsg related */

		case IP_PKTINFO:
@@ -455,7 +457,6 @@ static bool mptcp_supported_sockopt(int level, int optname) 
		/* common stuff that need some love */

		case IP_TOS:

		case IP_TTL:

		case IP_BIND_ADDRESS_NO_PORT:

		case IP_MTU_DISCOVER:

		case IP_RECVERR:
@@ -683,7 +684,7 @@ static int mptcp_setsockopt_sol_tcp_nodelay(struct mptcp_sock *msk, sockptr_t op 
	return 0;

}



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

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

				       sockptr_t optval, unsigned int optlen)

{

	struct sock *sk = (struct sock *)msk;
@@ -710,6 +711,14 @@ static int mptcp_setsockopt_sol_ip_set_transparent(struct mptcp_sock *msk, int o 
		inet_assign_bit(TRANSPARENT, ssk,

				inet_test_bit(TRANSPARENT, sk));

		break;

	case IP_BIND_ADDRESS_NO_PORT:

		inet_assign_bit(BIND_ADDRESS_NO_PORT, ssk,

				inet_test_bit(BIND_ADDRESS_NO_PORT, sk));

		break;

	case IP_LOCAL_PORT_RANGE:

		WRITE_ONCE(inet_sk(ssk)->local_port_range,

			   READ_ONCE(inet_sk(sk)->local_port_range));

		break;

	default:

		release_sock(sk);

		WARN_ON_ONCE(1);
@@ -755,7 +764,9 @@ static int mptcp_setsockopt_v4(struct mptcp_sock *msk, int optname, 
	switch (optname) {

	case IP_FREEBIND:

	case IP_TRANSPARENT:

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

	case IP_BIND_ADDRESS_NO_PORT:

	case IP_LOCAL_PORT_RANGE:

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

	case IP_TOS:

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

	}
@@ -1350,6 +1361,13 @@ static int mptcp_getsockopt_v4(struct mptcp_sock *msk, int optname, 
	switch (optname) {

	case IP_TOS:

		return mptcp_put_int_option(msk, optval, optlen, READ_ONCE(inet_sk(sk)->tos));

	case IP_BIND_ADDRESS_NO_PORT:

		return mptcp_put_int_option(msk, optval, optlen,

				inet_test_bit(BIND_ADDRESS_NO_PORT, sk));

	case IP_LOCAL_PORT_RANGE:

		return mptcp_put_int_option(msk, optval, optlen,

				READ_ONCE(inet_sk(sk)->local_port_range).hi << 16 |

				READ_ONCE(inet_sk(sk)->local_port_range).lo);

	}



	return -EOPNOTSUPP;
@@ -1450,6 +1468,8 @@ static void sync_socket_options(struct mptcp_sock *msk, struct sock *ssk) 


	inet_assign_bit(TRANSPARENT, ssk, inet_test_bit(TRANSPARENT, sk));

	inet_assign_bit(FREEBIND, ssk, inet_test_bit(FREEBIND, sk));

	inet_assign_bit(BIND_ADDRESS_NO_PORT, ssk, inet_test_bit(BIND_ADDRESS_NO_PORT, sk));

	WRITE_ONCE(inet_sk(ssk)->local_port_range, READ_ONCE(inet_sk(sk)->local_port_range));

}



void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk)

tools/testing/selftests/net/ip_local_port_range.c

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 
#define IP_LOCAL_PORT_RANGE 51

#endif



#ifndef IPPROTO_MPTCP

#define IPPROTO_MPTCP 262

#endif



static __u32 pack_port_range(__u16 lo, __u16 hi)

{

	return (hi << 16) | (lo << 0);
@@ -146,6 +150,12 @@ FIXTURE_VARIANT_ADD(ip_local_port_range, ip4_stcp) { 
	.so_protocol	= IPPROTO_SCTP,

};



FIXTURE_VARIANT_ADD(ip_local_port_range, ip4_mptcp) {

	.so_domain	= AF_INET,

	.so_type	= SOCK_STREAM,

	.so_protocol	= IPPROTO_MPTCP,

};



FIXTURE_VARIANT_ADD(ip_local_port_range, ip6_tcp) {

	.so_domain	= AF_INET6,

	.so_type	= SOCK_STREAM,
@@ -164,6 +174,12 @@ FIXTURE_VARIANT_ADD(ip_local_port_range, ip6_stcp) { 
	.so_protocol	= IPPROTO_SCTP,

};



FIXTURE_VARIANT_ADD(ip_local_port_range, ip6_mptcp) {

	.so_domain	= AF_INET6,

	.so_type	= SOCK_STREAM,

	.so_protocol	= IPPROTO_MPTCP,

};



TEST_F(ip_local_port_range, invalid_option_value)

{

	__u16 val16;

tools/testing/selftests/net/mptcp/mptcp_join.sh

+41 −5
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ unset FAILING_LINKS 
unset test_linkfail

unset addr_nr_ns1

unset addr_nr_ns2

unset cestab_ns1

unset cestab_ns2

unset sflags

unset fastclose

unset fullmesh
@@ -974,6 +976,34 @@ pm_nl_set_endpoint() 
	fi

}



chk_cestab_nr()

{

	local ns=$1

	local cestab=$2

	local count



	print_check "cestab $cestab"

	count=$(mptcp_lib_get_counter ${ns} "MPTcpExtMPCurrEstab")

	if [ -z "$count" ]; then

		print_skip

	elif [ "$count" != "$cestab" ]; then

		fail_test "got $count current establish[s] expected $cestab"

	else

		print_ok

	fi

}



# $1 namespace 1, $2 namespace 2

check_cestab()

{

	if [ -n "${cestab_ns1}" ]; then

		chk_cestab_nr ${1} ${cestab_ns1}

	fi

	if [ -n "${cestab_ns2}" ]; then

		chk_cestab_nr ${2} ${cestab_ns2}

	fi

}



do_transfer()

{

	local listener_ns="$1"
@@ -1087,6 +1117,7 @@ do_transfer() 
	local cpid=$!



	pm_nl_set_endpoint $listener_ns $connector_ns $connect_addr

	check_cestab $listener_ns $connector_ns



	wait $cpid

	local retc=$?
@@ -2475,47 +2506,52 @@ add_tests() 
	if reset "add single subflow"; then

		pm_nl_set_limits $ns1 0 1

		pm_nl_set_limits $ns2 0 1

		addr_nr_ns2=1 speed=slow \

		addr_nr_ns2=1 speed=slow cestab_ns2=1 \

			run_tests $ns1 $ns2 10.0.1.1

		chk_join_nr 1 1 1

		chk_cestab_nr $ns2 0

	fi



	# add signal address

	if reset "add signal address"; then

		pm_nl_set_limits $ns1 0 1

		pm_nl_set_limits $ns2 1 1

		addr_nr_ns1=1 speed=slow \

		addr_nr_ns1=1 speed=slow cestab_ns1=1 \

			run_tests $ns1 $ns2 10.0.1.1

		chk_join_nr 1 1 1

		chk_add_nr 1 1

		chk_cestab_nr $ns1 0

	fi



	# add multiple subflows

	if reset "add multiple subflows"; then

		pm_nl_set_limits $ns1 0 2

		pm_nl_set_limits $ns2 0 2

		addr_nr_ns2=2 speed=slow \

		addr_nr_ns2=2 speed=slow cestab_ns2=1 \

			run_tests $ns1 $ns2 10.0.1.1

		chk_join_nr 2 2 2

		chk_cestab_nr $ns2 0

	fi



	# add multiple subflows IPv6

	if reset "add multiple subflows IPv6"; then

		pm_nl_set_limits $ns1 0 2

		pm_nl_set_limits $ns2 0 2

		addr_nr_ns2=2 speed=slow \

		addr_nr_ns2=2 speed=slow cestab_ns2=1 \

			run_tests $ns1 $ns2 dead:beef:1::1

		chk_join_nr 2 2 2

		chk_cestab_nr $ns2 0

	fi



	# add multiple addresses IPv6

	if reset "add multiple addresses IPv6"; then

		pm_nl_set_limits $ns1 0 2

		pm_nl_set_limits $ns2 2 2

		addr_nr_ns1=2 speed=slow \

		addr_nr_ns1=2 speed=slow cestab_ns1=1 \

			run_tests $ns1 $ns2 dead:beef:1::1

		chk_join_nr 2 2 2

		chk_add_nr 2 2

		chk_cestab_nr $ns1 0

	fi

}