summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2020-12-09 12:21:13 +0100
committerDavid S. Miller <davem@davemloft.net>2020-12-10 22:22:19 +0100
commit38bf8cd821be292e7d8e6f6283d67c5d9708f887 (patch)
tree503dec065f1da607a538f61a14a94bdd6b9c2642
parentMAINTAINERS: Add entry for Marvell Prestera Ethernet Switch driver (diff)
downloadlinux-38bf8cd821be292e7d8e6f6283d67c5d9708f887.tar.xz
linux-38bf8cd821be292e7d8e6f6283d67c5d9708f887.zip
selftests: fix poll error in udpgro.sh
The test program udpgso_bench_rx always invokes the poll() syscall with a timeout of 10ms. If a larger timeout is specified via the command line, udpgso_bench_rx is supposed to do multiple poll() calls till the timeout is expired or an event is received. Currently the poll() loop errors out after the first invocation with no events, and may causes self-tests failure alike: failed GRO with custom segment size ./udpgso_bench_rx: poll: 0x0 expected 0x1 This change addresses the issue allowing the poll() loop to consume all the configured timeout. Fixes: ada641ff6ed3 ("selftests: fixes for UDP GRO") Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--tools/testing/selftests/net/udpgso_bench_rx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/testing/selftests/net/udpgso_bench_rx.c b/tools/testing/selftests/net/udpgso_bench_rx.c
index db3d4a8b5a4c..76a24052f4b4 100644
--- a/tools/testing/selftests/net/udpgso_bench_rx.c
+++ b/tools/testing/selftests/net/udpgso_bench_rx.c
@@ -113,6 +113,9 @@ static void do_poll(int fd, int timeout_ms)
interrupted = true;
break;
}
+
+ /* no events and more time to wait, do poll again */
+ continue;
}
if (pfd.revents != POLLIN)
error(1, errno, "poll: 0x%x expected 0x%x\n",