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 A331A190472 for ; Sat, 23 Aug 2025 14:40:50 +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=1755960050; cv=none; b=I70vQLJEATJk3WVR3jaruDk7qDjpWr/Zd+gpJ/2wHYeEK5UgBj1vVNInjnprnFrciahwlJpeQTWPAnO0WVR8p+lumqBcLZoxRQpNmI3oervfwykenD+x1QEX5K9rfXBgdKXwpkkh1rEZOtJsRy2Wk2tQanVdBYOj6hGnB1KXmeg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755960050; c=relaxed/simple; bh=vm59/aEottXG8jaOra4iUSQRthZsvmZrUgyTnBaehac=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cOil4Tdpp5dhilHcpLxRqnicGOJVzUbS/qploQw6Bd9pzdWYyRmuThgel4BIoe+YPGFdaeUy5SwV5lxgjE4R81l2uJo4hmO3pKQ3TggPdcMlL+bP3tkvbniZJRnLIVRfJsPWQ7B3/Qae5bnlHp+Ka/hcJT++/tazrVBXjTZh8zw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IHxcpWG5; 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="IHxcpWG5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8FB7CC4CEE7; Sat, 23 Aug 2025 14:40:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755960050; bh=vm59/aEottXG8jaOra4iUSQRthZsvmZrUgyTnBaehac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IHxcpWG5n12QtgdwZgjWY5I2OnGBKxOpMt80uKPZ0ulx/mx+8QLckm5dnTKDrvwWP EZiHX9nbg0iiILnKviXbh2nrFfjQyb+J8ce+wuRS9QS7CRnIAa0S3TsW8yHSyy92YX li724u5f1lEIFHWj50c6XtRwIwGDDHm2oh4TakEosU1QbVP9uocdOXKNRBoRa0LYWh LHn/sY8X6gxzvdS/NRr5I1AQo+DJ/fp0dzCFquiGCgzjBnr7BOkFbjfjO9z7pdPWDj I3F5YSCY0/n8lMQrPgkcjxAe54gGADbMNc9ZmrMZCdPPFJ1is7Koa3A11MvlQCK+Tm XmGIDQmZlbk3g== From: Sasha Levin To: stable@vger.kernel.org Cc: Geliang Tang , Matthieu Baerts , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6.y] mptcp: disable add_addr retransmission when timeout is 0 Date: Sat, 23 Aug 2025 10:40:47 -0400 Message-ID: <20250823144047.2251097-1-sashal@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <2025082241-diner-uncoated-a54e@gregkh> References: <2025082241-diner-uncoated-a54e@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 15f1919d640c..b797f3dd4b69 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 f7257de37bd0..afba0ba6d50f 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -294,6 +294,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); @@ -311,6 +312,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)) { @@ -322,7 +327,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); @@ -364,6 +369,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); @@ -373,9 +379,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); @@ -389,8 +393,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