From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 322E925F7B1 for ; Sat, 23 Aug 2025 14:55:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755960937; cv=none; b=iVPBzoXNx9ll5n5369h76V986KnwSZDuZvqGm/fwfkwGysWwyNC3apy9wklVrtfrzL/U5/Fm10KcsFMk9S+brpUbxhwmuoG4sdP/LwvyBdZw6W7kPc8eUIUyGKUECe1pf6ArvL49vm+KtoHp6LbFXYR/s5qHGE6zSljmt5NGQ9U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755960937; c=relaxed/simple; bh=6Y1Fs4vPClMjrLMgafX6KQtCRyyohmpgXe49pKd8D1s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FPRbcBKAibJM5adad24ne5DZk0mHLXlv0SC95QLQYmdohqsommk6dlo1DdRlPv2vIjeo8gtWQOnlYKlVRR7+dePrEtwFJxR2laa7HDaYFPewj6P35EZSinOtnobZ76w08EZrlg4spWYm7oEVpb2YMIThL0XXPUdJue1Wf54rBog= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MMa7Ja94; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MMa7Ja94" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E4F7C4CEE7; Sat, 23 Aug 2025 14:55:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755960937; bh=6Y1Fs4vPClMjrLMgafX6KQtCRyyohmpgXe49pKd8D1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MMa7Ja94kmK5CpxefoYO/Fq9Qh2GPU+X56wWAzn8HZeQsd4aYTraiF9Qf7sBMChQW bcbOSpZM7J97eM1i0DT9YwwSmwCEnyOCKdkscOVDMFXDPjX+igyI3+OJax80f7iUb7 fMcx4zu/QZPeVNrNK4hE+XN720OomXnP6PJEY0j2/paVFxVXBnj6hWEeXUX/h7UAYc yR2Z3/KxRxisJ0D+G0Tv07VtCO60ikatZR2S8PiddI0r6Y+tMzi63UuUiAX8BPqH9S jkWyXodZFNp97pIpArNf0f5pT7EUV08ZjJtxswueABzgjuvoRLBYHQbLWfbZ9lmXxN vZxWNz4m/tC5A== From: Sasha Levin To: stable@vger.kernel.org Cc: Geliang Tang , Matthieu Baerts , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] mptcp: disable add_addr retransmission when timeout is 0 Date: Sat, 23 Aug 2025 10:55:34 -0400 Message-ID: <20250823145534.2259284-1-sashal@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <2025082242-rickety-degree-c696@gregkh> References: <2025082242-rickety-degree-c696@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Geliang Tang [ Upstream commit f5ce0714623cffd00bf2a83e890d09c609b7f50a ] When add_addr_timeout was set to 0, this caused the ADD_ADDR to be retransmitted immediately, which looks like a buggy behaviour. Instead, interpret 0 as "no retransmissions needed". The documentation is updated to explicitly state that setting the timeout to 0 disables retransmission. Fixes: 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout") Cc: stable@vger.kernel.org Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-5-521fe9957892@kernel.org Signed-off-by: Jakub Kicinski [ Apply to net/mptcp/pm_netlink.c , structural changes in mptcp_pm_alloc_anno_list ] Signed-off-by: Sasha Levin --- Documentation/networking/mptcp-sysctl.rst | 2 ++ net/mptcp/pm_netlink.c | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/networking/mptcp-sysctl.rst index 213510698014..722b4395e91b 100644 --- a/Documentation/networking/mptcp-sysctl.rst +++ b/Documentation/networking/mptcp-sysctl.rst @@ -20,6 +20,8 @@ add_addr_timeout - INTEGER (seconds) resent to an MPTCP peer that has not acknowledged a previous ADD_ADDR message. + Do not retransmit if set to 0. + The default value matches TCP_RTO_MAX. This is a per-namespace sysctl. diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 3391d4df2dbb..cb92e4b39cf6 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -304,6 +304,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) struct mptcp_pm_add_entry *entry = from_timer(entry, timer, add_timer); struct mptcp_sock *msk = entry->sock; struct sock *sk = (struct sock *)msk; + unsigned int timeout; pr_debug("msk=%p\n", msk); @@ -321,6 +322,10 @@ static void mptcp_pm_add_timer(struct timer_list *timer) goto out; } + timeout = mptcp_get_add_addr_timeout(sock_net(sk)); + if (!timeout) + goto out; + spin_lock_bh(&msk->pm.lock); if (!mptcp_pm_should_add_signal_addr(msk)) { @@ -332,7 +337,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) if (entry->retrans_times < ADD_ADDR_RETRANS_MAX) sk_reset_timer(sk, timer, - jiffies + mptcp_get_add_addr_timeout(sock_net(sk))); + jiffies + timeout); spin_unlock_bh(&msk->pm.lock); @@ -374,6 +379,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, struct mptcp_pm_add_entry *add_entry = NULL; struct sock *sk = (struct sock *)msk; struct net *net = sock_net(sk); + unsigned int timeout; lockdep_assert_held(&msk->pm.lock); @@ -383,9 +389,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, if (WARN_ON_ONCE(mptcp_pm_is_kernel(msk))) return false; - sk_reset_timer(sk, &add_entry->add_timer, - jiffies + mptcp_get_add_addr_timeout(net)); - return true; + goto reset_timer; } add_entry = kmalloc(sizeof(*add_entry), GFP_ATOMIC); @@ -399,8 +403,10 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, add_entry->retrans_times = 0; timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0); - sk_reset_timer(sk, &add_entry->add_timer, - jiffies + mptcp_get_add_addr_timeout(net)); +reset_timer: + timeout = mptcp_get_add_addr_timeout(net); + if (timeout) + sk_reset_timer(sk, &add_entry->add_timer, jiffies + timeout); return true; } -- 2.50.1