| Message ID | 20230131205318.475414-3-andrei.gherzan@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | dafe93b9ee21028d625dce347118b82659652eff |
| Headers | show |
| Series | [net-next,v3,1/4] selftests: net: udpgso_bench_rx: Fix 'used uninitialized' compiler warning | expand |
On Tue, Jan 31, 2023 at 3:56 PM Andrei Gherzan <andrei.gherzan@canonical.com> wrote: > > "udpgro_bench.sh" invokes udpgso_bench_rx/udpgso_bench_tx programs > subsequently and while doing so, there is a chance that the rx one is not > ready to accept socket connections. This racing bug could fail the test > with at least one of the following: > > ./udpgso_bench_tx: connect: Connection refused > ./udpgso_bench_tx: sendmsg: Connection refused > ./udpgso_bench_tx: write: Connection refused > > This change addresses this by making udpgro_bench.sh wait for the rx > program to be ready before firing off the tx one - up to a 10s timeout. > > Fixes: 3a687bef148d ("selftests: udp gso benchmark") > Signed-off-by: Andrei Gherzan <andrei.gherzan@canonical.com> > CC: Paolo Abeni <pabeni@redhat.com> > CC: Willem de Bruijn <willemb@google.com> Same point on fixes to net instead of net-next. Aside from that, looks good. Neat solution. Thanks for the suggestion, Paolo. Reviewed-by: Willem de Bruijn <willemb@google.com>
diff --git a/tools/testing/selftests/net/udpgso_bench.sh b/tools/testing/selftests/net/udpgso_bench.sh index dc932fd65363..640bc43452fa 100755 --- a/tools/testing/selftests/net/udpgso_bench.sh +++ b/tools/testing/selftests/net/udpgso_bench.sh @@ -7,6 +7,7 @@ readonly GREEN='\033[0;92m' readonly YELLOW='\033[0;33m' readonly RED='\033[0;31m' readonly NC='\033[0m' # No Color +readonly TESTPORT=8000 readonly KSFT_PASS=0 readonly KSFT_FAIL=1 @@ -56,11 +57,26 @@ trap wake_children EXIT run_one() { local -r args=$@ + local nr_socks=0 + local i=0 + local -r timeout=10 + + ./udpgso_bench_rx -p "$TESTPORT" & + ./udpgso_bench_rx -p "$TESTPORT" -t & + + # Wait for the above test program to get ready to receive connections. + while [ "$i" -lt "$timeout" ]; do + nr_socks="$(ss -lnHi | grep -c "\*:${TESTPORT}")" + [ "$nr_socks" -eq 2 ] && break + i=$((i + 1)) + sleep 1 + done + if [ "$nr_socks" -ne 2 ]; then + echo "timed out while waiting for udpgso_bench_rx" + exit 1 + fi - ./udpgso_bench_rx & - ./udpgso_bench_rx -t & - - ./udpgso_bench_tx ${args} + ./udpgso_bench_tx -p "$TESTPORT" ${args} } run_in_netns() {
"udpgro_bench.sh" invokes udpgso_bench_rx/udpgso_bench_tx programs subsequently and while doing so, there is a chance that the rx one is not ready to accept socket connections. This racing bug could fail the test with at least one of the following: ./udpgso_bench_tx: connect: Connection refused ./udpgso_bench_tx: sendmsg: Connection refused ./udpgso_bench_tx: write: Connection refused This change addresses this by making udpgro_bench.sh wait for the rx program to be ready before firing off the tx one - up to a 10s timeout. Fixes: 3a687bef148d ("selftests: udp gso benchmark") Signed-off-by: Andrei Gherzan <andrei.gherzan@canonical.com> CC: Paolo Abeni <pabeni@redhat.com> CC: Willem de Bruijn <willemb@google.com> --- tools/testing/selftests/net/udpgso_bench.sh | 24 +++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)