vxlan*: migrate old MULTIARCH macros to VLIB_NODE_FN

[vpp.git] / src / vnet / vxlan-gbp / encap.c

diff --git a/src/vnet/vxlan-gbp/encap.c b/src/vnet/vxlan-gbp/encap.c
index 07142c8..2fe3fa8 100644 (file)
--- a/src/vnet/vxlan-gbp/encap.c
+++ b/src/vnet/vxlan-gbp/encap.c
@@ -50,8 +50,10 @@ typedef struct
   u32 tunnel_index;
   u32 vni;
   u16 sclass;
+  u8 flags;
 } vxlan_gbp_encap_trace_t;
 
+#ifndef CLIB_MARCH_VARIANT
 u8 *
 format_vxlan_gbp_encap_trace (u8 * s, va_list * args)
 {
@@ -59,10 +61,13 @@ format_vxlan_gbp_encap_trace (u8 * s, va_list * args)
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
   vxlan_gbp_encap_trace_t *t = va_arg (*args, vxlan_gbp_encap_trace_t *);
 
-  s = format (s, "VXLAN_GBP encap to vxlan_gbp_tunnel%d vni %d sclass %d",
-             t->tunnel_index, t->vni, t->sclass);
+  s =
+    format (s,
+           "VXLAN_GBP encap to vxlan_gbp_tunnel%d vni %d sclass %d flags %d",
+           t->tunnel_index, t->vni, t->sclass, t->flags);
   return s;
 }
+#endif /* CLIB_MARCH_VARIANT */
 
 always_inline uword
 vxlan_gbp_encap_inline (vlib_main_t * vm,
@@ -186,10 +191,12 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
          /* vnet_rewrite_two_header writes only in (uword) 8 bytes chunks
           * and discards the first 4 bytes of the (36 bytes ip4 underlay)  rewrite
           * use memcpy as a workaround */
-         clib_memcpy (underlay0, t0->rewrite_header.data + rw_hdr_offset,
-                      underlay_hdr_len);
-         clib_memcpy (underlay1, t1->rewrite_header.data + rw_hdr_offset,
-                      underlay_hdr_len);
+         clib_memcpy_fast (underlay0,
+                           t0->rewrite_header.data + rw_hdr_offset,
+                           underlay_hdr_len);
+         clib_memcpy_fast (underlay1,
+                           t1->rewrite_header.data + rw_hdr_offset,
+                           underlay_hdr_len);
 
          ip4_header_t *ip4_0, *ip4_1;
          qos_bits_t ip4_0_tos = 0, ip4_1_tos = 0;
@@ -255,9 +262,9 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
          vxlan_gbp0->gpflags = vnet_buffer2 (b0)->gbp.flags;
          vxlan_gbp1->gpflags = vnet_buffer2 (b1)->gbp.flags;
          vxlan_gbp0->sclass =
-           clib_host_to_net_u16 (vnet_buffer2 (b0)->gbp.src_epg);
+           clib_host_to_net_u16 (vnet_buffer2 (b0)->gbp.sclass);
          vxlan_gbp1->sclass =
-           clib_host_to_net_u16 (vnet_buffer2 (b1)->gbp.src_epg);
+           clib_host_to_net_u16 (vnet_buffer2 (b1)->gbp.sclass);
 
          if (csum_offload)
            {
@@ -319,7 +326,8 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
                vlib_add_trace (vm, node, b0, sizeof (*tr));
              tr->tunnel_index = t0 - vxm->tunnels;
              tr->vni = t0->vni;
-             tr->sclass = vnet_buffer2 (b0)->gbp.src_epg;
+             tr->sclass = vnet_buffer2 (b0)->gbp.sclass;
+             tr->flags = vnet_buffer2 (b0)->gbp.flags;
            }
 
          if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
@@ -328,7 +336,8 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
                vlib_add_trace (vm, node, b1, sizeof (*tr));
              tr->tunnel_index = t1 - vxm->tunnels;
              tr->vni = t1->vni;
-             tr->sclass = vnet_buffer2 (b1)->gbp.src_epg;
+             tr->sclass = vnet_buffer2 (b1)->gbp.sclass;
+             tr->flags = vnet_buffer2 (b1)->gbp.flags;
            }
 
          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
