Commit 2ba5c816 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mptcp-updates-for-net-next' 

Mat Martineau says:

====================
mptcp: Updates for net-next

Three independent fixes/features from the MPTCP tree:

Patch 1 is a selftest workaround for older iproute2 packages.

Patch 2 removes superfluous locks that were added with recent MP_FAIL
patches.

Patch 3 adds support for the TCP_DEFER_ACCEPT sockopt.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f008f8d0 ea1e301d

net/mptcp/protocol.c

+0 −12
Original line number Diff line number Diff line
@@ -1613,10 +1613,8 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags) 


out:

	/* ensure the rtx timer is running */

	mptcp_data_lock(sk);

	if (!mptcp_timer_pending(sk))

		mptcp_reset_timer(sk);

	mptcp_data_unlock(sk);

	if (copied)

		__mptcp_check_send_data_fin(sk);

}
@@ -2529,10 +2527,8 @@ static void __mptcp_retrans(struct sock *sk) 
reset_timer:

	mptcp_check_and_set_pending(sk);



	mptcp_data_lock(sk);

	if (!mptcp_timer_pending(sk))

		mptcp_reset_timer(sk);

	mptcp_data_unlock(sk);

}



static void mptcp_mp_fail_no_response(struct mptcp_sock *msk)
@@ -2711,10 +2707,8 @@ void mptcp_subflow_shutdown(struct sock *sk, struct sock *ssk, int how) 
		} else {

			pr_debug("Sending DATA_FIN on subflow %p", ssk);

			tcp_send_ack(ssk);

			mptcp_data_lock(sk);

			if (!mptcp_timer_pending(sk))

				mptcp_reset_timer(sk);

			mptcp_data_unlock(sk);

		}

		break;

	}
@@ -2815,10 +2809,8 @@ static void __mptcp_destroy_sock(struct sock *sk) 
	/* join list will be eventually flushed (with rst) at sock lock release time*/

	list_splice_init(&msk->conn_list, &conn_list);



	mptcp_data_lock(sk);

	mptcp_stop_timer(sk);

	sk_stop_timer(sk, &sk->sk_timer);

	mptcp_data_unlock(sk);

	msk->pm.status = 0;



	/* clears msk->subflow, allowing the following loop to close
@@ -2880,9 +2872,7 @@ static void mptcp_close(struct sock *sk, long timeout) 
		__mptcp_destroy_sock(sk);

		do_cancel_work = true;

	} else {

		mptcp_data_lock(sk);

		sk_reset_timer(sk, &sk->sk_timer, jiffies + TCP_TIMEWAIT_LEN);

		mptcp_data_unlock(sk);

	}

	release_sock(sk);

	if (do_cancel_work)
@@ -2927,10 +2917,8 @@ static int mptcp_disconnect(struct sock *sk, int flags) 
		__mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_FASTCLOSE);

	}



	mptcp_data_lock(sk);

	mptcp_stop_timer(sk);

	sk_stop_timer(sk, &sk->sk_timer);

	mptcp_data_unlock(sk);



	if (mptcp_sk(sk)->token)

		mptcp_event(MPTCP_EVENT_CLOSED, mptcp_sk(sk), NULL, GFP_KERNEL);

net/mptcp/sockopt.c

+15 −0
Original line number Diff line number Diff line
@@ -756,6 +756,18 @@ 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(struct mptcp_sock *msk, int optname,

				    sockptr_t optval, unsigned int optlen)

{
@@ -782,6 +794,8 @@ static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname, 
		return mptcp_setsockopt_sol_tcp_cork(msk, optval, optlen);

	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);

	}



	return -EOPNOTSUPP;
@@ -1142,6 +1156,7 @@ static int mptcp_getsockopt_sol_tcp(struct mptcp_sock *msk, int optname, 
	case TCP_CONGESTION:

	case TCP_INFO:

	case TCP_CC_INFO:

	case TCP_DEFER_ACCEPT:

		return mptcp_getsockopt_first_sf_only(msk, SOL_TCP, optname,

						      optval, optlen);

	case TCP_INQ:

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

+1 −0
Original line number Diff line number Diff line
@@ -2693,6 +2693,7 @@ fastclose_tests() 
pedit_action_pkts()

{

	tc -n $ns2 -j -s action show action pedit index 100 | \

		grep "packets" | \

		sed 's/.*"packets":\([0-9]\+\),.*/\1/'

}