X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvnet%2Finterface_output.h;h=b512d9a04a87b81947af7bf7577e1317530afb51;hb=7c2a3357f32ae02bcc20cdad6d87beda39f71d31;hp=ef7aaa8999ebdb9a08cd7ca305f2f375b849692c;hpb=0b04209edac55487c108ff5f2faf51cbd4c2cee7;p=vpp.git

diff --git a/src/vnet/interface_output.h b/src/vnet/interface_output.h
index ef7aaa8999e..b512d9a04a8 100644
--- a/src/vnet/interface_output.h
+++ b/src/vnet/interface_output.h
@@ -41,21 +41,21 @@
 #define __INTERFACE_INLINES_H__
 
 #include <vnet/vnet.h>
-#include <vnet/gso/hdr_offset_parser.h>
+#include <vnet/tcp/tcp_packet.h>
 
 static_always_inline void
-vnet_calc_ip4_checksums (vlib_main_t * vm, vlib_buffer_t * b,
-			 ip4_header_t * ip4, tcp_header_t * th,
-			 udp_header_t * uh)
+vnet_calc_ip4_checksums (vlib_main_t *vm, vlib_buffer_t *b, ip4_header_t *ip4,
+			 tcp_header_t *th, udp_header_t *uh,
+			 vnet_buffer_oflags_t oflags)
 {
-  if (b->flags & VNET_BUFFER_F_OFFLOAD_IP_CKSUM)
+  if (oflags & VNET_BUFFER_OFFLOAD_F_IP_CKSUM)
     ip4->checksum = ip4_header_checksum (ip4);
-  if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
+  if (oflags & VNET_BUFFER_OFFLOAD_F_TCP_CKSUM)
     {
       th->checksum = 0;
       th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
     }
-  if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
+  if (oflags & VNET_BUFFER_OFFLOAD_F_UDP_CKSUM)
     {
       uh->checksum = 0;
       uh->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
@@ -63,17 +63,17 @@ vnet_calc_ip4_checksums (vlib_main_t * vm, vlib_buffer_t * b,
 }
 
 static_always_inline void
-vnet_calc_ip6_checksums (vlib_main_t * vm, vlib_buffer_t * b,
-			 ip6_header_t * ip6, tcp_header_t * th,
-			 udp_header_t * uh)
+vnet_calc_ip6_checksums (vlib_main_t *vm, vlib_buffer_t *b, ip6_header_t *ip6,
+			 tcp_header_t *th, udp_header_t *uh,
+			 vnet_buffer_oflags_t oflags)
 {
   int bogus;
-  if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
+  if (oflags & VNET_BUFFER_OFFLOAD_F_TCP_CKSUM)
     {
       th->checksum = 0;
       th->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
     }
-  if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
+  if (oflags & VNET_BUFFER_OFFLOAD_F_UDP_CKSUM)
     {
       uh->checksum = 0;
       uh->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
@@ -82,63 +82,69 @@ vnet_calc_ip6_checksums (vlib_main_t * vm, vlib_buffer_t * b,
 
 static_always_inline void
 vnet_calc_checksums_inline (vlib_main_t * vm, vlib_buffer_t * b,
-			    int is_ip4, int is_ip6, int with_gso)
+			    int is_ip4, int is_ip6)
 {
   ip4_header_t *ip4;
   ip6_header_t *ip6;
   tcp_header_t *th;
   udp_header_t *uh;
+  vnet_buffer_oflags_t oflags;
 
-  if (with_gso)
-    {
-      generic_header_offset_t gho = { 0 };
-      vnet_generic_header_offset_parser (b, &gho);
+  if (!(b->flags & VNET_BUFFER_F_OFFLOAD))
+    return;
 
-      ASSERT (gho.gho_flags ^ (GHO_F_IP4 | GHO_F_IP6));
+  ASSERT (!(is_ip4 && is_ip6));
 
-      vnet_get_inner_header (b, &gho);
+  ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
+  ip6 = (ip6_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
+  th = (tcp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
+  uh = (udp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
+  oflags = vnet_buffer (b)->oflags;
 
-      ip4 = (ip4_header_t *)
-	(vlib_buffer_get_current (b) + gho.l3_hdr_offset);
-      ip6 = (ip6_header_t *)
-	(vlib_buffer_get_current (b) + gho.l3_hdr_offset);
-      th = (tcp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset);
-      uh = (udp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset);
+  if (is_ip4)
+    {
+      vnet_calc_ip4_checksums (vm, b, ip4, th, uh, oflags);
+    }
+  else if (is_ip6)
+    {
+      vnet_calc_ip6_checksums (vm, b, ip6, th, uh, oflags);
+    }
 
-      if (gho.gho_flags & GHO_F_IP4)
-	{
-	  vnet_calc_ip4_checksums (vm, b, ip4, th, uh);
-	}
-      else if (gho.gho_flags & GHO_F_IP6)
-	{
-	  vnet_calc_ip6_checksums (vm, b, ip6, th, uh);
-	}
+  vnet_buffer_offload_flags_clear (b, (VNET_BUFFER_OFFLOAD_F_IP_CKSUM |
+				       VNET_BUFFER_OFFLOAD_F_UDP_CKSUM |
+				       VNET_BUFFER_OFFLOAD_F_TCP_CKSUM));
+}
 
-      vnet_get_outer_header (b, &gho);
+static_always_inline void
+vnet_calc_outer_checksums_inline (vlib_main_t *vm, vlib_buffer_t *b)
+{
+
+  if (!(b->flags & VNET_BUFFER_F_OFFLOAD))
+    return;
+
+  vnet_buffer_oflags_t oflags = vnet_buffer (b)->oflags;
+  if (oflags & VNET_BUFFER_OFFLOAD_F_OUTER_IP_CKSUM)
+    {
+      ip4_header_t *ip4;
+      ip4 = (ip4_header_t *) (b->data + vnet_buffer2 (b)->outer_l3_hdr_offset);
+      ip4->checksum = ip4_header_checksum (ip4);
+      vnet_buffer_offload_flags_clear (b,
+				       VNET_BUFFER_OFFLOAD_F_OUTER_IP_CKSUM);
     }
-  else
+  else if (oflags & VNET_BUFFER_OFFLOAD_F_OUTER_UDP_CKSUM)
     {
-      ASSERT (!(is_ip4 && is_ip6));
-
-      ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
-      ip6 = (ip6_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
-      th = (tcp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
-      uh = (udp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
+      int bogus;
+      ip6_header_t *ip6;
+      udp_header_t *uh;
 
-      if (is_ip4)
-	{
-	  vnet_calc_ip4_checksums (vm, b, ip4, th, uh);
-	}
-      if (is_ip6)
-	{
-	  vnet_calc_ip6_checksums (vm, b, ip6, th, uh);
-	}
+      ip6 = (ip6_header_t *) (b->data + vnet_buffer2 (b)->outer_l3_hdr_offset);
+      uh = (udp_header_t *) (b->data + vnet_buffer2 (b)->outer_l4_hdr_offset);
+      uh->checksum = 0;
+      uh->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
+      vnet_buffer_offload_flags_clear (b,
+				       VNET_BUFFER_OFFLOAD_F_OUTER_UDP_CKSUM);
     }
-  b->flags &= ~VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
-  b->flags &= ~VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
-  b->flags &= ~VNET_BUFFER_F_OFFLOAD_IP_CKSUM;
 }
-
 #endif
 
 /*