mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
selftests: xsk: add timeout to tests
Add a timeout to the tests so that if all packets have not been received within 3 seconds, fail the ongoing test. Hinders a test from dead-locking if there is something wrong. Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com> Link: https://lore.kernel.org/r/20220510115604.8717-6-magnus.karlsson@gmail.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
parent
895b62eed2
commit
db1bd7a994
2 changed files with 16 additions and 0 deletions
|
@ -91,6 +91,7 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
#include <sys/time.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/queue.h>
|
#include <sys/queue.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
@ -792,6 +793,7 @@ static int complete_pkts(struct xsk_socket_info *xsk, int batch_size)
|
||||||
|
|
||||||
static int receive_pkts(struct ifobject *ifobj, struct pollfd *fds)
|
static int receive_pkts(struct ifobject *ifobj, struct pollfd *fds)
|
||||||
{
|
{
|
||||||
|
struct timeval tv_end, tv_now, tv_timeout = {RECV_TMOUT, 0};
|
||||||
struct pkt_stream *pkt_stream = ifobj->pkt_stream;
|
struct pkt_stream *pkt_stream = ifobj->pkt_stream;
|
||||||
struct pkt *pkt = pkt_stream_get_next_rx_pkt(pkt_stream);
|
struct pkt *pkt = pkt_stream_get_next_rx_pkt(pkt_stream);
|
||||||
struct xsk_socket_info *xsk = ifobj->xsk;
|
struct xsk_socket_info *xsk = ifobj->xsk;
|
||||||
|
@ -799,7 +801,20 @@ static int receive_pkts(struct ifobject *ifobj, struct pollfd *fds)
|
||||||
u32 idx_rx = 0, idx_fq = 0, rcvd, i;
|
u32 idx_rx = 0, idx_fq = 0, rcvd, i;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
ret = gettimeofday(&tv_now, NULL);
|
||||||
|
if (ret)
|
||||||
|
exit_with_error(errno);
|
||||||
|
timeradd(&tv_now, &tv_timeout, &tv_end);
|
||||||
|
|
||||||
while (pkt) {
|
while (pkt) {
|
||||||
|
ret = gettimeofday(&tv_now, NULL);
|
||||||
|
if (ret)
|
||||||
|
exit_with_error(errno);
|
||||||
|
if (timercmp(&tv_now, &tv_end, >)) {
|
||||||
|
ksft_print_msg("ERROR: [%s] Receive loop timed out\n", __func__);
|
||||||
|
return TEST_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
kick_rx(xsk);
|
kick_rx(xsk);
|
||||||
|
|
||||||
rcvd = xsk_ring_cons__peek(&xsk->rx, BATCH_SIZE, &idx_rx);
|
rcvd = xsk_ring_cons__peek(&xsk->rx, BATCH_SIZE, &idx_rx);
|
||||||
|
|
|
@ -49,6 +49,7 @@
|
||||||
#define SOCK_RECONF_CTR 10
|
#define SOCK_RECONF_CTR 10
|
||||||
#define BATCH_SIZE 64
|
#define BATCH_SIZE 64
|
||||||
#define POLL_TMOUT 1000
|
#define POLL_TMOUT 1000
|
||||||
|
#define RECV_TMOUT 3
|
||||||
#define DEFAULT_PKT_CNT (4 * 1024)
|
#define DEFAULT_PKT_CNT (4 * 1024)
|
||||||
#define DEFAULT_UMEM_BUFFERS (DEFAULT_PKT_CNT / 4)
|
#define DEFAULT_UMEM_BUFFERS (DEFAULT_PKT_CNT / 4)
|
||||||
#define UMEM_SIZE (DEFAULT_UMEM_BUFFERS * XSK_UMEM__DEFAULT_FRAME_SIZE)
|
#define UMEM_SIZE (DEFAULT_UMEM_BUFFERS * XSK_UMEM__DEFAULT_FRAME_SIZE)
|
||||||
|
|
Loading…
Reference in a new issue