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

selftests: net: more strict check in net_helper

The helper waiting for a listener port can match any socket whose
hexadecimal representation of source or destination addresses
matches that of the given port.

Additionally, any socket state is accepted.

All the above can let the helper return successfully before the
relevant listener is actually ready, with unexpected results.

So far I could not find any related failure in the netdev CI, but
the next patch is going to make the critical event more easily
reproducible.

Address the issue matching the port hex only vs the relevant socket
field and additionally checking the socket state for TCP sockets.

Fixes: 3bdd9fd29cb0 ("selftests/net: synchronize udpgro tests' tx and rx connection")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Link: https://lore.kernel.org/r/192b3dbc443d953be32991d1b0ca432bd4c65008.1707731086.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Paolo Abeni and committed by
Jakub Kicinski
a71d0908 a7ee79b9

+7 -4
+7 -4
tools/testing/selftests/net/net_helper.sh
··· 8 8 local listener_ns="${1}" 9 9 local port="${2}" 10 10 local protocol="${3}" 11 - local port_hex 11 + local pattern 12 12 local i 13 13 14 - port_hex="$(printf "%04X" "${port}")" 14 + pattern=":$(printf "%04X" "${port}") " 15 + 16 + # for tcp protocol additionally check the socket state 17 + [ ${protocol} = "tcp" ] && pattern="${pattern}0A" 15 18 for i in $(seq 10); do 16 - if ip netns exec "${listener_ns}" cat /proc/net/"${protocol}"* | \ 17 - grep -q "${port_hex}"; then 19 + if ip netns exec "${listener_ns}" awk '{print $2" "$4}' \ 20 + /proc/net/"${protocol}"* | grep -q "${pattern}"; then 18 21 break 19 22 fi 20 23 sleep 0.1