X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Faf_packet%2Fnode.c;h=556d7489725f252edc1d9ef8935c127a97b88299;hb=fa600c9169c0d7104af7a9be12a0471a8a8c8262;hp=76980102f7139f644aca08cb7169c0c785e79222;hpb=586afd762bfa149f5ca167bd5fd5a0cd59ce94fe;p=vpp.git

diff --git a/src/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c
index 76980102f71..556d7489725 100644
--- a/src/vnet/devices/af_packet/node.c
+++ b/src/vnet/devices/af_packet/node.c
@@ -25,6 +25,7 @@
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/devices/devices.h>
 #include <vnet/feature/feature.h>
+#include <vnet/ethernet/packet.h>
 
 #include <vnet/devices/af_packet/af_packet.h>
 
@@ -58,7 +59,7 @@ format_af_packet_input_trace (u8 * s, va_list * args)
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
   af_packet_input_trace_t *t = va_arg (*args, af_packet_input_trace_t *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
 
   s = format (s, "af_packet: hw_if_index %d next-index %d",
 	      t->hw_if_index, t->next_index);
@@ -106,6 +107,72 @@ buffer_add_to_chain (vlib_main_t * vm, u32 bi, u32 first_bi, u32 prev_bi)
   b->next_buffer = 0;
 }
 
+static_always_inline void
+mark_tcp_udp_cksum_calc (vlib_buffer_t * b)
+{
+  ethernet_header_t *eth = vlib_buffer_get_current (b);
+  if (clib_net_to_host_u16 (eth->type) == ETHERNET_TYPE_IP4)
+    {
+      ip4_header_t *ip4 =
+	(vlib_buffer_get_current (b) + sizeof (ethernet_header_t));
+      b->flags |= VNET_BUFFER_F_IS_IP4 | VNET_BUFFER_F_OFFLOAD_IP_CKSUM;
+      ip4->checksum = 0;
+      if (ip4->protocol == IP_PROTOCOL_TCP)
+	{
+	  b->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
+	  ((tcp_header_t
+	    *) (vlib_buffer_get_current (b) +
+		sizeof (ethernet_header_t) +
+		ip4_header_bytes (ip4)))->checksum = 0;
+	}
+      else if (ip4->protocol == IP_PROTOCOL_UDP)
+	{
+	  b->flags |= VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
+	  ((udp_header_t
+	    *) (vlib_buffer_get_current (b) +
+		sizeof (ethernet_header_t) +
+		ip4_header_bytes (ip4)))->checksum = 0;
+	}
+      vnet_buffer (b)->l3_hdr_offset = sizeof (ethernet_header_t);
+      vnet_buffer (b)->l4_hdr_offset =
+	sizeof (ethernet_header_t) + ip4_header_bytes (ip4);
+    }
+  else if (clib_net_to_host_u16 (eth->type) == ETHERNET_TYPE_IP6)
+    {
+      ip6_header_t *ip6 =
+	(vlib_buffer_get_current (b) + sizeof (ethernet_header_t));
+      b->flags |= VNET_BUFFER_F_IS_IP6;
+      u16 ip6_hdr_len = sizeof (ip6_header_t);
+      if (ip6_ext_hdr (ip6->protocol))
+	{
+	  ip6_ext_header_t *p = (void *) (ip6 + 1);
+	  ip6_hdr_len += ip6_ext_header_len (p);
+	  while (ip6_ext_hdr (p->next_hdr))
+	    {
+	      ip6_hdr_len += ip6_ext_header_len (p);
+	      p = ip6_ext_next_header (p);
+	    }
+	}
+      if (ip6->protocol == IP_PROTOCOL_TCP)
+	{
+	  b->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
+	  ((tcp_header_t
+	    *) (vlib_buffer_get_current (b) +
+		sizeof (ethernet_header_t) + ip6_hdr_len))->checksum = 0;
+	}
+      else if (ip6->protocol == IP_PROTOCOL_UDP)
+	{
+	  b->flags |= VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
+	  ((udp_header_t
+	    *) (vlib_buffer_get_current (b) +
+		sizeof (ethernet_header_t) + ip6_hdr_len))->checksum = 0;
+	}
+      vnet_buffer (b)->l3_hdr_offset = sizeof (ethernet_header_t);
+      vnet_buffer (b)->l4_hdr_offset =
+	sizeof (ethernet_header_t) + ip6_hdr_len;
+    }
+}
+
 always_inline uword
 af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 			   vlib_frame_t * frame, af_packet_if_t * apif)
@@ -173,12 +240,35 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 	      /* copy data */
 	      u32 bytes_to_copy =
 		data_len > n_buffer_bytes ? n_buffer_bytes : data_len;
+	      u32 vlan_len = 0;
+	      u32 bytes_copied = 0;
 	      b0->current_data = 0;
-	      clib_memcpy (vlib_buffer_get_current (b0),
-			   (u8 *) tph + tph->tp_mac + offset, bytes_to_copy);
+	      /* Kernel removes VLAN headers, so reconstruct VLAN */
+	      if (PREDICT_FALSE (tph->tp_status & TP_STATUS_VLAN_VALID))
+		{
+		  if (PREDICT_TRUE (offset == 0))
+		    {
+		      clib_memcpy (vlib_buffer_get_current (b0),
+				   (u8 *) tph + tph->tp_mac,
+				   sizeof (ethernet_header_t));
+		      ethernet_header_t *eth = vlib_buffer_get_current (b0);
+		      ethernet_vlan_header_t *vlan =
+			(ethernet_vlan_header_t *) (eth + 1);
+		      vlan->priority_cfi_and_id =
+			clib_host_to_net_u16 (tph->tp_vlan_tci);
+		      vlan->type = eth->type;
+		      eth->type = clib_host_to_net_u16 (ETHERNET_TYPE_VLAN);
+		      vlan_len = sizeof (ethernet_vlan_header_t);
+		      bytes_copied = sizeof (ethernet_header_t);
+		    }
+		}
+	      clib_memcpy (((u8 *) vlib_buffer_get_current (b0)) +
+			   bytes_copied + vlan_len,
+			   (u8 *) tph + tph->tp_mac + offset + bytes_copied,
+			   (bytes_to_copy - bytes_copied));
 
 	      /* fill buffer header */
-	      b0->current_length = bytes_to_copy;
+	      b0->current_length = bytes_to_copy + vlan_len;
 
 	      if (offset == 0)
 		{
@@ -188,6 +278,8 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 		  vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
 		  first_bi0 = bi0;
 		  first_b0 = vlib_get_buffer (vm, first_bi0);
+		  if (tph->tp_status & TP_STATUS_CSUMNOTREADY)
+		    mark_tcp_udp_cksum_calc (first_b0);
 		}
 	      else
 		buffer_add_to_chain (vm, bi0, first_bi0, prev_bi0);
@@ -251,7 +343,7 @@ af_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   vnet_device_input_runtime_t *rt = (void *) node->runtime_data;
   vnet_device_and_queue_t *dq;
 
-  vec_foreach (dq, rt->devices_and_queues)
+  foreach_device_and_queue (dq, rt->devices_and_queues)
   {
     af_packet_if_t *apif;
     apif = vec_elt_at_index (apm->interfaces, dq->dev_instance);