Skip to content

Commit d61459d

Browse files
matttbematttbe
committed
tgupdate: merge t/DO-NOT-MERGE-mptcp-use-kmalloc-on-kasan-build base into t/DO-NOT-MERGE-mptcp-use-kmalloc-on-kasan-build
2 parents 9ef4f31 + 9619ec2 commit d61459d

File tree

6 files changed

+79
-48
lines changed

6 files changed

+79
-48
lines changed

‎tools/testing/selftests/net/mptcp/mptcp_connect.sh‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,15 @@ do_transfer()
375375
local capfile="${rndh}-${connector_ns:0:3}-${listener_ns:0:3}-${cl_proto}-${srv_proto}-${connect_addr}-${port}"
376376
local capopt="-i any -s 65535 -B 32768 ${capuser}"
377377

378-
ip netns exec ${listener_ns} tcpdump ${capopt} -w "${capfile}-listener.pcap" >> "${capout}" 2>&1 &
378+
ip netns exec ${listener_ns} tcpdump ${capopt} \
379+
-w "${capfile}-listener.pcap" >> "${capout}" 2>&1 &
379380
local cappid_listener=$!
380381

381-
ip netns exec ${connector_ns} tcpdump ${capopt} -w "${capfile}-connector.pcap" >> "${capout}" 2>&1 &
382-
local cappid_connector=$!
382+
if [ ${listener_ns} != ${connector_ns} ]; then
383+
ip netns exec ${connector_ns} tcpdump ${capopt} \
384+
-w "${capfile}-connector.pcap" >> "${capout}" 2>&1 &
385+
local cappid_connector=$!
386+
fi
383387

384388
sleep 1
385389
fi
@@ -389,34 +393,39 @@ do_transfer()
389393
mptcp_lib_nstat_init "${connector_ns}"
390394
fi
391395

392-
timeout ${timeout_test} \
393-
ip netns exec ${listener_ns} \
394-
./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \
395-
$extra_args $local_addr < "$sin" > "$sout" &
396+
ip netns exec ${listener_ns} \
397+
./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \
398+
$extra_args $local_addr < "$sin" > "$sout" &
396399
local spid=$!
397400

398401
mptcp_lib_wait_local_port_listen "${listener_ns}" "${port}"
399402

400403
local start
401404
start=$(date +%s%3N)
402-
timeout ${timeout_test} \
403-
ip netns exec ${connector_ns} \
404-
./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \
405-
$extra_args $connect_addr < "$cin" > "$cout" &
405+
ip netns exec ${connector_ns} \
406+
./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \
407+
$extra_args $connect_addr < "$cin" > "$cout" &
406408
local cpid=$!
407409

410+
mptcp_lib_wait_timeout "${timeout_test}" "${listener_ns}" \
411+
"${connector_ns}" "${port}" "${cpid}" "${spid}" &
412+
local timeout_pid=$!
413+
408414
wait $cpid
409415
local retc=$?
410416
wait $spid
411417
local rets=$?
418+
kill $timeout_pid 2>/dev/null && timeout_pid=0
412419

413420
local stop
414421
stop=$(date +%s%3N)
415422

416423
if $capture; then
417424
sleep 1
418425
kill ${cappid_listener}
419-
kill ${cappid_connector}
426+
if [ ${listener_ns} != ${connector_ns} ]; then
427+
kill ${cappid_connector}
428+
fi
420429
fi
421430

422431
mptcp_lib_nstat_get "${listener_ns}"
@@ -427,7 +436,7 @@ do_transfer()
427436
local duration
428437
duration=$((stop-start))
429438
printf "(duration %05sms) " "${duration}"
430-
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
439+
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ] || [ ${timeout_pid} -ne 0 ]; then
431440
mptcp_lib_pr_fail "client exit code $retc, server $rets"
432441
mptcp_lib_pr_err_stats "${listener_ns}" "${connector_ns}" "${port}"
433442

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,52 +1024,53 @@ do_transfer()
10241024
if [ "$test_linkfail" -gt 1 ];then
10251025
listener_in="${sinfail}"
10261026
fi
1027-
timeout ${timeout_test} \
1028-
ip netns exec ${listener_ns} \
1029-
./mptcp_connect -t ${timeout_poll} -l -p ${port} -s ${srv_proto} \
1030-
${extra_srv_args} "${bind_addr}" < "${listener_in}" > "${sout}" &
1027+
ip netns exec ${listener_ns} \
1028+
./mptcp_connect -t ${timeout_poll} -l -p ${port} -s ${srv_proto} \
1029+
${extra_srv_args} "${bind_addr}" < "${listener_in}" > "${sout}" &
10311030
local spid=$!
10321031

