From nobody Mon Feb 9 19:29:20 2026 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 26B3534DCDB for ; Tue, 2 Sep 2025 19:01:48 +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=1756839709; cv=none; b=clwL7BMSAHW6jU3tKVdjBLecPRZqG7WhgtqSwKLQgQB0WOu18bzeUHyNQV0Ao9mNaHPWJqBu78WmYSyFuq0ejAFMSqr6pWN7AGfdS9qmSqOePvgs6OhAzSLNOatYHxCdvPjdPzrWK+x8l/QJfjJGY3JY+IYBI6FqK10A8mjv8eg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756839709; c=relaxed/simple; bh=ThIxjE5OYNtXDa4qRbMhj87Sh2pFHrO906nf6G+IexI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LwN7bzxMP7gi0qJPclXrr5w/kl1JLVhkrlGj1gMivk8b80j6qXCwcN5St8uq75VmiVux7enhU/MEF2XtAtuuSD0EUyMn50S2Yp3gxPE1nsXNkYdjLwpqGVVHI8Fse/7k2IFfzul/QD5psSbx/Zct58J/+MFDCWy85WZvW0HoK94= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uR5h9Tv6; 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="uR5h9Tv6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3AD5DC4CEF7; Tue, 2 Sep 2025 19:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756839708; bh=ThIxjE5OYNtXDa4qRbMhj87Sh2pFHrO906nf6G+IexI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=uR5h9Tv6aduuu1Scam6bSx+hEWsXVnFC+0P9g4uTnIoPIzQQI919yvK9YV3F5pdjh hhOEpFPlbELm5/l/Xy/qoFUbtig+6FPW29lLv+FlkQrDX5NoNIKaY1xgN5Pp41fNrk XSKlphsdAkmjeC736JQp4iZ59P72rYLHBhmVnMjsKcC9v0ed2310Tax4fyswGkrxBv DD/S5Ql0U2/Ar+jp/0wxn+Wap57KSIIdAOcoCUPmhLyIaEoLxiuVCqb+yt+iFgyxgE +xGygYMkayjHE60ONfrb4xc0eaVlAODYeCphFT7UHxbQPQl7JnVY2LZgqfOvGXMd/C h/NdalsHPPgGA== From: "Matthieu Baerts (NGI0)" Date: Tue, 02 Sep 2025 21:01:38 +0200 Subject: [PATCH mptcp-next 1/3] Squash to "selftests: mptcp: remove add_addr_timeout settings" Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250902-sft-mptcp-join-add_addr-no-retrans-v1-1-956a315d6a5a@kernel.org> References: <20250902-sft-mptcp-join-add_addr-no-retrans-v1-0-956a315d6a5a@kernel.org> In-Reply-To: <20250902-sft-mptcp-join-add_addr-no-retrans-v1-0-956a315d6a5a@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1544; i=matttbe@kernel.org; h=from:subject:message-id; bh=ThIxjE5OYNtXDa4qRbMhj87Sh2pFHrO906nf6G+IexI=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDK220vUsDe/DdziwdESOSt9Xk7GN+Hq9dkC+hd7zzrUv td/qTeto5SFQYyLQVZMkUW6LTJ/5vMq3hIvPwuYOaxMIEMYuDgFYCJzrBn+x7nNNjgUJrzu4d23 P3ezaXw9M6XMc1992LxrScp3d54NnMvwv9CKOeNEUN8psfuvb57hi7eUPHtsar9yku/Fjuv3P6s tYgMA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 This reverts the patch: when add_addr_timeout is set to 1, chk_add_nr() and chk_add_tx_nr() are more tolerant with retransmissions, see commit 6ef84b1517e0 ("selftests: mptcp: more robust signal race test"). But the main reason is that this revert breaks the selftests running on old kernels. It is then important to keep this. Plus it still acts as a maximum, just in case everything is very slow, we still have retransmissions in time, especially with the new exponential backoff. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index a97b568104bc284f050b2f0e09fe3fdd3341c5cb..2f046167a0b6cc6fb5531a033d8= d95c9ea399cf9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -358,6 +358,8 @@ reset_with_add_addr_timeout() tables=3D"${ip6tables}" fi =20 + ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=3D1 + if ! ip netns exec $ns2 $tables -A OUTPUT -p tcp \ -m tcp --tcp-option 30 \ -m bpf --bytecode \ @@ -2303,6 +2305,7 @@ signal_address_tests() pm_nl_add_endpoint $ns2 10.0.4.2 flags signal =20 # the peer could possibly miss some addr notification, allow retransmiss= ion + ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=3D1 speed=3Dslow \ run_tests $ns1 $ns2 10.0.1.1 =20 --=20 2.51.0 From nobody Mon Feb 9 19:29:20 2026 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 B2C6634DCDB for ; Tue, 2 Sep 2025 19:01:49 +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=1756839709; cv=none; b=IB//pTEsh467j+xdL3r8NJ6zxBh6cKRZ5dRTOSymVK96Ed2Yu5wiY9X/RHOVsfFvsYjiDZ/wWEA+M1SovpHmavSV3WbQWn8RnARk+15WcsG3/0K/CS+B+6LSnVaFVydLPGpjUCba6nzRdvEUG470ZMv/0iYv+5/zmyIfhtfxZhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756839709; c=relaxed/simple; bh=sHKqM0o2iDFhGk4iddQv9GLLvlPoYl+gaS4DteXNi38=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c5g+wstxc5/L7llhYEze9KSRdIMI/duXZSZmks1xHeG/wTOLvBiuLELLWZhOZw9ohxQApvsGqAWxmkbJeyGtMbTul96wuEiagt/DQChBOD/s4j9J9EEU4YQO2vjp2IBslxNaZRpSFsLnmKxm8/Hr8fr1ywchSeLzdiAQyReGCi0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AxIO/0eI; 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="AxIO/0eI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BB2FC4CEED; Tue, 2 Sep 2025 19:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756839709; bh=sHKqM0o2iDFhGk4iddQv9GLLvlPoYl+gaS4DteXNi38=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AxIO/0eINN2oMHjPMfQcVEdBQ4sXQpGCRrlIUeK5+5BxCiVv4L4HB+g054BTKnPV3 yWKesnGH4bFLOOMiQeS56ZbzisqlOtxcvfyuyE9Du3V6ilAoL09jz0WDv8+bliDT/D yi+V2/zJcbIpZEpiebfERym4GSJqVEXkulmZaZcmAJjpDkGczRz6i03pzCIiIYEZ58 XlS9Ow+uJl5basoeeQfiFxIYJVf1l4CJYkZxCDhM8cCOT4lc7A8vBnjPA8uZJUpEZE catTs0W57vRWM1i5hi5M1sfjHPsSQEUeGd0Aqg7kdTRCpC2HPshjKFIv7uwVYPo/2b e08KFlIhXyzUg== From: "Matthieu Baerts (NGI0)" Date: Tue, 02 Sep 2025 21:01:39 +0200 Subject: [PATCH mptcp-next 2/3] selftests: mptcp: join: tolerate more ADD_ADDR Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250902-sft-mptcp-join-add_addr-no-retrans-v1-2-956a315d6a5a@kernel.org> References: <20250902-sft-mptcp-join-add_addr-no-retrans-v1-0-956a315d6a5a@kernel.org> In-Reply-To: <20250902-sft-mptcp-join-add_addr-no-retrans-v1-0-956a315d6a5a@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3180; i=matttbe@kernel.org; h=from:subject:message-id; bh=sHKqM0o2iDFhGk4iddQv9GLLvlPoYl+gaS4DteXNi38=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDK220ua3/0duU1V0fOieD53WHfhu9f3r80Wso35LRvyy 2OruOf9jlIWBjEuBlkxRRbptsj8mc+reEu8/Cxg5rAygQxh4OIUgImoLGBkuHAiL64zwi7gdqp4 7bsgb73LOdte786X0yrtfiubZOvOz8hwUOdI51OZnhVV6/zObmLf8pTpTz/bVEk71eYVaXFu25M 5AQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 ADD_ADDR can be retransmitted, and with, the parent commit, these retransmissions can be sent quicker: from 2 minutes to less than one second. To avoid false positives where retransmitted ADD_ADDR causes higher counters than expected, it is required to be more tolerant. Errors are now only reported when fewer ADD_ADDRs have been sent/received. An alternative could be to disable the ADD_ADDR retransmissions by default, but that's changing the default kernel behaviour. Plus, ADD_ADDR retransmissions can be required for some tests. To avoid adding exceptions to a few tests, it seems better to increase the tolerance. Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 2f046167a0b6cc6fb5531a033d8d95c9ea399cf9..1028f3f931612d98e828707a9f5= 5caa69be4a6ca 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -358,6 +358,7 @@ reset_with_add_addr_timeout() tables=3D"${ip6tables}" fi =20 + # set a maximum, to avoid too long timeout with exponential backoff ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=3D1 =20 if ! ip netns exec $ns2 $tables -A OUTPUT -p tcp \ @@ -1669,7 +1670,6 @@ chk_add_nr() local tx=3D"" local rx=3D"" local count - local timeout =20 if [[ $ns_invert =3D "invert" ]]; then ns_tx=3D$ns2 @@ -1678,16 +1678,13 @@ chk_add_nr() rx=3D" server" fi =20 - timeout=3D$(ip netns exec ${ns_tx} sysctl -n net.mptcp.add_addr_timeout) - print_check "add addr rx${rx}" count=3D$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtAddAddr") if [ -z "$count" ]; then print_skip - # if the test configured a short timeout tolerate greater then expected - # add addrs options, due to retransmissions - elif [ "$count" !=3D "$add_nr" ] && { [ "$timeout" -gt 1 ] || [ "$count" = -lt "$add_nr" ]; }; then - fail_test "got $count ADD_ADDR[s] expected $add_nr" + # Tolerate more ADD_ADDR then expected, due to retransmissions + elif [ "$count" -lt "$add_nr" ]; then + fail_test "got $count ADD_ADDR[s] expected $add_nr or more" else print_ok fi @@ -1774,19 +1771,15 @@ chk_add_tx_nr() { local add_tx_nr=3D$1 local echo_tx_nr=3D$2 - local timeout local count =20 - timeout=3D$(ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout) - print_check "add addr tx" count=3D$(mptcp_lib_get_counter ${ns1} "MPTcpExtAddAddrTx") if [ -z "$count" ]; then print_skip - # if the test configured a short timeout tolerate greater then expected - # add addrs options, due to retransmissions - elif [ "$count" !=3D "$add_tx_nr" ] && { [ "$timeout" -gt 1 ] || [ "$coun= t" -lt "$add_tx_nr" ]; }; then - fail_test "got $count ADD_ADDR[s] TX, expected $add_tx_nr" + # Tolerate more ADD_ADDR then expected, due to retransmissions + elif [ "$count" -lt "$add_tx_nr" ]; then + fail_test "got $count ADD_ADDR[s] TX, expected $add_tx_nr or more" else print_ok fi --=20 2.51.0 From nobody Mon Feb 9 19:29:20 2026 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 E9BBD2DF6F4 for ; Tue, 2 Sep 2025 19:01:51 +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=1756839712; cv=none; b=PKda5bsET4c161yjbp8LvdYYsX7ji50NCELSXPP6PPQn0TKFc8qBAmBF8rr2j6UifcAwLHI0vdB9awul/KG44cEL1pfqss69OiK1Hg794CttvhXZSQY24fM/SF583ZmV6nUqpMeFCihd48GbPZU2Rdf5tIyCYFCYFjX7Vn8udfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756839712; c=relaxed/simple; bh=qciBjF76ETss+mqHo9kiwuEAE16QRV0ywZ4C3ccfihI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pf4SGpOqtImNOvm5lKvWEIvAFHMFpuJiJ1gpU/VG8zd2LOlBMKdsgk6k06PoAl4973hQp9U7Qe2F7hCvnOtm+B2VxGNBaHkpIasO+p6yiQc3lEHuX6Gr4xAW+Q6KaCJrxqqFipOdMEnPJXXzG01YRWUDsLBZX4ZA4oiGGyUzJy4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Tsq0k7W7; 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="Tsq0k7W7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14EBDC4CEF6; Tue, 2 Sep 2025 19:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756839711; bh=qciBjF76ETss+mqHo9kiwuEAE16QRV0ywZ4C3ccfihI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Tsq0k7W7LFWPgIDhE8qPYKWONiZPxnHqYUH7ZS1i5a0qMR0urHgrJhOj5AhnMylja sAXUNZPQmXYRw5v/L1t0aUylncD3GEnq40EYQbFpxzkEI7ZSqamSjEwFFM300VoI9B O5JoPSBBFFB34cgwbSfDxY2KfEcJWu+VAZHCkVU2JquQQdDeI2Xiv7CTc7NweoOf8o g5WQ3c/3dXr0yUA3axqAFvgSRVFVLivTn7T8su1raxfXVGAdCKsI/ozGUny5QaqdB7 HhFeQrSHXHtJ1VhFBAId+NPMNvve1r9wne5WMBuoqM6LdKRGDdA/zIyMNuxHCLM78s JbrnDcWoIhpPg== From: "Matthieu Baerts (NGI0)" Date: Tue, 02 Sep 2025 21:01:40 +0200 Subject: [PATCH mptcp-next 3/3] selftests: mptcp: join: allow more time to send ADD_ADDR Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250902-sft-mptcp-join-add_addr-no-retrans-v1-3-956a315d6a5a@kernel.org> References: <20250902-sft-mptcp-join-add_addr-no-retrans-v1-0-956a315d6a5a@kernel.org> In-Reply-To: <20250902-sft-mptcp-join-add_addr-no-retrans-v1-0-956a315d6a5a@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1467; i=matttbe@kernel.org; h=from:subject:message-id; bh=qciBjF76ETss+mqHo9kiwuEAE16QRV0ywZ4C3ccfihI=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDK220utzjieq5fIamDxfUftje8cTadPHrAoivu05X+wp Jn/rZetHaUsDGJcDLJiiizSbZH5M59X8ZZ4+VnAzGFlAhnCwMUpABeZxsgwe+/HtZsm6ig6P9JX XfKzduXfL6t/WSS5zl0ZEpz0at3CeEaG0wIqk6JX9O4In/T24YZ9lvcb/q6P1TYK+Fd67YPGQ9f FLAA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 When many ADD_ADDR need to be sent, it can take some time to send each of them, and create new subflows. Some CIs seem to occasionally have issues with these tests, especially with "debug" kernels. Two subtests will now run for a slightly longer time: the last two where 3 or more ADD_ADDR are sent during the test. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 1028f3f931612d98e828707a9f55caa69be4a6ca..9c1ab36110850dcc35bb77e2d58= 94d8b1dd496a0 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2266,7 +2266,8 @@ signal_address_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 3 3 fi @@ -2278,7 +2279,8 @@ signal_address_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 join_syn_tx=3D3 \ chk_join_nr 1 1 1 chk_add_nr 3 3 --=20 2.51.0