X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fvmxnet3%2Finput.c;h=4ff459a066ac603b8a6a6b3a445d3c694fee6844;hb=744da656d3442bb812f50d6e8746f0f11adee8b3;hp=a0b9cbca5782a287003b953680ed1fb8f9053784;hpb=8812a68062016e622b33cbae6a21bc073caa918e;p=vpp.git

diff --git a/src/plugins/vmxnet3/input.c b/src/plugins/vmxnet3/input.c
index a0b9cbca578..4ff459a066a 100644
--- a/src/plugins/vmxnet3/input.c
+++ b/src/plugins/vmxnet3/input.c
@@ -25,6 +25,7 @@
 
 #define foreach_vmxnet3_input_error \
   _(BUFFER_ALLOC, "buffer alloc error") \
+  _(RX_PACKET_NO_SOP, "Rx packet error - no SOP") \
   _(RX_PACKET, "Rx packet error") \
   _(NO_BUFFER, "Rx no buffer error")
 
@@ -89,7 +90,9 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   u16 rid;
   vlib_buffer_t *prev_b0 = 0, *hb = 0;
   u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-  u8 known_next = 0;
+  u8 known_next = 0, got_packet = 0;
+  vmxnet3_rx_desc *rxd;
+  clib_error_t *error;
 
   rxq = vec_elt_at_index (vd->rxqs, qid);
   comp_ring = &rxq->rx_comp_ring;
@@ -120,6 +123,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       vmxnet3_rx_comp_ring_advance_next (rxq);
       desc_idx = rx_comp->index & VMXNET3_RXC_INDEX;
       ring->consume = desc_idx;
+      rxd = &rxq->rx_desc[rid][desc_idx];
 
       bi0 = ring->bufs[desc_idx];
       ring->bufs[desc_idx] = ~0;
@@ -137,15 +141,30 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       b0->current_config_index = 0;
       ASSERT (b0->current_length != 0);
 
+      if (PREDICT_FALSE ((rx_comp->index & VMXNET3_RXCI_EOP) &&
+			 (rx_comp->len & VMXNET3_RXCL_ERROR)))
+	{
+	  vlib_buffer_free_one (vm, bi0);
+	  vlib_error_count (vm, node->node_index,
+			    VMXNET3_INPUT_ERROR_RX_PACKET, 1);
+	  if (hb && vlib_get_buffer_index (vm, hb) != bi0)
+	    {
+	      vlib_buffer_free_one (vm, vlib_get_buffer_index (vm, hb));
+	      hb = 0;
+	    }
+	  prev_b0 = 0;
+	  continue;
+	}
+
       if (rx_comp->index & VMXNET3_RXCI_SOP)
 	{
+	  ASSERT (!(rxd->flags & VMXNET3_RXF_BTYPE));
 	  /* start segment */
 	  hb = b0;
 	  bi[0] = bi0;
 	  if (!(rx_comp->index & VMXNET3_RXCI_EOP))
 	    {
 	      hb->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
-	      b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
 	      prev_b0 = b0;
 	    }
 	  else
@@ -154,6 +173,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	       * Both start and end of packet is set. It is a complete packet
 	       */
 	      prev_b0 = 0;
+	      got_packet = 1;
 	    }
 	}
       else if (rx_comp->index & VMXNET3_RXCI_EOP)
@@ -161,26 +181,32 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	  /* end of segment */
 	  if (prev_b0)
 	    {
-	      prev_b0->next_buffer = bi0;
 	      prev_b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
+	      prev_b0->next_buffer = bi0;
 	      hb->total_length_not_including_first_buffer +=
 		b0->current_length;
-	      prev_b0 = 0;	// Get next packet
+	      prev_b0 = 0;
+	      got_packet = 1;
 	    }
 	  else
 	    {
 	      /* EOP without SOP, error */
-	      hb = 0;
 	      vlib_error_count (vm, node->node_index,
-				VMXNET3_INPUT_ERROR_RX_PACKET, 1);
+				VMXNET3_INPUT_ERROR_RX_PACKET_NO_SOP, 1);
 	      vlib_buffer_free_one (vm, bi0);
+	      if (hb && vlib_get_buffer_index (vm, hb) != bi0)
+		{
+		  vlib_buffer_free_one (vm, vlib_get_buffer_index (vm, hb));
+		  hb = 0;
+		}
 	      continue;
 	    }
 	}
       else if (prev_b0)		// !sop && !eop
 	{
 	  /* mid chain */
-	  b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
+	  ASSERT (rxd->flags & VMXNET3_RXF_BTYPE);
+	  prev_b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
 	  prev_b0->next_buffer = bi0;
 	  prev_b0 = b0;
 	  hb->total_length_not_including_first_buffer += b0->current_length;
@@ -192,7 +218,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
       n_rx_bytes += b0->current_length;
 
-      if (!prev_b0)
+      if (got_packet)
 	{
 	  ethernet_header_t *e = (ethernet_header_t *) hb->data;
 
@@ -247,6 +273,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	  next++;
 	  bi++;
 	  hb = 0;
+	  got_packet = 0;
 	}
     }
 
@@ -278,27 +305,25 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
   if (PREDICT_TRUE (n_rx_packets))
     {
-      clib_error_t *error;
-
       vlib_buffer_enqueue_to_next (vm, node, buffer_indices, nexts,
 				   n_rx_packets);
       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);
+    }
 
-      error = vmxnet3_rxq_refill_ring0 (vm, vd, rxq);
-      if (PREDICT_FALSE (error != 0))
-	{
-	  vlib_error_count (vm, node->node_index,
-			    VMXNET3_INPUT_ERROR_BUFFER_ALLOC, 1);
-	}
-      error = vmxnet3_rxq_refill_ring1 (vm, vd, rxq);
-      if (PREDICT_FALSE (error != 0))
-	{
-	  vlib_error_count (vm, node->node_index,
-			    VMXNET3_INPUT_ERROR_BUFFER_ALLOC, 1);
-	}
+  error = vmxnet3_rxq_refill_ring0 (vm, vd, rxq);
+  if (PREDICT_FALSE (error != 0))
+    {
+      vlib_error_count (vm, node->node_index,
+			VMXNET3_INPUT_ERROR_BUFFER_ALLOC, 1);
+    }
+  error = vmxnet3_rxq_refill_ring1 (vm, vd, rxq);
+  if (PREDICT_FALSE (error != 0))
+    {
+      vlib_error_count (vm, node->node_index,
+			VMXNET3_INPUT_ERROR_BUFFER_ALLOC, 1);
     }
 
   return n_rx_packets;