From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 456A437AA9C for ; Thu, 17 Sep 2026 02:18:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789611540; cv=none; b=qR3F2m4l3dYnEAI7OlD5/Q1+GfPsYefmmEjlIMBiMeceaCKrqCGxZnSvB0SLe+RuETh4JHRqbO7x1SgBOVHLltAou6in5yWFpoz2rbAXcqvgz9hCT266rnyu7IR6d8qiTUqD0xHFcrtOYT/4qQ/T1GElBs3O4Qx95VlQqAFF1CQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789611540; c=relaxed/simple; bh=d4TfMtM9bUDvu2rc/k0q02jep8/rrxSFccEvemiXa9o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TCHZvtBnHQJS1LM/l8d7gOMdZxj119okWLe+3xHWjOTrp/vAka0zWSeFsmxwIsYiFgWzHKfIWk19aYQbHTDHp6UEsKZM//CrK//cIhunBRm4C0I7SuS4c2NCcjPpwZxsLKHgE9WCYzGVLlVfSK36OByKBUmBeH7Ku/P11f5CuNo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fdiaGiv3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fdiaGiv3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D4191F00898; Thu, 17 Sep 2026 02:18:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789611538; bh=ft4Or90tszQWnHw2OjHGLzJiuH4MQJ3aLo54mqmfodQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fdiaGiv3aQV4KR7HfcqKALpW5MIe1saufobh4BsVJS+UwVpOJMkjf1HWpdxKBzXBK lwsCkiXJmCPlwT7w0VtnAQ71/wzDxTf0G8pFl0kg1LWoL2n+tB2a7MXwB/7S9dK/MF 9qT4fALi3k2V2OCw+iG73KsT2iuIWEAkce+YcMf6wth5aQI99gifLqoW10hxFBbW+V dzRcWLjrC4Fc3INPL678ahuVBSNos+v0UZXaIMMluSI25CGe4o+wWRcBNe+nwtuk6h KyFT6Js77nIDOCvQM15KR7mqfZ8NsGszC2de28SuTtDBkCaf9I5QOrLwYwUNFtBwyq zgC6CHIiZM/8Q== From: Sasha Levin To: stable@vger.kernel.org Cc: Paolo Abeni , "Matthieu Baerts (NGI0)" , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18.y 4/4] mptcp: do not reschedule the RTX timer for fallback sockets Date: Wed, 16 Sep 2026 22:18:54 -0400 Message-ID: <20260917021854.3809939-4-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260917021854.3809939-1-sashal@kernel.org> References: <2026091613-tank-dimmed-fed6@gregkh> <20260917021854.3809939-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Paolo Abeni [ Upstream commit e2ab913f68c7d11e2561b8a8ad0b87ffefcad667 ] On fallback socket the retrans timer is a quite convoluted no-op, but currently nothing prevents the MPTCP core to keep rescheduling it. Additionally gate RTX timer reset to the msk not being fallen back to TCP yet. To avoid adding multiple tests in fast-path, use a new flags bit for such condition. The RTX enable bit is clear at close time and set before the msk could start retransmitting, with a couple of caveats: - passive sockets inherit the bit from the listener msk; set the bit on such socket to avoid flipping it in the fast-path, even if the listener will obviously never retransmit. - while fastopening (MPTFO), mptcp_sendmsg_fastopen still ends-up calling mptcp_connect via tcp_sendmsg_fastopen -> __inet_stream_connect(ssk->sk_socket), and the first subflow's sk_socket points to the msk one. Fixes: b51f9b80c032 ("mptcp: introduce MPTCP retransmission timer") Cc: stable@vger.kernel.org Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260908-net-mptcp-misc-fixes-7-3-rc1-v2-1-df1de70348b6@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/mptcp/protocol.c | 13 ++++++++++--- net/mptcp/protocol.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2dd6840089f86..fd3873bec8088 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -93,6 +93,7 @@ bool __mptcp_try_fallback(struct mptcp_sock *msk, int fb_mib) msk->allow_subflows = false; set_bit(MPTCP_FALLBACK_DONE, &msk->flags); + clear_bit(MPTCP_RTX_ENABLED, &msk->flags); __MPTCP_INC_STATS(net, fb_mib); spin_unlock_bh(&msk->fallback_lock); return true; @@ -939,13 +940,14 @@ static bool mptcp_rtx_timer_pending(struct sock *sk) static void mptcp_reset_rtx_timer(struct sock *sk) { + struct mptcp_sock *msk = mptcp_sk(sk); unsigned long tout; - /* prevent rescheduling on close */ - if (unlikely(inet_sk_state_load(sk) == TCP_CLOSE)) + /* Prevent rescheduling on close and in case of fallback. */ + if (!test_bit(MPTCP_RTX_ENABLED, &msk->flags)) return; - tout = mptcp_sk(sk)->timer_ival; + tout = msk->timer_ival; sk_reset_timer(sk, &sk->mptcp_retransmit_timer, jiffies + tout); } @@ -3051,6 +3053,9 @@ void mptcp_set_state(struct sock *sk, int state) * transition from TCP_SYN_RECV to TCP_CLOSE_WAIT. */ break; + case TCP_CLOSE: + clear_bit(MPTCP_RTX_ENABLED, &mptcp_sk(sk)->flags); + fallthrough; default: if (oldstate == TCP_ESTABLISHED || oldstate == TCP_CLOSE_WAIT) MPTCP_DEC_STATS(sock_net(sk), MPTCP_MIB_CURRESTAB); @@ -3851,6 +3856,7 @@ static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) if (IS_ERR(ssk)) return PTR_ERR(ssk); + set_bit(MPTCP_RTX_ENABLED, &msk->flags); mptcp_set_state(sk, TCP_SYN_SENT); subflow = mptcp_subflow_ctx(ssk); #ifdef CONFIG_TCP_MD5SIG @@ -3998,6 +4004,7 @@ static int mptcp_listen(struct socket *sock, int backlog) goto unlock; } + set_bit(MPTCP_RTX_ENABLED, &msk->flags); mptcp_set_state(sk, TCP_LISTEN); sock_set_flag(sk, SOCK_RCU_FREE); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 6eab87ce7b353..4e9d139be69be 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -116,6 +116,7 @@ #define MPTCP_WORK_RTX 1 #define MPTCP_FALLBACK_DONE 2 #define MPTCP_WORK_CLOSE_SUBFLOW 3 +#define MPTCP_RTX_ENABLED 4 /* MPTCP socket release cb flags */ #define MPTCP_PUSH_PENDING 1 -- 2.53.0