10331032
mptcp_lib_wait_local_port_listen "${listener_ns}" "${port}"
10341033

10351034
extra_cl_args="$extra_args $extra_cl_args"
10361035
if [ "$test_linkfail" -eq 0 ];then
1037-
timeout ${timeout_test} \
1038-
ip netns exec ${connector_ns} \
1039-
./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \
1040-
$extra_cl_args $connect_addr < "$cin" > "$cout" &
1036+
ip netns exec ${connector_ns} \
1037+
./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \
1038+
$extra_cl_args $connect_addr < "$cin" > "$cout" &
10411039
elif [ "$test_linkfail" -eq 1 ] || [ "$test_linkfail" -eq 2 ];then
10421040
connector_in="${cinsent}"
10431041
( cat "$cinfail" ; sleep 2; link_failure $listener_ns ; cat "$cinfail" ) | \
10441042
tee "$cinsent" | \
1045-
timeout ${timeout_test} \
10461043
ip netns exec ${connector_ns} \
10471044
./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \
10481045
$extra_cl_args $connect_addr > "$cout" &
10491046
else
10501047
connector_in="${cinsent}"
10511048
tee "$cinsent" < "$cinfail" | \
1052-
timeout ${timeout_test} \
1053-
ip netns exec ${connector_ns} \
1054-
./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \
1055-
$extra_cl_args $connect_addr > "$cout" &
1049+
ip netns exec ${connector_ns} \
1050+
./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \
1051+
$extra_cl_args $connect_addr > "$cout" &
10561052
fi
10571053
local cpid=$!
10581054

1055+
mptcp_lib_wait_timeout "${timeout_test}" "${listener_ns}" \
1056+
"${connector_ns}" "${port}" "${cpid}" "${spid}" &
1057+
local timeout_pid=$!
1058+
10591059
pm_nl_set_endpoint $listener_ns $connector_ns $connect_addr
10601060
check_cestab $listener_ns $connector_ns
10611061

10621062
wait $cpid
10631063
local retc=$?
10641064
wait $spid
10651065
local rets=$?
1066+
kill $timeout_pid 2>/dev/null && timeout_pid=0
10661067

10671068
cond_stop_capture
10681069

10691070
mptcp_lib_nstat_get "${listener_ns}"
10701071
mptcp_lib_nstat_get "${connector_ns}"
10711072

1072-
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
1073+
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ] || [ ${timeout_pid} -ne 0 ]; then
10731074
fail_test "client exit code $retc, server $rets"
10741075
mptcp_lib_pr_err_stats "${listener_ns}" "${connector_ns}" "${port}"
10751076
return 1

‎tools/testing/selftests/net/mptcp/mptcp_lib.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,19 @@ mptcp_lib_evts_get_info() {
350350
mptcp_lib_get_info_value "${1}" "^type:${3:-1},"
351351
}
352352

