ipip: fix the offload flags

Type: fix

Packets with checksum offloading are not correctly handled
in the IPIP tunnel path under the new checksum offload support.
Only GSO packets were being processed correctly.

Signed-off-by: Mohsin Kazmi <[email protected]>
Change-Id: Iaca00a68708bd11cb81951768d7437dc63523d8d

diff --git a/src/vnet/adj/adj_dp.h b/src/vnet/adj/adj_dp.h
index 186044b..f35e905 100644 (file)
--- a/src/vnet/adj/adj_dp.h
+++ b/src/vnet/adj/adj_dp.h
@@ -37,7 +37,7 @@ adj_midchain_ipip44_fixup (vlib_main_t * vm,
 
   if (PREDICT_TRUE(TUNNEL_ENCAP_DECAP_FLAG_NONE == flags))
     {
-      if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_GSO))
+      if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_OFFLOAD))
        {
          vnet_buffer2 (b)->outer_l3_hdr_offset = (u8 *) ip4 - b->data;
          vnet_buffer_offload_flags_set (b, VNET_BUFFER_OFFLOAD_F_TNL_IPIP |
@@ -57,7 +57,7 @@ adj_midchain_ipip44_fixup (vlib_main_t * vm,
   else
     {
       tunnel_encap_fixup_4o4 (flags, ip4 + 1, ip4);
-      if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_GSO))
+      if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_OFFLOAD))
        {
          vnet_buffer2 (b)->outer_l3_hdr_offset = (u8 *) ip4 - b->data;
          vnet_buffer_offload_flags_set (b, VNET_BUFFER_OFFLOAD_F_TNL_IPIP |

diff --git a/src/vnet/ipip/ipip.c b/src/vnet/ipip/ipip.c
index aaf2146..29ac9dd 100644 (file)
--- a/src/vnet/ipip/ipip.c
+++ b/src/vnet/ipip/ipip.c
@@ -148,7 +148,7 @@ ipip64_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b,
   ip4->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b));
   tunnel_encap_fixup_6o4 (flags, ((ip6_header_t *) (ip4 + 1)), ip4);
 
-  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_GSO))
+  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_OFFLOAD))
     {
       vnet_buffer2 (b)->outer_l3_hdr_offset = (u8 *) ip4 - b->data;
       vnet_buffer_offload_flags_set (b, VNET_BUFFER_OFFLOAD_F_OUTER_IP_CKSUM |
@@ -171,7 +171,7 @@ ipip44_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b,
   ip4->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b));
   tunnel_encap_fixup_4o4 (flags, ip4 + 1, ip4);
 
-  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_GSO))
+  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_OFFLOAD))
     {
       vnet_buffer2 (b)->outer_l3_hdr_offset = (u8 *) ip4 - b->data;
       vnet_buffer_offload_flags_set (b, VNET_BUFFER_OFFLOAD_F_OUTER_IP_CKSUM |
@@ -200,7 +200,7 @@ ipip46_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b,
                          sizeof (*ip6));
   tunnel_encap_fixup_4o6 (flags, b, ((ip4_header_t *) (ip6 + 1)), ip6);
 
-  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_GSO))
+  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_OFFLOAD))
     {
       vnet_buffer2 (b)->outer_l3_hdr_offset = (u8 *) ip6 - b->data;
       vnet_buffer_offload_flags_set (b, VNET_BUFFER_OFFLOAD_F_TNL_IPIP);
@@ -226,7 +226,7 @@ ipip66_fixup (vlib_main_t * vm,
                          sizeof (*ip6));
   tunnel_encap_fixup_6o6 (flags, ip6 + 1, ip6);
 
-  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_GSO))
+  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_OFFLOAD))
     {
       vnet_buffer2 (b)->outer_l3_hdr_offset = (u8 *) ip6 - b->data;
       vnet_buffer_offload_flags_set (b, VNET_BUFFER_OFFLOAD_F_TNL_IPIP);
@@ -253,7 +253,7 @@ ipipm6_fixup (vlib_main_t *vm, const ip_adjacency_t *adj, vlib_buffer_t *b,
   tunnel_encap_fixup_mplso6 (flags, b, (mpls_unicast_header_t *) (ip6 + 1),
                             ip6);
 
-  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_GSO))
+  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_OFFLOAD))
     {
       vnet_buffer2 (b)->outer_l3_hdr_offset = (u8 *) ip6 - b->data;
       vnet_buffer_offload_flags_set (b, VNET_BUFFER_OFFLOAD_F_TNL_IPIP);
@@ -278,7 +278,7 @@ ipipm4_fixup (vlib_main_t *vm, const ip_adjacency_t *adj, vlib_buffer_t *b,
     clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b) - sizeof (*ip4));
   tunnel_encap_fixup_mplso4 (flags, (mpls_unicast_header_t *) (ip4 + 1), ip4);
 
-  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_GSO))
+  if (PREDICT_FALSE (b->flags & VNET_BUFFER_F_OFFLOAD))
     {
       vnet_buffer2 (b)->outer_l3_hdr_offset = (u8 *) ip4 - b->data;
       vnet_buffer_offload_flags_set (b, VNET_BUFFER_OFFLOAD_F_OUTER_IP_CKSUM |