From nobody Wed Sep 17 16:19:24 2025 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 01B0C2E8B86 for ; Thu, 4 Sep 2025 11:38:21 +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=1756985902; cv=none; b=QwUX3rxTZAnfAtcZWOvXS1b+YPSbEh9RpwrW2gxoLMX8S1xXslM3SuOvdDshmkuYaOyOA1tRyCh+J/Arqih+9L+aZnGupiYsQt6wy/dSY8l49jOWF+5y5yaddtbkfFNYA+73GxWoNtovnXGYDk+oIIsxI4mYhaQ/YHT2NeNucII= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756985902; c=relaxed/simple; bh=ArtvU1t7K7AJUEhR3CP/UahXLbgwR5qQaKZcIKI0RjA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fl4Lz4lqjpT+zhLF3FB+CHdEUpmMi6+jArZs/9LEg0zI3LNDfKML6Rd/uMohJuOQdyyBFGRA87RLmZdEGl/gfGrNdEOHEpkfNZYNURQmLjMiE5U1anafYGg5nwQbmK5H4Y15LC6VpoDrca1sZUbfkqyWTsPnFoa2NDcDbZnTq8Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k2+GsidJ; 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="k2+GsidJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCDF1C4CEF0; Thu, 4 Sep 2025 11:38:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756985901; bh=ArtvU1t7K7AJUEhR3CP/UahXLbgwR5qQaKZcIKI0RjA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=k2+GsidJa51P76AkqXcxkT0Eo2gFPqf+9VHYc3/SnpFCBw2efhDzYw6s3g2E43hYG o7LJ3+hRjhVVeAIB7z3m06uBBrK9ZF+MRK4W4XaCaOfTIsPC/P3W0Qt+a4NdsGonNE fafR0hxrnR6HjfVr3lRqn6PzQvs6NqTbSpCSk+cZD7Xv2gUmfVN6U9Db2O7htr+YtQ QmXWHtt4M13fCc5FcDVu3dtRIfYNok+ChDg8PhCJbB7ANwif/iggsHL4sfcrG4YXpj TDsSAM0wCWCy0zGJ6uiLQSZThKr1HHP94kHTUSvO+HekcDvbsCOmDMRaCBgQPH+75h eI/NBXBCb+mIg== From: "Matthieu Baerts (NGI0)" Date: Thu, 04 Sep 2025 13:38:05 +0200 Subject: [PATCH mptcp-next v2 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: <20250904-sft-mptcp-join-add_addr-no-retrans-v2-1-a019e6678628@kernel.org> References: <20250904-sft-mptcp-join-add_addr-no-retrans-v2-0-a019e6678628@kernel.org> In-Reply-To: <20250904-sft-mptcp-join-add_addr-no-retrans-v2-0-a019e6678628@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1592; i=matttbe@kernel.org; h=from:subject:message-id; bh=ArtvU1t7K7AJUEhR3CP/UahXLbgwR5qQaKZcIKI0RjA=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJ2Vmls+C9evXlKytWpc07Y9pkd9Frtc01w4T12LZUPT wWztr3O7ChlYRDjYpAVU2SRbovMn/m8irfEy88CZg4rE8gQBi5OAZjI3KuMDPsnT/JJCL+4dqHh Yn1Zb7cXx1pvrZxq774+7+eK55/nPG9jZPhz/zfTtNv/96S3CNy5++UY84p91ROm/pz01V3j/8n aIhleAA== 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. Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) --- 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 Wed Sep 17 16:19:24 2025 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 E0E802D322E for ; Thu, 4 Sep 2025 11:38:22 +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=1756985903; cv=none; b=lvWm3H4BmvY9X6lPGzwRCWTHSvkAWJS3HvJGA0S+NlA2eef4ppskUqfcf9/x+k6zRQKMXhn2ZS6Mp5+gJ83jMjJywBYhvQ+pEEKJE/PwaHV8mr+hPNIi541huzdxUayUbLajVACkyfaBN7W03+oC6e9FMKuoU5tjCpdO5ZKuzys= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756985903; c=relaxed/simple; bh=4OL+gS891o5wWSLFOyQWCMLVfs+xcrUEezD/nJaHR1U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HNfc8GC3IhXOmWi+SvULR1Rw/LQgJl/fO5Y8VyhihqVqwY+ddiDrLGCLL6iGm5/4Mm3htLL5GyTdPahFQuyJcDBBQhNtlHnXNqKmjzGoXiKO733zPNl1qw/HAY4Yf1y3aAMAGVe/vtOwbt9YJfwADknXL+PSxRfafWhNuDfDGpE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=u88/KjcI; 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="u88/KjcI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E48C6C4CEF4; Thu, 4 Sep 2025 11:38:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756985902; bh=4OL+gS891o5wWSLFOyQWCMLVfs+xcrUEezD/nJaHR1U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=u88/KjcInIBsJ+u0g2tuSXDbZChR1qnqumJ5EXvZJ1MYKa4k1P79M79E8hI/gCPfb im8WdyQnWKjc3zpiDhNUSmwQewkMds/MwUSmJCjEPcLxjRnOIwt5zsEOMlZRfaQCnn SFnymAldS4+RREO9zfb7SgbBPOElsSlaX0yKdwoWRHKO1DDmpJuE7M/mvlaZUrKiWo eeD2cJ+fU2CqKG4Zel+JX2e+PRMTYbmvxpbsXrgznGj3PFJZ7wtR5V9W1oinwy851f uCg5EuabvDeLIamQaWY5y21wlWXY3WtvN6HBz1zNkGCuR9kNCH+5qo0E3grS/oFXHN v/+1U1XKullcg== From: "Matthieu Baerts (NGI0)" Date: Thu, 04 Sep 2025 13:38:06 +0200 Subject: [PATCH mptcp-next v2 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: <20250904-sft-mptcp-join-add_addr-no-retrans-v2-2-a019e6678628@kernel.org> References: <20250904-sft-mptcp-join-add_addr-no-retrans-v2-0-a019e6678628@kernel.org> In-Reply-To: <20250904-sft-mptcp-join-add_addr-no-retrans-v2-0-a019e6678628@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=3614; i=matttbe@kernel.org; h=from:subject:message-id; bh=4OL+gS891o5wWSLFOyQWCMLVfs+xcrUEezD/nJaHR1U=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJ2Vmna2O7R2Xrj7b+zSta7T9S89T8S+yyVu8lQ4Kjmu 43xr++s6ihlYRDjYpAVU2SRbovMn/m8irfEy88CZg4rE8gQBi5OAZjI5wkM//NcRI4ZrxDcft1v w9tdB7j1EnbMdy09cN3tkGXnn1gJ9TRGhm2zsyR2u36Xnhmx9OnqvTHpe3uuKuxqe7RQ8k+Vipl 5EScA 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, except if no ADD_ADDR are expected. Before the parent commit, the tolerance was present for each tests where the ADD_ADDR could be retransmitted in a reasonable time (1 sec). Now that all tests can have retransmitted ADD_ADDR, it is normal to apply the same tolerance for all tests. 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 many tests, it seems better to increase the tolerance. Later, we could add a new MIB counter to identify the ADD_ADDR retransmissions, and remove the tolerance when this counter is available. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 2f046167a0b6cc6fb5531a033d8d95c9ea399cf9..be49712f91155a1f14f6cc21776= 764d65a897c27 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,15 +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 + # Tolerate more ADD_ADDR then expected (if any), due to retransmissions + elif [ "$count" -lt "$add_nr" ] || + { [ "$count" !=3D "$add_nr" ] && [ "$add_nr" !=3D 0 ]; }; then fail_test "got $count ADD_ADDR[s] expected $add_nr" else print_ok @@ -1774,18 +1772,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 + # Tolerate more ADD_ADDR then expected (if any), due to retransmissions + elif [ "$count" -lt "$add_tx_nr" ] || + { [ "$count" !=3D "$add_tx_nr" ] && [ "$add_tx_nr" !=3D 0 ]; }; then fail_test "got $count ADD_ADDR[s] TX, expected $add_tx_nr" else print_ok --=20 2.51.0 From nobody Wed Sep 17 16:19:24 2025 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 E19DA2F39A6 for ; Thu, 4 Sep 2025 11:38:23 +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=1756985904; cv=none; b=EjUbvrMA0IoNWFY6TrckXi4mlXBsHJQrM34lcpudM7GbtHV02cQf2DekPvGCm5X6yaXScVpCKx4kfPef8RFMzEdk3LMBQNDwajfWkf+XF2a+CmNbNAiRiQNSOg6PWgkKgcxV5oKDeQFNvS4bO8gomxSQ6MVdl8+6hCNShjeCe+o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756985904; c=relaxed/simple; bh=gJhzZ7ogTLAF6f3s/nOccNHwhoEfz+6IDelT9pKGKOo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fF5FHRAXZxnEZ/FxPTsCvbdkXBcIdviSwvQsvAH4tKkFXEqmJBT5vbXRQchuaT3t1PFEdk0JpKV6NL80NkRpuiI0mxuEiht5N+a2b3sxzBKY/1b7fKVZKfyx5e93tC4Xnu4oXIOmPrvRas8y6QcaMBNe9O1pA0TBcR1vYRth5Qg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fQIiaPGn; 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="fQIiaPGn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3BE3C4CEF5; Thu, 4 Sep 2025 11:38:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756985903; bh=gJhzZ7ogTLAF6f3s/nOccNHwhoEfz+6IDelT9pKGKOo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fQIiaPGnAhgtIum7cmZcQJkJhZfZ31SQja/GJCp/+jaKY76pRR5opQXutW/xL9DtE Hv8iJJig0NmnA4AlVWxF5Q/fXVeWY5pu2HZx/Sh67nndQj2orgn/97ERCvU9dmytpD xyWNzwzF5ILfn8DoT6gph44P9mFnLLB7QeWXyQnox0+aK9RikSDc/oV0fcKoyuFO2D z5A81qsa8B0vcivlSnD9bgSRGjPQ9MXgNjxIZ/UQ2KdmQ9ZuKh147EVnR7pJwKCIl4 BOsw+aky3+7A/R328wFamZWl5yfmj9NKadBY7R1tVJmUkgF05KqM5SKSj3KKDKKO9I VLYt3S0r9sgOw== From: "Matthieu Baerts (NGI0)" Date: Thu, 04 Sep 2025 13:38:07 +0200 Subject: [PATCH mptcp-next v2 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: <20250904-sft-mptcp-join-add_addr-no-retrans-v2-3-a019e6678628@kernel.org> References: <20250904-sft-mptcp-join-add_addr-no-retrans-v2-0-a019e6678628@kernel.org> In-Reply-To: <20250904-sft-mptcp-join-add_addr-no-retrans-v2-0-a019e6678628@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1515; i=matttbe@kernel.org; h=from:subject:message-id; bh=gJhzZ7ogTLAF6f3s/nOccNHwhoEfz+6IDelT9pKGKOo=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJ2VmnXdylKyq7fepHd8dXDr1f9zC9oONb/+TNj0hOtJ u1DVyX6OkpZGMS4GGTFFFmk2yLzZz6v4i3x8rOAmcPKBDKEgYtTACZSl8bI8OSo1bwrcZrrmn98 DOtx2lL16CID4wmx6OXNZfXJ+4SfWDEytPQEPl0eUDg3LT575Zzju+vWe+qsyhJmZK35+XD60gX LOQA= 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. Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) --- 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 be49712f91155a1f14f6cc21776764d65a897c27..dc1f7d5b7fbaf5aa71d95c0d3e0= b418cf3916199 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2268,7 +2268,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 @@ -2280,7 +2281,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