X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Fdevices.c;h=5c28cadc03c96b93f95c48eed6f5f50bd5598236;hb=b85b0df2a039b694fb2f3c09a01decfb89d7bce2;hp=58c72077f24969ed579aba30325f4f91784bcc53;hpb=f3b53643e87e7521c57cccc157385d2fa4bd0d80;p=vpp.git

diff --git a/src/vnet/devices/devices.c b/src/vnet/devices/devices.c
index 58c72077f24..5c28cadc03c 100644
--- a/src/vnet/devices/devices.c
+++ b/src/vnet/devices/devices.c
@@ -32,7 +32,7 @@ device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 VLIB_REGISTER_NODE (device_input_node) = {
   .function = device_input_fn,
   .name = "device-input",
-  .runtime_data_bytes = sizeof (vnet_device_input_runtime_t),
+  .runtime_data_bytes = sizeof (vnet_hw_if_rx_node_runtime_t),
   .type = VLIB_NODE_TYPE_INPUT,
   .state = VLIB_NODE_STATE_DISABLED,
   .n_next_nodes = VNET_DEVICE_INPUT_N_NEXT_NODES,
@@ -52,10 +52,21 @@ device_input_next_node_advance[((VNET_DEVICE_INPUT_N_NEXT_NODES /
       [VNET_DEVICE_INPUT_NEXT_MPLS_INPUT] = sizeof (ethernet_header_t),
 };
 
+const u32 __attribute__((aligned (CLIB_CACHE_LINE_BYTES)))
+device_input_next_node_flags[((VNET_DEVICE_INPUT_N_NEXT_NODES /
+				CLIB_CACHE_LINE_BYTES) +1) * CLIB_CACHE_LINE_BYTES] =
+{
+      [VNET_DEVICE_INPUT_NEXT_IP4_INPUT] = VNET_BUFFER_F_L3_HDR_OFFSET_VALID,
+      [VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT] = VNET_BUFFER_F_L3_HDR_OFFSET_VALID,
+      [VNET_DEVICE_INPUT_NEXT_IP6_INPUT] = VNET_BUFFER_F_L3_HDR_OFFSET_VALID,
+      [VNET_DEVICE_INPUT_NEXT_MPLS_INPUT] = VNET_BUFFER_F_L3_HDR_OFFSET_VALID,
+};
+
 VNET_FEATURE_ARC_INIT (device_input, static) =
 {
   .arc_name  = "device-input",
   .start_nodes = VNET_FEATURES ("device-input"),
+  .last_in_arc = "ethernet-input",
   .arc_index_ptr = &feature_main.device_input_feature_arc_index,
 };
 
@@ -77,6 +88,12 @@ VNET_FEATURE_INIT (span_input, static) = {
   .runs_before = VNET_FEATURES ("ethernet-input"),
 };
 
+VNET_FEATURE_INIT (p2p_ethernet_node, static) = {
+  .arc_name = "device-input",
+  .node_name = "p2p-ethernet-input",
+  .runs_before = VNET_FEATURES ("ethernet-input"),
+};
+
 VNET_FEATURE_INIT (ethernet_input, static) = {
   .arc_name = "device-input",
   .node_name = "ethernet-input",
@@ -84,227 +101,6 @@ VNET_FEATURE_INIT (ethernet_input, static) = {
 };
 /* *INDENT-ON* */
 
-static int
-vnet_device_queue_sort (void *a1, void *a2)
-{
-  vnet_device_and_queue_t *dq1 = a1;
-  vnet_device_and_queue_t *dq2 = a2;
-
-  if (dq1->dev_instance > dq2->dev_instance)
-    return 1;
-  else if (dq1->dev_instance < dq2->dev_instance)
-    return -1;
-  else if (dq1->queue_id > dq2->queue_id)
-    return 1;
-  else if (dq1->queue_id < dq2->queue_id)
-    return -1;
-  else
-    return 0;
-}
-
-static void
-vnet_device_queue_update (vnet_main_t * vnm, vnet_device_input_runtime_t * rt)
-{
-  vnet_device_and_queue_t *dq;
-  vnet_hw_interface_t *hw;
-
-  vec_sort_with_function (rt->devices_and_queues, vnet_device_queue_sort);
-
-  vec_foreach (dq, rt->devices_and_queues)
-  {
-    hw = vnet_get_hw_interface (vnm, dq->hw_if_index);
-    vec_validate (hw->dq_runtime_index_by_queue, dq->queue_id);
-    hw->dq_runtime_index_by_queue[dq->queue_id] = dq - rt->devices_and_queues;
-  }
-}
-
-void
-vnet_hw_interface_assign_rx_thread (vnet_main_t * vnm, u32 hw_if_index,
-				    u16 queue_id, uword thread_index)
-{
-  vnet_device_main_t *vdm = &vnet_device_main;
-  vlib_main_t *vm;
-  vnet_device_input_runtime_t *rt;
-  vnet_device_and_queue_t *dq;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-
-  ASSERT (hw->input_node_index > 0);
-
-  if (vdm->first_worker_thread_index == 0)
-    thread_index = 0;
-
-  if (thread_index != 0 &&
-      (thread_index < vdm->first_worker_thread_index ||
-       thread_index > vdm->last_worker_thread_index))
-    {
-      thread_index = vdm->next_worker_thread_index++;
-      if (vdm->next_worker_thread_index > vdm->last_worker_thread_index)
-	vdm->next_worker_thread_index = vdm->first_worker_thread_index;
-    }
-
-  vm = vlib_mains[thread_index];
-  rt = vlib_node_get_runtime_data (vm, hw->input_node_index);
-
-  vec_add2 (rt->devices_and_queues, dq, 1);
-  dq->hw_if_index = hw_if_index;
-  dq->dev_instance = hw->dev_instance;
-  dq->queue_id = queue_id;
-  dq->mode = VNET_HW_INTERFACE_RX_MODE_POLLING;
-  rt->enabled_node_state = VLIB_NODE_STATE_POLLING;
-
-  vnet_device_queue_update (vnm, rt);
-  vec_validate (hw->input_node_thread_index_by_queue, queue_id);
-  vec_validate (hw->rx_mode_by_queue, queue_id);
-  hw->input_node_thread_index_by_queue[queue_id] = thread_index;
-  hw->rx_mode_by_queue[queue_id] = VNET_HW_INTERFACE_RX_MODE_POLLING;
-  vlib_node_set_state (vm, hw->input_node_index, rt->enabled_node_state);
-}
-
-int
-vnet_hw_interface_unassign_rx_thread (vnet_main_t * vnm, u32 hw_if_index,
-				      u16 queue_id)
-{
-  vlib_main_t *vm;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  vnet_device_input_runtime_t *rt;
-  vnet_device_and_queue_t *dq;
-  uword old_thread_index;
-  vnet_hw_interface_rx_mode mode;
-
-  if (hw->input_node_thread_index_by_queue == 0)
-    return VNET_API_ERROR_INVALID_INTERFACE;
-
-  if (vec_len (hw->input_node_thread_index_by_queue) < queue_id + 1)
-    return VNET_API_ERROR_INVALID_INTERFACE;
-
-  old_thread_index = hw->input_node_thread_index_by_queue[queue_id];
-
-  vm = vlib_mains[old_thread_index];
-
-  rt = vlib_node_get_runtime_data (vm, hw->input_node_index);
-
-  vec_foreach (dq, rt->devices_and_queues)
-    if (dq->hw_if_index == hw_if_index && dq->queue_id == queue_id)
-    {
-      mode = dq->mode;
-      vec_del1 (rt->devices_and_queues, dq - rt->devices_and_queues);
-      goto deleted;
-    }
-
-  return VNET_API_ERROR_INVALID_INTERFACE;
-
-deleted:
-
-  vnet_device_queue_update (vnm, rt);
-  hw->rx_mode_by_queue[queue_id] = VNET_HW_INTERFACE_RX_MODE_UNKNOWN;
-
-  if (vec_len (rt->devices_and_queues) == 0)
-    vlib_node_set_state (vm, hw->input_node_index, VLIB_NODE_STATE_DISABLED);
-  else if (mode == VNET_HW_INTERFACE_RX_MODE_POLLING)
-    {
-      /*
-       * if the deleted interface is polling, we may need to set the node state
-       * to interrupt if there is no more polling interface for this device's
-       * corresponding thread. This is because mixed interfaces
-       * (polling and interrupt), assigned to the same thread, set the
-       * thread to polling prior to the deletion.
-       */
-      vec_foreach (dq, rt->devices_and_queues)
-      {
-	if (dq->mode == VNET_HW_INTERFACE_RX_MODE_POLLING)
-	  return 0;
-      }
-      rt->enabled_node_state = VLIB_NODE_STATE_INTERRUPT;
-      vlib_node_set_state (vm, hw->input_node_index, rt->enabled_node_state);
-    }
-
-  return 0;
-}
-
-
-int
-vnet_hw_interface_set_rx_mode (vnet_main_t * vnm, u32 hw_if_index,
-			       u16 queue_id, vnet_hw_interface_rx_mode mode)
-{
-  vlib_main_t *vm;
-  uword thread_index;
-  vnet_device_and_queue_t *dq;
-  vlib_node_state_t enabled_node_state;
-  ASSERT (mode < VNET_HW_INTERFACE_NUM_RX_MODES);
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  vnet_device_input_runtime_t *rt;
-  int is_polling = 0;
-
-  if (hw->input_node_thread_index_by_queue == 0 || hw->rx_mode_by_queue == 0)
-    return VNET_API_ERROR_INVALID_INTERFACE;
-
-  if (hw->rx_mode_by_queue[queue_id] == mode)
-    return 0;
-
-  if (mode != VNET_HW_INTERFACE_RX_MODE_POLLING &&
-      (hw->flags & VNET_HW_INTERFACE_FLAG_SUPPORTS_INT_MODE) == 0)
-    return VNET_API_ERROR_UNSUPPORTED;
-
-  hw->rx_mode_by_queue[queue_id] = mode;
-  thread_index = hw->input_node_thread_index_by_queue[queue_id];
-  vm = vlib_mains[thread_index];
-
-  rt = vlib_node_get_runtime_data (vm, hw->input_node_index);
-
-  vec_foreach (dq, rt->devices_and_queues)
-  {
-    if (dq->hw_if_index == hw_if_index && dq->queue_id == queue_id)
-      dq->mode = mode;
-    if (dq->mode == VNET_HW_INTERFACE_RX_MODE_POLLING)
-      is_polling = 1;
-  }
-
-  if (is_polling)
-    enabled_node_state = VLIB_NODE_STATE_POLLING;
-  else
-    enabled_node_state = VLIB_NODE_STATE_INTERRUPT;
-
-  if (rt->enabled_node_state != enabled_node_state)
-    {
-      rt->enabled_node_state = enabled_node_state;
-      if (vlib_node_get_state (vm, hw->input_node_index) !=
-	  VLIB_NODE_STATE_DISABLED)
-	vlib_node_set_state (vm, hw->input_node_index, enabled_node_state);
-    }
-
-  return 0;
-}
-
-int
-vnet_hw_interface_get_rx_mode (vnet_main_t * vnm, u32 hw_if_index,
-			       u16 queue_id, vnet_hw_interface_rx_mode * mode)
-{
-  vlib_main_t *vm;
-  uword thread_index;
-  vnet_device_and_queue_t *dq;
-  vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
-  vnet_device_input_runtime_t *rt;
-
-  if (hw->input_node_thread_index_by_queue == 0)
-    return VNET_API_ERROR_INVALID_INTERFACE;
-
-  thread_index = hw->input_node_thread_index_by_queue[queue_id];
-  vm = vlib_mains[thread_index];
-
-  rt = vlib_node_get_runtime_data (vm, hw->input_node_index);
-
-  vec_foreach (dq, rt->devices_and_queues)
-    if (dq->hw_if_index == hw_if_index && dq->queue_id == queue_id)
-    {
-      *mode = dq->mode;
-      return 0;
-    }
-
-  return VNET_API_ERROR_INVALID_INTERFACE;
-}
-
-
-
 static clib_error_t *
 vnet_device_init (vlib_main_t * vm)
 {