acl: fix cli tag parsing

[vpp.git] / src / plugins / gtpu / gtpu_decap.c

diff --git a/src/plugins/gtpu/gtpu_decap.c b/src/plugins/gtpu/gtpu_decap.c
index 5e737d1..e3bc476 100644 (file)
--- a/src/plugins/gtpu/gtpu_decap.c
+++ b/src/plugins/gtpu/gtpu_decap.c
@@ -16,7 +16,6 @@
  */
 
 #include <vlib/vlib.h>
-#include <vnet/pg/pg.h>
 #include <gtpu/gtpu.h>
 
 extern vlib_node_registration_t gtpu4_input_node;
@@ -804,10 +803,16 @@ ip_gtpu_bypass_inline (vlib_main_t * vm,
                                   matching a local VTEP address */
   vtep6_key_t last_vtep6;      /* last IPv6 address / fib index
                                   matching a local VTEP address */
+  vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs;
+#ifdef CLIB_HAVE_VEC512
+  vtep4_cache_t vtep4_u512;
+  clib_memset (&vtep4_u512, 0, sizeof (vtep4_u512));
+#endif
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
   next_index = node->cached_next_index;
+  vlib_get_buffers (vm, from, bufs, n_left_from);
 
   if (node->flags & VLIB_NODE_FLAG_TRACE)
     ip4_forward_next_trace (vm, node, frame, VLIB_TX);
@@ -835,16 +840,11 @@ ip_gtpu_bypass_inline (vlib_main_t * vm,
 
          /* Prefetch next iteration. */
          {
-           vlib_buffer_t * p2, * p3;
-
-           p2 = vlib_get_buffer (vm, from[2]);
-           p3 = vlib_get_buffer (vm, from[3]);
+           vlib_prefetch_buffer_header (b[2], LOAD);
+           vlib_prefetch_buffer_header (b[3], LOAD);
 
-           vlib_prefetch_buffer_header (p2, LOAD);
-           vlib_prefetch_buffer_header (p3, LOAD);
-
-           CLIB_PREFETCH (p2->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
-           CLIB_PREFETCH (p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+           CLIB_PREFETCH (b[2]->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
+           CLIB_PREFETCH (b[3]->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
          }
 
          bi0 = to_next[0] = from[0];
@@ -854,8 +854,9 @@ ip_gtpu_bypass_inline (vlib_main_t * vm,
          to_next += 2;
          n_left_to_next -= 2;
 
-         b0 = vlib_get_buffer (vm, bi0);
-         b1 = vlib_get_buffer (vm, bi1);
+         b0 = b[0];
+         b1 = b[1];
+         b += 2;
          if (is_ip4)
            {
              ip40 = vlib_buffer_get_current (b0);
@@ -899,7 +900,12 @@ ip_gtpu_bypass_inline (vlib_main_t * vm,
          /* Validate DIP against VTEPs*/
          if (is_ip4)
            {
+#ifdef CLIB_HAVE_VEC512
+             if (!vtep4_check_vector
+                 (&gtm->vtep_table, b0, ip40, &last_vtep4, &vtep4_u512))
+#else
              if (!vtep4_check (&gtm->vtep_table, b0, ip40, &last_vtep4))
+#endif
                goto exit0;     /* no local VTEP for GTPU packet */
            }
          else
@@ -973,7 +979,12 @@ ip_gtpu_bypass_inline (vlib_main_t * vm,
          /* Validate DIP against VTEPs*/
          if (is_ip4)
            {
+#ifdef CLIB_HAVE_VEC512
+             if (!vtep4_check_vector
+                 (&gtm->vtep_table, b1, ip41, &last_vtep4, &vtep4_u512))
+#else
               if (!vtep4_check (&gtm->vtep_table, b1, ip41, &last_vtep4))
+#endif
                 goto exit1;    /* no local VTEP for GTPU packet */
            }
          else
@@ -1053,7 +1064,8 @@ ip_gtpu_bypass_inline (vlib_main_t * vm,
          to_next += 1;
          n_left_to_next -= 1;
 
-         b0 = vlib_get_buffer (vm, bi0);
+         b0 = b[0];
+         b++;
          if (is_ip4)
            ip40 = vlib_buffer_get_current (b0);
          else
@@ -1083,7 +1095,12 @@ ip_gtpu_bypass_inline (vlib_main_t * vm,
          /* Validate DIP against VTEPs*/
          if (is_ip4)
            {
+#ifdef CLIB_HAVE_VEC512
+             if (!vtep4_check_vector
+                 (&gtm->vtep_table, b0, ip40, &last_vtep4, &vtep4_u512))
+#else
               if (!vtep4_check (&gtm->vtep_table, b0, ip40, &last_vtep4))
+#endif
                 goto exit;     /* no local VTEP for GTPU packet */
            }
          else
@@ -1514,7 +1531,7 @@ trace0:
           if (PREDICT_FALSE (t1->decap_next_index != GTPU_INPUT_NEXT_IP4_INPUT) &&
             (t1->decap_next_index != GTPU_INPUT_NEXT_IP6_INPUT))
           {
-            next1 = GTPU_FLOW_ERROR_PAYLOAD_ERROR;
+            error1 = GTPU_FLOW_ERROR_PAYLOAD_ERROR;
             next1 = GTPU_INPUT_NEXT_DROP;
             goto trace1;
           }
@@ -1643,7 +1660,7 @@ trace1:
           if (PREDICT_FALSE (t0->decap_next_index != GTPU_INPUT_NEXT_IP4_INPUT) &&
               (t0->decap_next_index != GTPU_INPUT_NEXT_IP6_INPUT))
           {
-            next0 = GTPU_FLOW_ERROR_PAYLOAD_ERROR;
+            error0 = GTPU_FLOW_ERROR_PAYLOAD_ERROR;
             next0 = GTPU_INPUT_NEXT_DROP;
             goto trace00;
           }