X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Funix%2Finput.c;h=9c7c54f6b1b0c898152c1276dc948f53d25347fc;hb=77c821ccc6b72d18a247e95816ac1013b4dc664d;hp=8be0770bfd389fae469a3b19e6cf8016205f309a;hpb=97f592f474ebaeba0c9a0f50db8f5627cc444aca;p=vpp.git

diff --git a/src/vlib/unix/input.c b/src/vlib/unix/input.c
index 8be0770bfd3..9c7c54f6b1b 100644
--- a/src/vlib/unix/input.c
+++ b/src/vlib/unix/input.c
@@ -145,9 +145,13 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
     vlib_node_main_t *nm = &vm->node_main;
     u32 ticks_until_expiration;
     f64 timeout;
+    f64 now;
     int timeout_ms = 0, max_timeout_ms = 10;
     f64 vector_rate = vlib_last_vectors_per_main_loop (vm);
 
+    if (is_main == 0)
+      now = vlib_time_now (vm);
+
     /*
      * If we've been asked for a fixed-sleep between main loop polls,
      * do so right away.
@@ -195,6 +199,7 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	node->input_main_loops_per_call = 0;
       }
     else if (is_main == 0 && vector_rate < 2 &&
+	     (vlib_get_first_main ()->time_last_barrier_release + 0.5 < now) &&
 	     nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] == 0)
       {
 	timeout = 10e-3;
@@ -223,12 +228,33 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 				      em->epoll_events,
 				      vec_len (em->epoll_events), timeout_ms);
 	  }
+
       }
     else
       {
+	/*
+	 * Worker thread, no epoll fd's, sleep for 100us at a time
+	 * and check for a barrier sync request
+	 */
 	if (timeout_ms)
-	  usleep (timeout_ms * 1000);
-	return 0;
+	  {
+	    struct timespec ts, tsrem;
+	    f64 limit = now + (f64) timeout_ms * 1e-3;
+
+	    while (vlib_time_now (vm) < limit)
+	      {
+		/* Sleep for 100us at a time */
+		ts.tv_sec = 0;
+		ts.tv_nsec = 1000 * 100;
+
+		while (nanosleep (&ts, &tsrem) < 0)
+		  ts = tsrem;
+		if (*vlib_worker_threads->wait_at_barrier ||
+		    *nm->pending_interrupts)
+		  goto done;
+	      }
+	  }
+	goto done;
       }
   }
 
@@ -238,7 +264,7 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	vlib_panic_with_error (vm, clib_error_return_unix (0, "epoll_wait"));
 
       /* non fatal error (e.g. EINTR). */
-      return 0;
+      goto done;
     }
 
   em->epoll_waits += 1;
@@ -247,17 +273,18 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   for (e = em->epoll_events; e < em->epoll_events + n_fds_ready; e++)
     {
       u32 i = e->data.u32;
-      clib_file_t *f = fm->file_pool + i;
+      clib_file_t *f;
       clib_error_t *errors[4];
       int n_errors = 0;
 
+      /*
+       * Under rare scenarios, epoll may still post us events for the
+       * deleted file descriptor. We just deal with it and throw away the
+       * events for the corresponding file descriptor.
+       */
+      f = fm->file_pool + i;
       if (PREDICT_FALSE (pool_is_free (fm->file_pool, f)))
 	{
-	  /*
-	   * Under rare scenerop, epoll may still post us events for the
-	   * deleted file descriptor. We just deal with it and throw away the
-	   * events for the corresponding file descriptor.
-	   */
 	  if (e->events & EPOLLIN)
 	    {
 	      errors[n_errors] =
@@ -284,14 +311,18 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	{
 	  if (e->events & EPOLLIN)
 	    {
-	      errors[n_errors] = f->read_function (f);
 	      f->read_events++;
+	      errors[n_errors] = f->read_function (f);
+	      /* Make sure f is valid if the file pool moves */
+	      if (pool_is_free_index (fm->file_pool, i))
+		continue;
+	      f = pool_elt_at_index (fm->file_pool, i);
 	      n_errors += errors[n_errors] != 0;
 	    }
 	  if (e->events & EPOLLOUT)
 	    {
-	      errors[n_errors] = f->write_function (f);
 	      f->write_events++;
+	      errors[n_errors] = f->write_function (f);
 	      n_errors += errors[n_errors] != 0;
 	    }
 	}
@@ -299,8 +330,8 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	{
 	  if (f->error_function)
 	    {
-	      errors[n_errors] = f->error_function (f);
 	      f->error_events++;
+	      errors[n_errors] = f->error_function (f);
 	      n_errors += errors[n_errors] != 0;
 	    }
 	  else
@@ -314,6 +345,13 @@ linux_epoll_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	}
     }
 
+done:
+  if (PREDICT_FALSE (vm->cpu_id != clib_get_current_cpu_id ()))
+    {
+      vm->cpu_id = clib_get_current_cpu_id ();
+      vm->numa_node = clib_get_current_numa_node ();
+    }
+
   return 0;
 }
 
@@ -375,10 +413,15 @@ VLIB_INIT_FUNCTION (linux_epoll_input_init);
 static clib_error_t *
 unix_input_init (vlib_main_t * vm)
 {
-  return vlib_call_init_function (vm, linux_epoll_input_init);
+  return 0;
 }
 
-VLIB_INIT_FUNCTION (unix_input_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (unix_input_init) =
+{
+  .runs_before = VLIB_INITS ("linux_epoll_input_init"),
+};
+/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON