X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Fvirtio%2Fnode.c;h=d31fb144b8f6e0dd0d0d5deb0694c0baa527f599;hb=3039753eda526e63d57a09debd3762e5590459df;hp=fc2317ecc6924c1ecc80c63a80d0257d345bd27a;hpb=72e7312af04bf8f6ecbc8ce70fe1a6e2ad8852ec;p=vpp.git

diff --git a/src/vnet/devices/virtio/node.c b/src/vnet/devices/virtio/node.c
index fc2317ecc69..d31fb144b8f 100644
--- a/src/vnet/devices/virtio/node.c
+++ b/src/vnet/devices/virtio/node.c
@@ -142,9 +142,12 @@ more:
 }
 
 static_always_inline void
-fill_gso_buffer_flags (vlib_buffer_t * b0, struct virtio_net_hdr_v1 *hdr)
+virtio_needs_csum (vlib_buffer_t * b0, struct virtio_net_hdr_v1 *hdr,
+		   u8 * l4_proto, u8 * l4_hdr_sz)
 {
-  u8 l4_proto = 0;
+  *l4_proto = 0;
+  *l4_hdr_sz = 0;
+
   if (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM)
 
     {
@@ -167,42 +170,71 @@ fill_gso_buffer_flags (vlib_buffer_t * b0, struct virtio_net_hdr_v1 *hdr)
 	    }
 	}
 
+      vnet_buffer (b0)->l2_hdr_offset = 0;
+      vnet_buffer (b0)->l3_hdr_offset = l2hdr_sz;
       if (PREDICT_TRUE (ethertype == ETHERNET_TYPE_IP4))
 	{
 	  ip4_header_t *ip4 =
 	    (ip4_header_t *) (vlib_buffer_get_current (b0) + l2hdr_sz);
-	  l4_proto = ip4->protocol;
+	  vnet_buffer (b0)->l4_hdr_offset = l2hdr_sz + ip4_header_bytes (ip4);
+	  *l4_proto = ip4->protocol;
 	  b0->flags |=
 	    (VNET_BUFFER_F_IS_IP4 | VNET_BUFFER_F_OFFLOAD_IP_CKSUM);
+	  b0->flags |=
+	    (VNET_BUFFER_F_L2_HDR_OFFSET_VALID
+	     | VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
+	     VNET_BUFFER_F_L4_HDR_OFFSET_VALID);
 	}
       else if (PREDICT_TRUE (ethertype == ETHERNET_TYPE_IP6))
 	{
 	  ip6_header_t *ip6 =
 	    (ip6_header_t *) (vlib_buffer_get_current (b0) + l2hdr_sz);
+	  vnet_buffer (b0)->l4_hdr_offset = l2hdr_sz + sizeof (ip6_header_t);
 	  /* FIXME IPv6 EH traversal */
-	  l4_proto = ip6->protocol;
-	  b0->flags |= VNET_BUFFER_F_IS_IP6;
+	  *l4_proto = ip6->protocol;
+	  b0->flags |= (VNET_BUFFER_F_IS_IP6 |
+			VNET_BUFFER_F_L2_HDR_OFFSET_VALID
+			| VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
+			VNET_BUFFER_F_L4_HDR_OFFSET_VALID);
 	}
-      if (l4_proto == IP_PROTOCOL_TCP)
+      if (*l4_proto == IP_PROTOCOL_TCP)
 	{
 	  b0->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
+	  tcp_header_t *tcp = (tcp_header_t *) (vlib_buffer_get_current (b0) +
+						vnet_buffer
+						(b0)->l4_hdr_offset);
+	  *l4_hdr_sz = tcp_header_bytes (tcp);
+	  tcp->checksum = 0;
 	}
-      else if (l4_proto == IP_PROTOCOL_UDP)
+      else if (*l4_proto == IP_PROTOCOL_UDP)
 	{
 	  b0->flags |= VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
+	  udp_header_t *udp = (udp_header_t *) (vlib_buffer_get_current (b0) +
+						vnet_buffer
+						(b0)->l4_hdr_offset);
+	  *l4_hdr_sz = sizeof (*udp);
+	  udp->checksum = 0;
 	}
     }
 
+}
+
+static_always_inline void
+fill_gso_buffer_flags (vlib_buffer_t * b0, struct virtio_net_hdr_v1 *hdr,
+		       u8 l4_proto, u8 l4_hdr_sz)
+{
   if (hdr->gso_type == VIRTIO_NET_HDR_GSO_TCPV4)
     {
       ASSERT (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM);
       vnet_buffer2 (b0)->gso_size = hdr->gso_size;
+      vnet_buffer2 (b0)->gso_l4_hdr_sz = l4_hdr_sz;
       b0->flags |= VNET_BUFFER_F_GSO | VNET_BUFFER_F_IS_IP4;
     }
   if (hdr->gso_type == VIRTIO_NET_HDR_GSO_TCPV6)
     {
       ASSERT (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM);
       vnet_buffer2 (b0)->gso_size = hdr->gso_size;
+      vnet_buffer2 (b0)->gso_l4_hdr_sz = l4_hdr_sz;
       b0->flags |= VNET_BUFFER_F_GSO | VNET_BUFFER_F_IS_IP6;
     }
 }
@@ -210,7 +242,7 @@ fill_gso_buffer_flags (vlib_buffer_t * b0, struct virtio_net_hdr_v1 *hdr)
 static_always_inline uword
 virtio_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 			    vlib_frame_t * frame, virtio_if_t * vif, u16 qid,
-			    int gso_enabled)
+			    int gso_enabled, int checksum_offload_enabled)
 {
   vnet_main_t *vnm = vnet_get_main ();
   u32 thread_index = vm->thread_index;
@@ -240,6 +272,7 @@ virtio_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
       while (n_left && n_left_to_next)
 	{
+	  u8 l4_proto, l4_hdr_sz;
 	  u16 num_buffers = 1;
 	  struct vring_used_elem *e = &vring->used->ring[last & mask];
 	  struct virtio_net_hdr_v1 *hdr;
@@ -256,8 +289,11 @@ virtio_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	  b0->total_length_not_including_first_buffer = 0;
 	  b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
 
+	  if (checksum_offload_enabled)
+	    virtio_needs_csum (b0, hdr, &l4_proto, &l4_hdr_sz);
+
 	  if (gso_enabled)
-	    fill_gso_buffer_flags (b0, hdr);
+	    fill_gso_buffer_flags (b0, hdr, l4_proto, l4_hdr_sz);
 
 	  vnet_buffer (b0)->sw_if_index[VLIB_RX] = vif->sw_if_index;
 	  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
@@ -361,10 +397,13 @@ VLIB_NODE_FN (virtio_input_node) (vlib_main_t * vm,
       {
 	if (vif->gso_enabled)
 	  n_rx += virtio_device_input_inline (vm, node, frame, vif,
-					      dq->queue_id, 1);
+					      dq->queue_id, 1, 1);
+	else if (vif->csum_offload_enabled)
+	  n_rx += virtio_device_input_inline (vm, node, frame, vif,
+					      dq->queue_id, 0, 1);
 	else
 	  n_rx += virtio_device_input_inline (vm, node, frame, vif,
-					      dq->queue_id, 0);
+					      dq->queue_id, 0, 0);
       }
   }