Skip to content

Commit 636e7d6

Browse files
matttbegregkh
authored andcommitted
selftests: mptcp: join: validate C-flag + def limit
commit 008385e upstream. The previous commit adds an exception for the C-flag case. The 'mptcp_join.sh' selftest is extended to validate this case. In this subtest, there is a typical CDN deployment with a client where MPTCP endpoints have been 'automatically' configured: - the server set net.mptcp.allow_join_initial_addr_port=0 - the client has multiple 'subflow' endpoints, and the default limits: not accepting ADD_ADDRs. Without the parent patch, the client is not able to establish new subflows using its 'subflow' endpoints. The parent commit fixes that. The 'Fixes' tag here below is the same as the one from the previous commit: this patch here is not fixing anything wrong in the selftests, but it validates the previous fix for an issue introduced by this commit ID. Fixes: df377be ("mptcp: add deny_join_id0 in mptcp_options_received") Cc: stable@vger.kernel.org Reviewed-by: Geliang Tang <geliang@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20250925-net-next-mptcp-c-flag-laminar-v1-2-ad126cc47c6b@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> [ Conflicts in mptcp_join.sh, because many different helpers have been modified in newer kernel versions, e.g. in commit 03668c6 ("selftests: mptcp: join: rework detailed report"), or commit 985de45 ("selftests: mptcp: centralize stats dumping"), etc. Adaptations have been made to use the old way, similar to what is done just above. ] Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4b9b376 commit 636e7d6

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

tools/testing/selftests/net/mptcp/mptcp_join.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,6 +1826,16 @@ deny_join_id0_tests()
18261826
ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
18271827
run_tests $ns1 $ns2 10.0.1.1
18281828
chk_join_nr "subflow and address allow join id0 2" 1 1 1
1829+
1830+
# default limits, server deny join id 0 + signal
1831+
reset_with_allow_join_id0 0 1
1832+
ip netns exec $ns1 ./pm_nl_ctl limits 0 2
1833+
ip netns exec $ns2 ./pm_nl_ctl limits 0 2
1834+
ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
1835+
ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow
1836+
ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow
1837+
run_tests $ns1 $ns2 10.0.1.1
1838+
chk_join_nr "default limits, server deny join id 0" 2 2 2
18291839
}
18301840

18311841
fullmesh_tests()

0 commit comments

Comments
 (0)