X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.c;h=e98f9b7c84a4fa9498104dcac4de8bb1477f5775;hb=2645f68985df4955fd8a161224595dad9f4ab488;hp=28f46f17b93a909b8308b552739deb9468df085d;hpb=67c90a32b7ad0c5a38c483ce849cc7a231e7ba54;p=vpp.git

diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index 28f46f17b93..e98f9b7c84a 100644
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -2713,6 +2713,12 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
 	  VDBG (0, "EPOLL_CTL_ADD: NULL pointer to epoll_event structure!");
 	  return VPPCOM_EINVAL;
 	}
+      if (s->flags & VCL_SESSION_F_IS_VEP_SESSION)
+	{
+	  VDBG (0, "EPOLL_CTL_ADD: %u already epolled!", s->session_index);
+	  rv = VPPCOM_EEXIST;
+	  goto done;
+	}
       if (vep_session->vep.next_sh != ~0)
 	{
 	  vcl_session_t *next_session;
@@ -2771,7 +2777,7 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
       else if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP_SESSION)))
 	{
 	  VDBG (0, "sh %u EPOLL_CTL_MOD: not a vep session!", session_handle);
-	  rv = VPPCOM_EINVAL;
+	  rv = VPPCOM_ENOENT;
 	  goto done;
 	}
       else if (PREDICT_FALSE (s->vep.vep_sh != vep_handle))
@@ -2782,15 +2788,24 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
 	  goto done;
 	}
 
-      /* Generate EPOLLOUT when tx_fifo/ct_tx_fifo not full */
-      if ((event->events & EPOLLOUT) &&
-	  !(s->vep.ev.events & EPOLLOUT) && (vcl_session_write_ready (s) > 0))
+      /* Generate EPOLLOUT if session write ready nd event was not on */
+      if ((event->events & EPOLLOUT) && !(s->vep.ev.events & EPOLLOUT) &&
+	  (vcl_session_write_ready (s) > 0))
 	{
 	  session_event_t e = { 0 };
 	  e.event_type = SESSION_IO_EVT_TX;
 	  e.session_index = s->session_index;
 	  vec_add1 (wrk->unhandled_evts_vector, e);
 	}
+      /* Generate EPOLLIN if session read ready and event was not on */
+      if ((event->events & EPOLLIN) && !(s->vep.ev.events & EPOLLIN) &&
+	  (vcl_session_read_ready (s) > 0))
+	{
+	  session_event_t e = { 0 };
+	  e.event_type = SESSION_IO_EVT_RX;
+	  e.session_index = s->session_index;
+	  vec_add1 (wrk->unhandled_evts_vector, e);
+	}
       s->vep.et_mask = VEP_DEFAULT_ET_MASK;
       s->vep.ev = *event;
       txf = vcl_session_is_ct (s) ? s->ct_tx_fifo : s->tx_fifo;
@@ -2809,7 +2824,7 @@ vppcom_epoll_ctl (uint32_t vep_handle, int op, uint32_t session_handle,
       if (PREDICT_FALSE (!(s->flags & VCL_SESSION_F_IS_VEP_SESSION)))
 	{
 	  VDBG (0, "EPOLL_CTL_DEL: %u not a vep session!", session_handle);
-	  rv = VPPCOM_EINVAL;
+	  rv = VPPCOM_ENOENT;
 	  goto done;
 	}
       else if (PREDICT_FALSE (s->vep.vep_sh != vep_handle))