1 files changed, 50 insertions, 10 deletions

diff --git a/src/vnet/devices/devices.h b/src/vnet/devices/devices.h
index 966f8302230..baf03b7cd2a 100644
--- a/src/vnet/devices/devices.h
+++ b/src/vnet/devices/devices.h
@@ -55,16 +55,26 @@ typedef struct
   uword next_worker_thread_index;
 } vnet_device_main_t;
 
+typedef enum
+{
+  VNET_DEVICE_INPUT_MODE_POLLING = 0,
+  VNET_DEVICE_INPUT_MODE_INTERRUPT,
+  VNET_DEVICE_INPUT_N_MODES,
+} vnet_device_input_mode_t;
+
 typedef struct
 {
   u32 hw_if_index;
   u32 dev_instance;
   u16 queue_id;
+  vnet_device_input_mode_t mode;
+  uword interrupt_pending;
 } vnet_device_and_queue_t;
 
 typedef struct
 {
   vnet_device_and_queue_t *devices_and_queues;
+  vlib_node_state_t enabled_node_state;
 } vnet_device_input_runtime_t;
 
 extern vnet_device_main_t vnet_device_main;
@@ -72,15 +82,22 @@ extern vlib_node_registration_t device_input_node;
 extern const u32 device_input_next_node_advance[];
 
 static inline void
-vnet_set_device_input_node (u32 hw_if_index, u32 node_index)
+vnet_set_device_input_node (vnet_main_t * vnm, u32 hw_if_index,
+			    u32 node_index)
 {
-  vnet_main_t *vnm = vnet_get_main ();
   vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
   hw->input_node_index = node_index;
 }
 
-void vnet_device_input_assign_thread (u32 hw_if_index, u16 queue_id,
-				      uword thread_index);
+void vnet_device_input_assign_thread (vnet_main_t * vnm, u32 hw_if_index,
+				      u16 queue_id, uword thread_index);
+int vnet_device_input_unassign_thread (vnet_main_t * vnm, u32 hw_if_index,
+				       u16 queue_id, uword thread_index);
+int vnet_device_input_set_mode (vnet_main_t * vnm, u32 hw_if_index,
+				u16 queue_id, vnet_device_input_mode_t mode);
+int vnet_device_input_get_mode (vnet_main_t * vnm, u32 hw_if_index,
+				u16 queue_id,
+				vnet_device_input_mode_t * mode);
 
 static inline u64
 vnet_get_aggregate_rx_packets (void)
@@ -111,18 +128,41 @@ vnet_get_device_and_queue (vlib_main_t * vm, vlib_node_runtime_t * node)
   return rt->devices_and_queues;
 }
 
+static_always_inline uword
+vnet_get_device_input_thread_index (vnet_main_t * vnm, u32 hw_if_index,
+				    u16 queue_id)
+{
+  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
+  ASSERT (queue_id < vec_len (hw->input_node_thread_index_by_queue));
+  return hw->input_node_thread_index_by_queue[queue_id];
+}
+
 static_always_inline void
 vnet_device_input_set_interrupt_pending (vnet_main_t * vnm, u32 hw_if_index,
 					 u16 queue_id)
 {
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-
-  ASSERT (queue_id < vec_len (hw->input_node_thread_index_by_queue));
-  u32 thread_index = hw->input_node_thread_index_by_queue[queue_id];
-  vlib_node_set_interrupt_pending (vlib_mains[thread_index],
-				   hw->input_node_index);
+  vlib_main_t *vm;
+  vnet_hw_interface_t *hw;
+  vnet_device_input_runtime_t *rt;
+  vnet_device_and_queue_t *dq;
+  uword idx;
+
+  hw = vnet_get_hw_interface (vnm, hw_if_index);
+  idx = vnet_get_device_input_thread_index (vnm, hw_if_index, queue_id);
+  vm = vlib_mains[idx];
+  rt = vlib_node_get_runtime_data (vm, hw->input_node_index);
+  idx = hw->dq_runtime_index_by_queue[queue_id];
+  dq = vec_elt_at_index (rt->devices_and_queues, idx);
+  dq->interrupt_pending = 1;
+
+  vlib_node_set_interrupt_pending (vm, hw->input_node_index);
 }
 
+#define foreach_device_and_queue(var,vec) \
+  for (var = (vec); var < vec_end (vec); var++)			\
+    if (clib_smp_swap (&((var)->interrupt_pending), 0) ||	\
+	var->mode == VNET_DEVICE_INPUT_MODE_POLLING)
+
 #endif /* included_vnet_vnet_device_h */
 
 /*