Skip to content

Commit bb7a3f0

Browse files
matttbegregkh
authored andcommitted
selftests: mptcp: userspace pm: validate deny-join-id0 flag
[ Upstream commit 24733e1 ] The previous commit adds the MPTCP_PM_EV_FLAG_DENY_JOIN_ID0 flag. Make sure it is correctly announced by the other peer when it has been received. pm_nl_ctl will now display 'deny_join_id0:1' when monitoring the events, and when this flag was set by the other peer. 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: 702c2f6 ("mptcp: netlink: allow userspace-driven subflow establishment") Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20250912-net-mptcp-pm-uspace-deny_join_id0-v1-3-40171884ade8@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 7f5b09c commit bb7a3f0

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

tools/testing/selftests/net/mptcp/pm_nl_ctl.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,13 @@ static int capture_events(int fd, int event_group)
188188
fprintf(stderr, ",error:%u", *(__u8 *)RTA_DATA(attrs));
189189
else if (attrs->rta_type == MPTCP_ATTR_SERVER_SIDE)
190190
fprintf(stderr, ",server_side:%u", *(__u8 *)RTA_DATA(attrs));
191+
else if (attrs->rta_type == MPTCP_ATTR_FLAGS) {
192+
__u16 flags = *(__u16 *)RTA_DATA(attrs);
193+
194+
/* only print when present, easier */
195+
if (flags & MPTCP_PM_EV_FLAG_DENY_JOIN_ID0)
196+
fprintf(stderr, ",deny_join_id0:1");
197+
}
191198

192199
attrs = RTA_NEXT(attrs, msg_len);
193200
}

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@ make_connection()
173173
is_v6="v4"
174174
fi
175175

176+
# set this on the client side only: will not affect the rest
177+
ip netns exec "$ns2" sysctl -q net.mptcp.allow_join_initial_addr_port=0
178+
176179
:>"$client_evts"
177180
:>"$server_evts"
178181

@@ -195,23 +198,28 @@ make_connection()
195198
local client_token
196199
local client_port
197200
local client_serverside
201+
local client_nojoin
198202
local server_token
199203
local server_serverside
204+
local server_nojoin
200205

201206
client_token=$(mptcp_lib_evts_get_info token "$client_evts")
202207
client_port=$(mptcp_lib_evts_get_info sport "$client_evts")
203208
client_serverside=$(mptcp_lib_evts_get_info server_side "$client_evts")
209+
client_nojoin=$(mptcp_lib_evts_get_info deny_join_id0 "$client_evts")
204210
server_token=$(mptcp_lib_evts_get_info token "$server_evts")
205211
server_serverside=$(mptcp_lib_evts_get_info server_side "$server_evts")
212+
server_nojoin=$(mptcp_lib_evts_get_info deny_join_id0 "$server_evts")
206213

207214
print_test "Established IP${is_v6} MPTCP Connection ns2 => ns1"
208-
if [ "$client_token" != "" ] && [ "$server_token" != "" ] && [ "$client_serverside" = 0 ] &&
209-
[ "$server_serverside" = 1 ]
215+
if [ "${client_token}" != "" ] && [ "${server_token}" != "" ] &&
216+
[ "${client_serverside}" = 0 ] && [ "${server_serverside}" = 1 ] &&
217+
[ "${client_nojoin:-0}" = 0 ] && [ "${server_nojoin:-0}" = 1 ]
210218
then
211219
test_pass
212220
print_title "Connection info: ${client_addr}:${client_port} -> ${connect_addr}:${app_port}"
213221
else
214-
test_fail "Expected tokens (c:${client_token} - s:${server_token}) and server (c:${client_serverside} - s:${server_serverside})"
222+
test_fail "Expected tokens (c:${client_token} - s:${server_token}), server (c:${client_serverside} - s:${server_serverside}), nojoin (c:${client_nojoin} - s:${server_nojoin})"
215223
mptcp_lib_result_print_all_tap
216224
exit ${KSFT_FAIL}
217225
fi

0 commit comments

Comments
 (0)