Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests: mptcp: diag: avoid extra waiting

When creating a lot of listener sockets, it is enough to wait only for
the last one, like we are doing before in diag.sh for other subtests.

If we do a check for each listener sockets, each time listing all
available sockets, it can take a very long time in very slow
environments, at the point we can reach some timeout.

When using the debug kconfig, the waiting time switches from more than
8 sec to 0.1 sec on my side. In slow/busy environments, and with a poll
timeout set to 30 ms, the waiting time could go up to ~100 sec because
the listener socket would timeout and stop, while the script would still
be checking one by one if all sockets are ready. The result is that
after having waited for everything to be ready, all sockets have been
stopped due to a timeout, and it is too late for the script to check how
many there were.

While at it, also removed ss options we don't need: we only need the
filtering options, to count how many listener sockets have been created.
We don't need to ask ss to display internal TCP information, and the
memory if the output is dropped by the 'wc -l' command anyway.

Fixes: b4b51d36bbaa ("selftests: mptcp: explicitly trigger the listener diag code-path")
Reported-by: Jakub Kicinski <kuba@kernel.org>
Closes: https://lore.kernel.org/r/20240301063754.2ecefecf@kernel.org
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Matthieu Baerts (NGI0) and committed by
David S. Miller
f05d2283 45bcc034

+3 -6
+3 -6
tools/testing/selftests/net/mptcp/diag.sh
··· 96 96 local expected=$1 97 97 local msg="$2" 98 98 99 - __chk_nr "ss -inmlHMON $ns | wc -l" "$expected" "$msg - mptcp" 0 100 - __chk_nr "ss -inmlHtON $ns | wc -l" "$expected" "$msg - subflows" 99 + __chk_nr "ss -nlHMON $ns | wc -l" "$expected" "$msg - mptcp" 0 100 + __chk_nr "ss -nlHtON $ns | wc -l" "$expected" "$msg - subflows" 101 101 } 102 102 103 103 wait_msk_nr() ··· 304 304 ip netns exec $ns ./mptcp_connect -p $((I + 20001)) \ 305 305 -t ${timeout_poll} -l 0.0.0.0 >/dev/null 2>&1 & 306 306 done 307 - 308 - for I in $(seq 1 $NR_SERVERS); do 309 - mptcp_lib_wait_local_port_listen $ns $((I + 20001)) 310 - done 307 + mptcp_lib_wait_local_port_listen $ns $((NR_SERVERS + 20001)) 311 308 312 309 chk_listener_nr $NR_SERVERS "many listener sockets" 313 310