Commit 2ca1b892 authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

mptcp: ensure the kernel PM does not take action too late 



The PM hooks can currently take place when the msk is already shutting
down. Subflow creation will fail, thanks to the existing check at join
time, but we can entirely avoid starting the to be failed operations.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarGeliang Tang <geliang@kernel.org>
Tested-by: default avatarGeliang Tang <geliang@kernel.org>
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20251121-net-next-mptcp-memcg-backlog-imp-v1-7-1f34b6c1e0b1@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2834f8ed

net/mptcp/pm.c

+3 −1
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ void mptcp_pm_subflow_established(struct mptcp_sock *msk) 
void mptcp_pm_subflow_check_next(struct mptcp_sock *msk,

				 const struct mptcp_subflow_context *subflow)

{

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

	struct mptcp_pm_data *pm = &msk->pm;

	bool update_subflows;
@@ -617,7 +618,8 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, 
	/* Even if this subflow is not really established, tell the PM to try

	 * to pick the next ones, if possible.

	 */

	if (mptcp_pm_nl_check_work_pending(msk))

	if (mptcp_is_fully_established(sk) &&

	    mptcp_pm_nl_check_work_pending(msk))

		mptcp_pm_schedule_work(msk, MPTCP_PM_SUBFLOW_ESTABLISHED);



	spin_unlock_bh(&pm->lock);

net/mptcp/pm_kernel.c

+2 −0
Original line number Diff line number Diff line
@@ -337,6 +337,8 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) 
	struct mptcp_pm_local local;



	mptcp_mpc_endpoint_setup(msk);

	if (!mptcp_is_fully_established(sk))

		return;



	pr_debug("local %d:%d signal %d:%d subflows %d:%d\n",

		 msk->pm.local_addr_used, endp_subflow_max,