ip: Replace Sematics for Interface IP addresses

[vpp.git] / src / plugins / vmxnet3 / input.c

diff --git a/src/plugins/vmxnet3/input.c b/src/plugins/vmxnet3/input.c
index 87aa29c..173ab91 100644 (file)
--- a/src/plugins/vmxnet3/input.c
+++ b/src/plugins/vmxnet3/input.c
@@ -76,26 +76,10 @@ vmxnet3_rx_comp_ring_advance_next (vmxnet3_rxq_t * rxq)
 
 static_always_inline void
 vmxnet3_handle_offload (vmxnet3_rx_comp * rx_comp, vlib_buffer_t * hb,
-                       u16 * next, u16 gso_size)
+                       u16 gso_size)
 {
   u8 l4_hdr_sz = 0;
 
-  if (gso_size)
-    {
-      if (rx_comp->flags & VMXNET3_RXCF_TCP)
-       {
-         tcp_header_t *tcp =
-           (tcp_header_t *) (hb->data + vnet_buffer (hb)->l4_hdr_offset);
-         l4_hdr_sz = tcp_header_bytes (tcp);
-       }
-      else if (rx_comp->flags & VMXNET3_RXCF_UDP)
-       {
-         udp_header_t *udp =
-           (udp_header_t *) (hb->data + vnet_buffer (hb)->l4_hdr_offset);
-         l4_hdr_sz = sizeof (*udp);
-       }
-    }
-
   if (rx_comp->flags & VMXNET3_RXCF_IP4)
     {
       ip4_header_t *ip4 = (ip4_header_t *) (hb->data +
@@ -108,7 +92,6 @@ vmxnet3_handle_offload (vmxnet3_rx_comp * rx_comp, vlib_buffer_t * hb,
       hb->flags |= VNET_BUFFER_F_L2_HDR_OFFSET_VALID |
        VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
        VNET_BUFFER_F_L4_HDR_OFFSET_VALID | VNET_BUFFER_F_IS_IP4;
-      next[0] = VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT;
 
       /* checksum offload */
       if (!(rx_comp->index & VMXNET3_RXCI_CNC))
@@ -141,11 +124,22 @@ vmxnet3_handle_offload (vmxnet3_rx_comp * rx_comp, vlib_buffer_t * hb,
 
       if (gso_size)
        {
+         if (rx_comp->flags & VMXNET3_RXCF_TCP)
+           {
+             tcp_header_t *tcp =
+               (tcp_header_t *) (hb->data + vnet_buffer (hb)->l4_hdr_offset);
+             l4_hdr_sz = tcp_header_bytes (tcp);
+           }
+         else if (rx_comp->flags & VMXNET3_RXCF_UDP)
+           {
+             udp_header_t *udp =
+               (udp_header_t *) (hb->data + vnet_buffer (hb)->l4_hdr_offset);
+             l4_hdr_sz = sizeof (*udp);
+           }
          vnet_buffer2 (hb)->gso_size = gso_size;
          vnet_buffer2 (hb)->gso_l4_hdr_sz = l4_hdr_sz;
          hb->flags |= VNET_BUFFER_F_GSO;
        }
-      vlib_buffer_advance (hb, device_input_next_node_advance[next[0]]);
     }
   else if (rx_comp->flags & VMXNET3_RXCF_IP6)
     {
@@ -156,7 +150,6 @@ vmxnet3_handle_offload (vmxnet3_rx_comp * rx_comp, vlib_buffer_t * hb,
       hb->flags |= VNET_BUFFER_F_L2_HDR_OFFSET_VALID |
        VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
        VNET_BUFFER_F_L4_HDR_OFFSET_VALID | VNET_BUFFER_F_IS_IP6;
-      next[0] = VNET_DEVICE_INPUT_NEXT_IP6_INPUT;
 
       /* checksum offload */
       if (!(rx_comp->index & VMXNET3_RXCI_CNC))
@@ -184,14 +177,23 @@ vmxnet3_handle_offload (vmxnet3_rx_comp * rx_comp, vlib_buffer_t * hb,
 
       if (gso_size)
        {
+         if (rx_comp->flags & VMXNET3_RXCF_TCP)
+           {
+             tcp_header_t *tcp =
+               (tcp_header_t *) (hb->data + vnet_buffer (hb)->l4_hdr_offset);
+             l4_hdr_sz = tcp_header_bytes (tcp);
+           }
+         else if (rx_comp->flags & VMXNET3_RXCF_UDP)
+           {
+             udp_header_t *udp =
+               (udp_header_t *) (hb->data + vnet_buffer (hb)->l4_hdr_offset);
+             l4_hdr_sz = sizeof (*udp);
+           }
          vnet_buffer2 (hb)->gso_size = gso_size;
          vnet_buffer2 (hb)->gso_l4_hdr_sz = l4_hdr_sz;
          hb->flags |= VNET_BUFFER_F_GSO;
        }
-      vlib_buffer_advance (hb, device_input_next_node_advance[next[0]]);
     }
-  else
-    next[0] = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
 }
 
 static_always_inline uword
@@ -288,7 +290,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
        {
          ASSERT (!(rxd->flags & VMXNET3_RXF_BTYPE));
          /* start segment */
-         if ((vd->lro_enable) &&
+         if (vd->gso_enable &&
              (rx_comp->flags & VMXNET3_RXCF_CT) == VMXNET3_RXCOMP_TYPE_LRO)
            {
              vmxnet3_rx_comp_ext *lro = (vmxnet3_rx_comp_ext *) rx_comp;
@@ -379,17 +381,14 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
            }
 
          if (PREDICT_FALSE (known_next))
-           {
-             next[0] = next_index;
-           }
+           next[0] = next_index;
          else
            {
              ethernet_header_t *e = (ethernet_header_t *) hb->data;
 
-             if (ethernet_frame_is_tagged (e->type))
-               next[0] = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-             else
-               vmxnet3_handle_offload (rx_comp, hb, next, gso_size);
+             next[0] = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+             if (!ethernet_frame_is_tagged (e->type))
+               vmxnet3_handle_offload (rx_comp, hb, gso_size);
            }
 
          n_rx_packets++;
@@ -438,7 +437,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       vlib_increment_combined_counter
        (vnm->interface_main.combined_sw_if_counters +
         VNET_INTERFACE_COUNTER_RX, thread_index,
-        vd->hw_if_index, n_rx_packets, n_rx_bytes);
+        vd->sw_if_index, n_rx_packets, n_rx_bytes);
     }
 
   error = vmxnet3_rxq_refill_ring0 (vm, vd, rxq);
@@ -482,6 +481,7 @@ VLIB_NODE_FN (vmxnet3_input_node) (vlib_main_t * vm,
 VLIB_REGISTER_NODE (vmxnet3_input_node) = {
   .name = "vmxnet3-input",
   .sibling_of = "device-input",
+  .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
   .format_trace = format_vmxnet3_input_trace,
   .type = VLIB_NODE_TYPE_INPUT,
   .state = VLIB_NODE_STATE_DISABLED,