From: Florin Coras <fcoras@cisco.com>
Date: Fri, 12 Oct 2018 20:09:36 +0000 (-0700)
Subject: vcl: fix empty epoll returns (VPP-1453)
X-Git-Tag: v19.04-rc0~627
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=a4878ed07801cd95e2a46372aa41e162ad170b68

vcl: fix empty epoll returns (VPP-1453)

Change-Id: I0b191ddb749b1aa132c2d33b8359c146b36d27af
Signed-off-by: Florin Coras <fcoras@cisco.com>
---

diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index 3f12b86df42..df4ebde72eb 100644
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -2508,6 +2508,7 @@ vppcom_epoll_wait_eventfd (vcl_worker_t * wrk, struct epoll_event *events,
   u64 buf;
 
   vec_validate (wrk->mq_events, pool_elts (wrk->mq_evt_conns));
+again:
   n_mq_evts = epoll_wait (wrk->mqs_epfd, wrk->mq_events,
 			  vec_len (wrk->mq_events), wait_for_time);
   for (i = 0; i < n_mq_evts; i++)
@@ -2516,6 +2517,8 @@ vppcom_epoll_wait_eventfd (vcl_worker_t * wrk, struct epoll_event *events,
       n_read = read (mqc->mq_fd, &buf, sizeof (buf));
       vcl_epoll_wait_handle_mq (wrk, mqc->mq, events, maxevents, 0, &n_evts);
     }
+  if (!n_evts && n_mq_evts > 0)
+    goto again;
 
   return (int) n_evts;
 }