353+
mptcp_lib_wait_timeout() {
354+
local timeout_test="${1}"
355+
local listener_ns="${2}"
356+
local connector_ns="${3}"
357+
local port="${4}"
358+
shift 4 # rest are PIDs
359+
360+
sleep "${timeout_test}"
361+
mptcp_lib_print_err "timeout"
362+
mptcp_lib_pr_err_stats "${listener_ns}" "${connector_ns}" "${port}"
363+
kill "${@}" 2>/dev/null
364+
}
365+
353366
# $1: PID
354367
mptcp_lib_kill_wait() {
355368
[ "${1}" -eq 0 ] && return 0

‎tools/testing/selftests/net/mptcp/mptcp_sockopt.sh‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,31 +172,34 @@ do_transfer()
172172
mptcp_lib_nstat_init "${listener_ns}"
173173
mptcp_lib_nstat_init "${connector_ns}"
174174

175-
timeout ${timeout_test} \
176-
ip netns exec ${listener_ns} \
177-
$mptcp_connect -t ${timeout_poll} -l -M 1 -p $port -s ${srv_proto} -c "${cmsg}" \
178-
${local_addr} < "$sin" > "$sout" &
175+
ip netns exec ${listener_ns} \
176+
$mptcp_connect -t ${timeout_poll} -l -M 1 -p $port -s ${srv_proto} -c "${cmsg}" \
177+
${local_addr} < "$sin" > "$sout" &
179178
local spid=$!
180179

181-
sleep 1
180+
mptcp_lib_wait_local_port_listen "${listener_ns}" "${port}"
182181

183-
timeout ${timeout_test} \
184-
ip netns exec ${connector_ns} \
185-
$mptcp_connect -t ${timeout_poll} -M 2 -p $port -s ${cl_proto} -c "${cmsg}" \
186-
$connect_addr < "$cin" > "$cout" &
182+
ip netns exec ${connector_ns} \
183+
$mptcp_connect -t ${timeout_poll} -M 2 -p $port -s ${cl_proto} -c "${cmsg}" \
184+
$connect_addr < "$cin" > "$cout" &
187185

188186
local cpid=$!
189187

188+
mptcp_lib_wait_timeout "${timeout_test}" "${listener_ns}" \
189+
"${connector_ns}" "${port}" "${cpid}" "${spid}" &
190+
local timeout_pid=$!
191+
190192
wait $cpid
191193
local retc=$?
192194
wait $spid
193195
local rets=$?
196+
kill $timeout_pid 2>/dev/null && timeout_pid=0
194197

195198
mptcp_lib_nstat_get "${listener_ns}"
196199
mptcp_lib_nstat_get "${connector_ns}"
197200

198201
print_title "Transfer ${ip:2}"
199-
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
202+
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ] || [ ${timeout_pid} -ne 0 ]; then
200203
mptcp_lib_pr_fail "client exit code $retc, server $rets"
201204
mptcp_lib_pr_err_stats "${listener_ns}" "${connector_ns}" "${port}"
202205

‎tools/testing/selftests/net/mptcp/simult_flows.sh‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,24 +158,27 @@ do_transfer()
158158
mptcp_lib_nstat_init "${ns3}"
159159
mptcp_lib_nstat_init "${ns1}"
160160

161-
timeout ${timeout_test} \
162-
ip netns exec ${ns3} \
163-
./mptcp_connect -jt ${timeout_poll} -l -p $port -T $max_time \
164-
0.0.0.0 < "$sin" > "$sout" &
161+
ip netns exec ${ns3} \
162+
./mptcp_connect -jt ${timeout_poll} -l -p $port -T $max_time \
163+
0.0.0.0 < "$sin" > "$sout" &
165164
local spid=$!
166165

167166
mptcp_lib_wait_local_port_listen "${ns3}" "${port}"
168167

169-
timeout ${timeout_test} \
170-
ip netns exec ${ns1} \
171-
./mptcp_connect -jt ${timeout_poll} -p $port -T $max_time \
172-
10.0.3.3 < "$cin" > "$cout" &
168+
ip netns exec ${ns1} \
169+
./mptcp_connect -jt ${timeout_poll} -p $port -T $max_time \
170+
10.0.3.3 < "$cin" > "$cout" &
173171
local cpid=$!
174172

173+
mptcp_lib_wait_timeout "${timeout_test}" "${ns3}" "${ns1}" "${port}" \
174+
"${cpid}" "${spid}" &
175+
local timeout_pid=$!
176+
175177
wait $cpid
176178
local retc=$?
177179
wait $spid
178180
local rets=$?
181+
kill $timeout_pid 2>/dev/null && timeout_pid=0
179182

180183
if $capture; then
181184
sleep 1
@@ -191,8 +194,9 @@ do_transfer()
191194
cmp $cin $sout > /dev/null 2>&1
192195
local cmpc=$?
193196

194-
if [ $retc -eq 0 ] && [ $rets -eq 0 ] && \
195-
[ $cmpc -eq 0 ] && [ $cmps -eq 0 ]; then
197+
if [ $retc -eq 0 ] && [ $rets -eq 0 ] &&
198+
[ $cmpc -eq 0 ] && [ $cmps -eq 0 ] &&
199+
[ $timeout_pid -eq 0 ]; then
196200
printf "%-16s" " max $max_time "
197201
mptcp_lib_pr_ok
198202
cat "$capout"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ make_connection()
211211
ip netns exec "$ns1" \
212212
./mptcp_connect -s MPTCP -w 300 -p $app_port -l $listen_addr > /dev/null 2>&1 &
213213
local server_pid=$!
214-
sleep 0.5
214+
215+
mptcp_lib_wait_local_port_listen "${ns1}" "${port}"
215216

216217
# Run the client, transfer $file and stay connected to the server
217218
# to conduct tests

0 commit comments

Comments
 (0)