Commit a1a809c4 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mptcp-add_addr-enhancements' 

Mat Martineau says:

====================
mptcp: ADD_ADDR enhancements

This patch series from the MPTCP tree contains enhancements and
associated tests for the ADD_ADDR ("add address") MPTCP option. This
option allows already-connected MPTCP peers to share additional IP
addresses with each other, which can then be used to create additional
subflows within those MPTCP connections.

Patches 1 & 2 remove duplicated data in the per-connection path manager
structure.

Patches 3-6 initiate additional subflows when an address is added using
the netlink path manager interface and improve ADD_ADDR signaling
reliability, subject to configured limits. Self tests are also updated.

Patches 7-15 add new support for optional port numbers in ADD_ADDR. This
includes creating an additional in-kernel TCP listening socket for the
requested port number, validating the port number when processing
incoming subflow connections, including the port number in netlink
interfaces, and adding some new MIBs. New self test cases are added for
subflows connecting with alternate port numbers.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e6d6ca6e 8a127bf6

net/mptcp/mib.c

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ static const struct snmp_mib mptcp_snmp_list[] = { 
	SNMP_MIB_ITEM("DuplicateData", MPTCP_MIB_DUPDATA),

	SNMP_MIB_ITEM("AddAddr", MPTCP_MIB_ADDADDR),

	SNMP_MIB_ITEM("EchoAdd", MPTCP_MIB_ECHOADD),

	SNMP_MIB_ITEM("PortAdd", MPTCP_MIB_PORTADD),

	SNMP_MIB_ITEM("MPJoinPortSynRx", MPTCP_MIB_JOINPORTSYNRX),

	SNMP_MIB_ITEM("MPJoinPortSynAckRx", MPTCP_MIB_JOINPORTSYNACKRX),

	SNMP_MIB_ITEM("MPJoinPortAckRx", MPTCP_MIB_JOINPORTACKRX),

	SNMP_MIB_ITEM("MismatchPortSynRx", MPTCP_MIB_MISMATCHPORTSYNRX),

	SNMP_MIB_ITEM("MismatchPortAckRx", MPTCP_MIB_MISMATCHPORTACKRX),

	SNMP_MIB_ITEM("RmAddr", MPTCP_MIB_RMADDR),

	SNMP_MIB_ITEM("RmSubflow", MPTCP_MIB_RMSUBFLOW),

	SNMP_MIB_ITEM("MPPrioTx", MPTCP_MIB_MPPRIOTX),

net/mptcp/mib.h

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ enum linux_mptcp_mib_field { 
	MPTCP_MIB_DUPDATA,		/* Segments discarded due to duplicate DSS */

	MPTCP_MIB_ADDADDR,		/* Received ADD_ADDR with echo-flag=0 */

	MPTCP_MIB_ECHOADD,		/* Received ADD_ADDR with echo-flag=1 */

	MPTCP_MIB_PORTADD,		/* Received ADD_ADDR with a port-number */

	MPTCP_MIB_JOINPORTSYNRX,	/* Received a SYN MP_JOIN with a different port-number */

	MPTCP_MIB_JOINPORTSYNACKRX,	/* Received a SYNACK MP_JOIN with a different port-number */

	MPTCP_MIB_JOINPORTACKRX,	/* Received an ACK MP_JOIN with a different port-number */

	MPTCP_MIB_MISMATCHPORTSYNRX,	/* Received a SYN MP_JOIN with a mismatched port-number */

	MPTCP_MIB_MISMATCHPORTACKRX,	/* Received an ACK MP_JOIN with a mismatched port-number */

	MPTCP_MIB_RMADDR,		/* Received RM_ADDR */

	MPTCP_MIB_RMSUBFLOW,		/* Remove a subflow */

	MPTCP_MIB_MPPRIOTX,		/* Transmit a MP_PRIO */

net/mptcp/mptcp_diag.c

+3 −3
Original line number Diff line number Diff line
@@ -128,10 +128,10 @@ static void mptcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r, 
	info->mptcpi_subflows = READ_ONCE(msk->pm.subflows);

	info->mptcpi_add_addr_signal = READ_ONCE(msk->pm.add_addr_signaled);

	info->mptcpi_add_addr_accepted = READ_ONCE(msk->pm.add_addr_accepted);

	info->mptcpi_subflows_max = READ_ONCE(msk->pm.subflows_max);

	val = READ_ONCE(msk->pm.add_addr_signal_max);

	info->mptcpi_subflows_max = mptcp_pm_get_subflows_max(msk);

	val = mptcp_pm_get_add_addr_signal_max(msk);

	info->mptcpi_add_addr_signal_max = val;

	val = READ_ONCE(msk->pm.add_addr_accept_max);

	val = mptcp_pm_get_add_addr_accept_max(msk);

	info->mptcpi_add_addr_accepted_max = val;

	if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags))

		flags |= MPTCP_INFO_FLAG_FALLBACK;

net/mptcp/options.c

+4 −0
Original line number Diff line number Diff line
@@ -1025,6 +1025,10 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) 
			mptcp_pm_del_add_timer(msk, &addr);

			MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ECHOADD);

		}



		if (mp_opt.port)

			MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_PORTADD);



		mp_opt.add_addr = 0;

	}

net/mptcp/pm.c

+7 −5
Original line number Diff line number Diff line
@@ -78,10 +78,13 @@ void mptcp_pm_new_connection(struct mptcp_sock *msk, int server_side) 
bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk)

{

	struct mptcp_pm_data *pm = &msk->pm;

	unsigned int subflows_max;

	int ret = 0;



	subflows_max = mptcp_pm_get_subflows_max(msk);



	pr_debug("msk=%p subflows=%d max=%d allow=%d", msk, pm->subflows,

		 pm->subflows_max, READ_ONCE(pm->accept_subflow));

		 subflows_max, READ_ONCE(pm->accept_subflow));



	/* try to avoid acquiring the lock below */

	if (!READ_ONCE(pm->accept_subflow))
@@ -89,8 +92,8 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk) 


	spin_lock_bh(&pm->lock);

	if (READ_ONCE(pm->accept_subflow)) {

		ret = pm->subflows < pm->subflows_max;

		if (ret && ++pm->subflows == pm->subflows_max)

		ret = pm->subflows < subflows_max;

		if (ret && ++pm->subflows == subflows_max)

			WRITE_ONCE(pm->accept_subflow, false);

	}

	spin_unlock_bh(&pm->lock);
@@ -188,8 +191,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, 


void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk)

{

	if (!mptcp_pm_should_add_signal_ipv6(msk) &&

	    !mptcp_pm_should_add_signal_port(msk))

	if (!mptcp_pm_should_add_signal(msk))

		return;



	mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_SEND_ACK);