From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, Mat Martineau <martineau@kernel.org>,
Geliang Tang <geliang@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Jianguo Wu <wujianguo@chinatelecom.cn>,
Shuah Khan <shuah@kernel.org>, Jonathan Corbet <corbet@lwn.net>,
zhenwei pi <pizhenwei@bytedance.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org,
"Matthieu Baerts (NGI0)" <matttbe@kernel.org>,
stable@vger.kernel.org, Thomas Dreibholz <dreibh@simula.no>
Subject: [PATCH net 2/8] mptcp: pm: kernel: flush: do not reset ADD_ADDR limit
Date: Fri, 15 Aug 2025 19:28:20 +0200 [thread overview]
Message-ID: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-2-521fe9957892@kernel.org> (raw)
In-Reply-To: <20250815-net-mptcp-misc-fixes-6-17-rc2-v1-0-521fe9957892@kernel.org>
A flush of the MPTCP endpoints should not affect the MPTCP limits. In
other words, 'ip mptcp endpoint flush' should not change 'ip mptcp
limits'.
But it was the case: the MPTCP_PM_ATTR_RCV_ADD_ADDRS (add_addr_accepted)
limit was reset by accident. Removing the reset of this counter during a
flush fixes this issue.
Fixes: 01cacb00b35c ("mptcp: add netlink-based PM")
Cc: stable@vger.kernel.org
Reported-by: Thomas Dreibholz <dreibh@simula.no>
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/579
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
net/mptcp/pm_kernel.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c
index d39e7c1784608db290b8a2c1bc4fc24ed800cbb4..667803d72b643a0bb98365003b136c53f2a9a975 100644
--- a/net/mptcp/pm_kernel.c
+++ b/net/mptcp/pm_kernel.c
@@ -1085,7 +1085,6 @@ static void __flush_addrs(struct list_head *list)
static void __reset_counters(struct pm_nl_pernet *pernet)
{
WRITE_ONCE(pernet->add_addr_signal_max, 0);
- WRITE_ONCE(pernet->add_addr_accept_max, 0);
WRITE_ONCE(pernet->local_addr_max, 0);
pernet->addrs = 0;
}
--
2.50.0
next prev parent reply other threads:[~2025-08-15 17:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-15 17:28 [PATCH net 0/8] mptcp: misc fixes for v6.17-rc Matthieu Baerts (NGI0)
2025-08-15 17:28 ` [PATCH net 1/8] mptcp: drop skb if MPTCP skb extension allocation fails Matthieu Baerts (NGI0)
2025-08-15 17:28 ` Matthieu Baerts (NGI0) [this message]
2025-08-15 17:28 ` [PATCH net 3/8] selftests: mptcp: pm: check flush doesn't reset limits Matthieu Baerts (NGI0)
2025-08-15 17:28 ` [PATCH net 4/8] mptcp: remove duplicate sk_reset_timer call Matthieu Baerts (NGI0)
2025-08-15 17:28 ` [PATCH net 5/8] mptcp: disable add_addr retransmission when timeout is 0 Matthieu Baerts (NGI0)
2025-08-15 17:28 ` [PATCH net 6/8] selftests: mptcp: disable add_addr retrans in endpoint_tests Matthieu Baerts (NGI0)
2025-08-15 17:28 ` [PATCH net 7/8] selftests: mptcp: connect: fix C23 extension warning Matthieu Baerts (NGI0)
2025-08-15 17:28 ` [PATCH net 8/8] selftests: mptcp: sockopt: " Matthieu Baerts (NGI0)
2025-08-16 18:27 ` [PATCH net 0/8] mptcp: misc fixes for v6.17-rc Jakub Kicinski
2025-08-17 13:50 ` Matthieu Baerts
2025-08-19 0:50 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250815-net-mptcp-misc-fixes-6-17-rc2-v1-2-521fe9957892@kernel.org \
--to=matttbe@kernel.org \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=dreibh@simula.no \
--cc=edumazet@google.com \
--cc=geliang@kernel.org \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martineau@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pizhenwei@bytedance.com \
--cc=shuah@kernel.org \
--cc=stable@vger.kernel.org \
--cc=wujianguo@chinatelecom.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).