X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fmain.c;h=5efeac26f79475238f9d5314688dec1e764c82af;hb=6d2f214dab3984995bdbe03ad30487ac2d01b555;hp=d32ca7b8ea2d269a46c17e69b2f76902bf687150;hpb=2877eee189993dbd1b9a5c3d22499930a4768786;p=vpp.git

diff --git a/src/vlib/main.c b/src/vlib/main.c
index d32ca7b8ea2..5efeac26f79 100644
--- a/src/vlib/main.c
+++ b/src/vlib/main.c
@@ -1493,13 +1493,12 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main)
 	}
 
       /* Process pre-input nodes. */
-      if (is_main)
-	vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_PRE_INPUT])
-	  cpu_time_now = dispatch_node (vm, n,
-					VLIB_NODE_TYPE_PRE_INPUT,
-					VLIB_NODE_STATE_POLLING,
-					/* frame */ 0,
-					cpu_time_now);
+      vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_PRE_INPUT])
+	cpu_time_now = dispatch_node (vm, n,
+				      VLIB_NODE_TYPE_PRE_INPUT,
+				      VLIB_NODE_STATE_POLLING,
+				      /* frame */ 0,
+				      cpu_time_now);
 
       /* Next process input nodes. */
       vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_INPUT])
@@ -1514,13 +1513,19 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main)
 
       /* Next handle interrupts. */
       {
+	/* unlocked read, for performance */
 	uword l = _vec_len (nm->pending_interrupt_node_runtime_indices);
 	uword i;
-	if (l > 0)
+	if (PREDICT_FALSE (l > 0))
 	  {
 	    u32 *tmp;
 	    if (!is_main)
-	      clib_spinlock_lock (&nm->pending_interrupt_lock);
+	      {
+		clib_spinlock_lock (&nm->pending_interrupt_lock);
+		/* Re-read w/ lock held, in case another thread added an item */
+		l = _vec_len (nm->pending_interrupt_node_runtime_indices);
+	      }
+
 	    tmp = nm->pending_interrupt_node_runtime_indices;
 	    nm->pending_interrupt_node_runtime_indices =
 	      last_node_runtime_indices;