@@ -368,8 +377,9 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
          /* vnet_rewrite_one_header writes only in (uword) 8 bytes chunks
           * and discards the first 4 bytes of the (36 bytes ip4 underlay)  rewrite
           * use memcpy as a workaround */
-         clib_memcpy (underlay0, t0->rewrite_header.data + rw_hdr_offset,
-                      underlay_hdr_len);
+         clib_memcpy_fast (underlay0,
+                           t0->rewrite_header.data + rw_hdr_offset,
+                           underlay_hdr_len);
 
          u32 len0 = vlib_buffer_length_in_chain (vm, b0);
          u16 payload_l0 = clib_host_to_net_u16 (len0 - l3_len);
@@ -418,7 +428,7 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
          /* set source class and gpflags */
          vxlan_gbp0->gpflags = vnet_buffer2 (b0)->gbp.flags;
          vxlan_gbp0->sclass =
-           clib_host_to_net_u16 (vnet_buffer2 (b0)->gbp.src_epg);
+           clib_host_to_net_u16 (vnet_buffer2 (b0)->gbp.sclass);
 
          if (csum_offload)
            {
@@ -461,7 +471,8 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
                vlib_add_trace (vm, node, b0, sizeof (*tr));
              tr->tunnel_index = t0 - vxm->tunnels;
              tr->vni = t0->vni;
-             tr->sclass = vnet_buffer2 (b0)->gbp.src_epg;
+             tr->sclass = vnet_buffer2 (b0)->gbp.sclass;
+             tr->flags = vnet_buffer2 (b0)->gbp.flags;
            }
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
                                           to_next, n_left_to_next,
@@ -479,9 +490,9 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
   return from_frame->n_vectors;
 }
 
-static uword
-vxlan4_gbp_encap (vlib_main_t * vm,
-                 vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (vxlan4_gbp_encap_node) (vlib_main_t * vm,
+                                     vlib_node_runtime_t * node,
+                                     vlib_frame_t * from_frame)
 {
   /* Disable chksum offload as setup overhead in tx node is not worthwhile
      for ip4 header checksum only, unless udp checksum is also required */
@@ -489,9 +500,9 @@ vxlan4_gbp_encap (vlib_main_t * vm,
                                 /* csum_offload */ 0);
 }
 
-static uword
-vxlan6_gbp_encap (vlib_main_t * vm,
-                 vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (vxlan6_gbp_encap_node) (vlib_main_t * vm,
+                                     vlib_node_runtime_t * node,
+                                     vlib_frame_t * from_frame)
 {
   /* Enable checksum offload for ip6 as udp checksum is mandatory, */
   return vxlan_gbp_encap_inline (vm, node, from_frame, /* is_ip4 */ 0,
@@ -501,7 +512,6 @@ vxlan6_gbp_encap (vlib_main_t * vm,
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (vxlan4_gbp_encap_node) =
 {
-  .function = vxlan4_gbp_encap,
   .name = "vxlan4-gbp-encap",
   .vector_size = sizeof (u32),
   .format_trace = format_vxlan_gbp_encap_trace,
@@ -514,11 +524,8 @@ VLIB_REGISTER_NODE (vxlan4_gbp_encap_node) =
   },
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (vxlan4_gbp_encap_node, vxlan4_gbp_encap)
-
 VLIB_REGISTER_NODE (vxlan6_gbp_encap_node) =
 {
-  .function = vxlan6_gbp_encap,
   .name = "vxlan6-gbp-encap",
   .vector_size = sizeof (u32),
   .format_trace = format_vxlan_gbp_encap_trace,
@@ -530,8 +537,6 @@ VLIB_REGISTER_NODE (vxlan6_gbp_encap_node) =
     [VXLAN_GBP_ENCAP_NEXT_DROP] = "error-drop",
   },
 };
-
-VLIB_NODE_FUNCTION_MULTIARCH (vxlan6_gbp_encap_node, vxlan6_gbp_encap)
 /* *INDENT-ON* */
 
 /*