selftests: fix poll error in udpgro.sh
authorPaolo Abeni <pabeni@redhat.com>
Wed, 9 Dec 2020 11:21:13 +0000 (12:21 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Dec 2020 21:22:19 +0000 (13:22 -0800)
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>
tools/testing/selftests/net/udpgso_bench_rx.c

index db3d4a8b5a4c4f61bd1176dc1cbaa8d3fc7168b0..76a24052f4b47652dff9e0b9698a81bb0ae2227d 100644 (file)
@@ -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",