vxlan:offload RX flow
[vpp.git] / src / vnet / vxlan / decap.c
index d5a9442..e650919 100644 (file)
@@ -42,7 +42,7 @@ static u8 * format_vxlan_rx_trace (u8 * s, va_list * args)
     }
   else
     {
-      s = format (s, "VXLAN decap error - tunnel for vni %d does not exist", 
+      s = format (s, "VXLAN decap error - tunnel for vni %d does not exist",
                  t->vni);
     }
   return s;
@@ -51,20 +51,111 @@ static u8 * format_vxlan_rx_trace (u8 * s, va_list * args)
 always_inline u32
 validate_vxlan_fib (vlib_buffer_t *b, vxlan_tunnel_t *t, u32 is_ip4)
 {
-  u32 fib_index, sw_if_index;
+  u32 sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX];
 
-  sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX];
+  u32 * fib_index_by_sw_if_index = is_ip4 ?
+    ip4_main.fib_index_by_sw_if_index : ip6_main.fib_index_by_sw_if_index;
+  u32 tx_sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_TX];
+  u32 fib_index = (tx_sw_if_index == (u32) ~ 0) ?
+    vec_elt (fib_index_by_sw_if_index, sw_if_index) : tx_sw_if_index;
 
-  if (is_ip4)
-    fib_index = (vnet_buffer (b)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
-       vec_elt (ip4_main.fib_index_by_sw_if_index, sw_if_index) :
-       vnet_buffer (b)->sw_if_index[VLIB_TX];
+  return (fib_index == t->encap_fib_index);
+}
+
+typedef struct
+{
+  vxlan4_tunnel_key_t key4;
+  u32 tunnel_index;
+}last_tunnel_cache4;
+
+typedef struct
+{
+  vxlan6_tunnel_key_t key6;
+  u32 tunnel_index;
+}last_tunnel_cache6;
+
+always_inline vxlan_tunnel_t *
+vxlan4_find_tunnel (vxlan_main_t * vxm, last_tunnel_cache4 * cache,
+                    ip4_header_t * ip4_0, vxlan_header_t * vxlan0,
+                    vxlan_tunnel_t ** stats_t0)
+{
+  /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
+  vxlan4_tunnel_key_t key4_0 = {
+    .src = ip4_0->src_address.as_u32,
+    .vni = vxlan0->vni_reserved,
+  };
+
+  if (PREDICT_FALSE (key4_0.as_u64 != cache->key4.as_u64))
+  {
+    uword * p = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
+    if (PREDICT_FALSE (p == 0))
+      return 0;
+
+    cache->key4 = key4_0;
+    cache->tunnel_index = p[0];
+  }
+  vxlan_tunnel_t * t0 = pool_elt_at_index (vxm->tunnels, cache->tunnel_index);
+
+  /* Validate VXLAN tunnel SIP against packet DIP */
+  if (PREDICT_TRUE (ip4_0->dst_address.as_u32 == t0->src.ip4.as_u32))
+    *stats_t0 = t0;
   else
-    fib_index = (vnet_buffer (b)->sw_if_index[VLIB_TX] == (u32) ~ 0) ?
-       vec_elt (ip6_main.fib_index_by_sw_if_index, sw_if_index) :
-       vnet_buffer (b)->sw_if_index[VLIB_TX];
+  {
+    /* try multicast */
+    if (PREDICT_TRUE (!ip4_address_is_multicast (&ip4_0->dst_address)))
+      return 0;
+
+    key4_0.src = ip4_0->dst_address.as_u32;
+    /* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
+    uword * p = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
+    if (PREDICT_FALSE (p == NULL))
+      return 0;
+    *stats_t0 = pool_elt_at_index (vxm->tunnels, p[0]);
+  }
+
+  return t0;
+}
 
-  return (fib_index == t->encap_fib_index);
+always_inline vxlan_tunnel_t *
+vxlan6_find_tunnel (vxlan_main_t * vxm, last_tunnel_cache6 * cache,
+                    ip6_header_t * ip6_0, vxlan_header_t * vxlan0,
+                    vxlan_tunnel_t ** stats_t0)
+{
+  /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
+  vxlan6_tunnel_key_t key6_0 = {
+    .src = ip6_0->src_address,
+    .vni = vxlan0->vni_reserved,
+  };
+
+  if (PREDICT_FALSE (memcmp(&key6_0, &cache->key6, sizeof key6_0) != 0))
+  {
+    uword * p = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_0);
+    if (PREDICT_FALSE (p == NULL))
+      return 0;
+
+    cache->key6 = key6_0;
+    cache->tunnel_index = p[0];
+  }
+  vxlan_tunnel_t * t0 = pool_elt_at_index (vxm->tunnels, cache->tunnel_index);
+
+  /* Validate VXLAN tunnel SIP against packet DIP */
+  if (PREDICT_TRUE (ip6_address_is_equal (&ip6_0->dst_address, &t0->src.ip6)))
+    *stats_t0 = t0;
+  else
+  {
+    /* try multicast */
+    if (PREDICT_TRUE (!ip6_address_is_multicast (&ip6_0->dst_address)))
+      return 0;
+
+    key6_0.src = ip6_0->dst_address;
+    /* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
+    uword * p = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_0);
+    if (PREDICT_FALSE (p == NULL))
+      return 0;
+    *stats_t0 = pool_elt_at_index (vxm->tunnels, p[0]);
+  }
+
+  return t0;
 }
 
 always_inline uword
@@ -73,51 +164,33 @@ vxlan_input (vlib_main_t * vm,
              vlib_frame_t * from_frame,
              u32 is_ip4)
 {
-  u32 n_left_from, next_index, * from, * to_next;
   vxlan_main_t * vxm = &vxlan_main;
   vnet_main_t * vnm = vxm->vnet_main;
   vnet_interface_main_t * im = &vnm->interface_main;
-  u32 last_tunnel_index = ~0;
-  vxlan4_tunnel_key_t last_key4;
-  vxlan6_tunnel_key_t last_key6;
+  vlib_combined_counter_main_t * rx_counter = im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX;
+  vlib_combined_counter_main_t * drop_counter = im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_DROP;
+  last_tunnel_cache4 last4 = { .tunnel_index = ~0 };
+  last_tunnel_cache6 last6 = { .tunnel_index = ~0 };
   u32 pkts_decapsulated = 0;
-  u32 cpu_index = os_get_cpu_number();
-  u32 stats_sw_if_index, stats_n_packets, stats_n_bytes;
+  u32 thread_index = vlib_get_thread_index();
 
   if (is_ip4)
-    last_key4.as_u64 = ~0;
+    last4.key4.as_u64 = ~0;
   else
-    memset (&last_key6, 0xff, sizeof (last_key6));
+    memset (&last6.key6, 0xff, sizeof last6.key6);
 
-  from = vlib_frame_vector_args (from_frame);
-  n_left_from = from_frame->n_vectors;
+  u32 next_index = node->cached_next_index;
 
-  next_index = node->cached_next_index;
-  stats_sw_if_index = node->runtime_data[0];
-  stats_n_packets = stats_n_bytes = 0;
+  u32 * from = vlib_frame_vector_args (from_frame);
+  u32 n_left_from = from_frame->n_vectors;
 
   while (n_left_from > 0)
     {
-      u32 n_left_to_next;
+      u32 * to_next, n_left_to_next;
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
 
-      vlib_get_next_frame (vm, node, next_index,
-                          to_next, n_left_to_next);
       while (n_left_from >= 4 && n_left_to_next >= 2)
        {
-          u32 bi0, bi1;
-         vlib_buffer_t * b0, * b1;
-         u32 next0, next1;
-          ip4_header_t * ip4_0, * ip4_1;
-          ip6_header_t * ip6_0, * ip6_1;
-          vxlan_header_t * vxlan0, * vxlan1;
-         uword * p0, * p1;
-          u32 tunnel_index0, tunnel_index1;
-          vxlan_tunnel_t * t0, * t1, * mt0 = NULL, * mt1 = NULL;
-          vxlan4_tunnel_key_t key4_0, key4_1;
-          vxlan6_tunnel_key_t key6_0, key6_1;
-          u32 error0, error1;
-         u32 sw_if_index0, sw_if_index1, len0, len1;
-
          /* Prefetch next iteration. */
          {
            vlib_buffer_t * p2, * p3;
@@ -132,359 +205,132 @@ vxlan_input (vlib_main_t * vm,
            CLIB_PREFETCH (p3->data, 2*CLIB_CACHE_LINE_BYTES, LOAD);
          }
 
-         bi0 = from[0];
-         bi1 = from[1];
-         to_next[0] = bi0;
-         to_next[1] = bi1;
+         u32 bi0 = to_next[0] = from[0];
+         u32 bi1 = to_next[1] = from[1];
          from += 2;
          to_next += 2;
          n_left_to_next -= 2;
          n_left_from -= 2;
 
+         vlib_buffer_t * b0, * b1;
          b0 = vlib_get_buffer (vm, bi0);
          b1 = vlib_get_buffer (vm, bi1);
 
           /* udp leaves current_data pointing at the vxlan header */
-          vxlan0 = vlib_buffer_get_current (b0);
-          vxlan1 = vlib_buffer_get_current (b1);
+         void * cur0 = vlib_buffer_get_current (b0);
+         void * cur1 = vlib_buffer_get_current (b1);
+          vxlan_header_t * vxlan0 = cur0;
+          vxlan_header_t * vxlan1 = cur1;
+
+          ip4_header_t * ip4_0, * ip4_1;
+          ip6_header_t * ip6_0, * ip6_1;
           if (is_ip4) {
-           vlib_buffer_advance
-             (b0, -(word)(sizeof(udp_header_t)+sizeof(ip4_header_t)));
-           vlib_buffer_advance
-             (b1, -(word)(sizeof(udp_header_t)+sizeof(ip4_header_t)));
-            ip4_0 = vlib_buffer_get_current (b0);
-            ip4_1 = vlib_buffer_get_current (b1);
+            ip4_0 = cur0 - sizeof(udp_header_t) - sizeof(ip4_header_t);
+            ip4_1 = cur1 - sizeof(udp_header_t) - sizeof(ip4_header_t);
          } else {
-            vlib_buffer_advance
-              (b0, -(word)(sizeof(udp_header_t)+sizeof(ip6_header_t)));
-            vlib_buffer_advance
-              (b1, -(word)(sizeof(udp_header_t)+sizeof(ip6_header_t)));
-            ip6_0 = vlib_buffer_get_current (b0);
-            ip6_1 = vlib_buffer_get_current (b1);
+            ip6_0 = cur0 - sizeof(udp_header_t) - sizeof(ip6_header_t);
+            ip6_1 = cur1 - sizeof(udp_header_t) - sizeof(ip6_header_t);
          }
 
-          /* pop (ip, udp, vxlan) */
-          if (is_ip4) {
-            vlib_buffer_advance
-              (b0, sizeof(*ip4_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
-           vlib_buffer_advance
-              (b1, sizeof(*ip4_1)+sizeof(udp_header_t)+sizeof(*vxlan1));
-          } else {
-           vlib_buffer_advance
-              (b0, sizeof(*ip6_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
-            vlib_buffer_advance
-              (b1, sizeof(*ip6_1)+sizeof(udp_header_t)+sizeof(*vxlan1));
-          }
+          /* pop vxlan */
+          vlib_buffer_advance (b0, sizeof *vxlan0);
+         vlib_buffer_advance (b1, sizeof *vxlan1);
 
-          tunnel_index0 = ~0;
-          error0 = 0;
+          vxlan_tunnel_t * t0, * stats_t0;
+          vxlan_tunnel_t * t1, * stats_t1;
+          if (is_ip4)
+          {
+            t0 = vxlan4_find_tunnel (vxm, &last4, ip4_0, vxlan0, &stats_t0);
+            t1 = vxlan4_find_tunnel (vxm, &last4, ip4_1, vxlan1, &stats_t1);
+          }
+          else
+          {
+            t0 = vxlan6_find_tunnel (vxm, &last6, ip6_0, vxlan0, &stats_t0);
+            t1 = vxlan6_find_tunnel (vxm, &last6, ip6_1, vxlan1, &stats_t1);
+          }
 
-          tunnel_index1 = ~0;
-          error1 = 0;
+          u32 len0 = vlib_buffer_length_in_chain (vm, b0);
+          u32 len1 = vlib_buffer_length_in_chain (vm, b1);
 
-         if (PREDICT_FALSE (vxlan0->flags != VXLAN_FLAGS_I))
-           {
-             error0 = VXLAN_ERROR_BAD_FLAGS;
-             next0 = VXLAN_INPUT_NEXT_DROP;
-             goto trace0;
-           }
-
-          if (is_ip4) {
-            key4_0.src = ip4_0->src_address.as_u32;
-            key4_0.vni = vxlan0->vni_reserved;
-
-           /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
-           if (PREDICT_FALSE (key4_0.as_u64 != last_key4.as_u64))
-              {
-                p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
-                if (PREDICT_FALSE (p0 == NULL))
-                  {
-                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next0 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace0;
-                  }
-                last_key4.as_u64 = key4_0.as_u64;
-                tunnel_index0 = last_tunnel_index = p0[0];
-              }
-            else
-              tunnel_index0 = last_tunnel_index;
-           t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
-
-           /* Validate VXLAN tunnel encap-fib index agaist packet */
-           if (PREDICT_FALSE (validate_vxlan_fib (b0, t0, is_ip4) == 0))
-             {
-               error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-               next0 = VXLAN_INPUT_NEXT_DROP;
-               goto trace0;
-             }
-
-           /* Validate VXLAN tunnel SIP against packet DIP */
-           if (PREDICT_TRUE (ip4_0->dst_address.as_u32 == t0->src.ip4.as_u32))
-             goto next0; /* valid packet */
-           if (PREDICT_FALSE (ip4_address_is_multicast (&ip4_0->dst_address)))
-             {
-               key4_0.src = ip4_0->dst_address.as_u32;
-               key4_0.vni = vxlan0->vni_reserved;
-               /* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
-               p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
-               if (PREDICT_TRUE (p0 != NULL))
-                 {
-                   mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
-                   goto next0; /* valid packet */
-                 }
-             }
-           error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-           next0 = VXLAN_INPUT_NEXT_DROP;
-           goto trace0;
-
-         } else /* !is_ip4 */ {
-            key6_0.src.as_u64[0] = ip6_0->src_address.as_u64[0];
-            key6_0.src.as_u64[1] = ip6_0->src_address.as_u64[1];
-            key6_0.vni = vxlan0->vni_reserved;
-
-           /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
-           if (PREDICT_FALSE (memcmp(&key6_0, &last_key6, sizeof(last_key6)) != 0))
-              {
-                p0 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_0);
-                if (PREDICT_FALSE (p0 == NULL))
-                  {
-                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next0 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace0;
-                  }
-                clib_memcpy (&last_key6, &key6_0, sizeof(key6_0));
-                tunnel_index0 = last_tunnel_index = p0[0];
-              }
-            else
-              tunnel_index0 = last_tunnel_index;
-           t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
-
-           /* Validate VXLAN tunnel encap-fib index agaist packet */
-           if (PREDICT_FALSE (validate_vxlan_fib (b0, t0, is_ip4) == 0))
-             {
-               error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-               next0 = VXLAN_INPUT_NEXT_DROP;
-               goto trace0;
-             }
-
-           /* Validate VXLAN tunnel SIP against packet DIP */
-           if (PREDICT_TRUE (ip6_address_is_equal (&ip6_0->dst_address,
-                                                   &t0->src.ip6)))
-               goto next0; /* valid packet */
-           if (PREDICT_FALSE (ip6_address_is_multicast (&ip6_0->dst_address)))
-             {
-               key6_0.src.as_u64[0] = ip6_0->dst_address.as_u64[0];
-               key6_0.src.as_u64[1] = ip6_0->dst_address.as_u64[1];
-               key6_0.vni = vxlan0->vni_reserved;
-               p0 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_0);
-               if (PREDICT_TRUE (p0 != NULL)) 
-                 {
-                   mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
-                   goto next0; /* valid packet */
-                 }
-             }
-           error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-           next0 = VXLAN_INPUT_NEXT_DROP;
-           goto trace0;
-          }
+         u32 next0, next1;
+          u8 error0 = 0, error1 = 0;
+          /* Validate VXLAN tunnel encap-fib index agaist packet */
+          if (PREDICT_FALSE (t0 == 0 || validate_vxlan_fib (b0, t0, is_ip4) == 0 ||
+                vxlan0->flags != VXLAN_FLAGS_I))
+            {
+              next0 = VXLAN_INPUT_NEXT_DROP;
+
+              if (t0 != 0 && vxlan0->flags != VXLAN_FLAGS_I)
+                {
+                  error0 = VXLAN_ERROR_BAD_FLAGS;
+                  vlib_increment_combined_counter
+                    (drop_counter, thread_index, stats_t0->sw_if_index, 1, len0);
+                }
+              else
+                error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+              b0->error = node->errors[error0];
+            }
+          else
+            {
+              next0 = t0->decap_next_index;
 
-       next0:
-          next0 = t0->decap_next_index;
-          sw_if_index0 = t0->sw_if_index;
-          len0 = vlib_buffer_length_in_chain (vm, b0);
+              /* Required to make the l2 tag push / pop code work on l2 subifs */
+              if (PREDICT_TRUE(next0 == VXLAN_INPUT_NEXT_L2_INPUT))
+                vnet_update_l2_len (b0);
 
-          /* Required to make the l2 tag push / pop code work on l2 subifs */
-          if (PREDICT_TRUE(next0 == VXLAN_INPUT_NEXT_L2_INPUT))
-            vnet_update_l2_len (b0);
+              /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
+              vnet_buffer(b0)->sw_if_index[VLIB_RX] = t0->sw_if_index;
+              vlib_increment_combined_counter
+                (rx_counter, thread_index, stats_t0->sw_if_index, 1, len0);
+              pkts_decapsulated++;
+            }
 
-          /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
-          vnet_buffer(b0)->sw_if_index[VLIB_RX] = sw_if_index0;
-         sw_if_index0 = (mt0) ? mt0->sw_if_index : sw_if_index0;
+          /* Validate VXLAN tunnel encap-fib index agaist packet */
+          if (PREDICT_FALSE (t1 == 0 || validate_vxlan_fib (b1, t1, is_ip4) == 0 ||
+                vxlan1->flags != VXLAN_FLAGS_I))
+            {
+              next1 = VXLAN_INPUT_NEXT_DROP;
+
+              if (t1 != 0 && vxlan1->flags != VXLAN_FLAGS_I)
+                {
+                  error1 = VXLAN_ERROR_BAD_FLAGS;
+                  vlib_increment_combined_counter
+                    (drop_counter, thread_index, stats_t1->sw_if_index, 1, len1);
+                }
+              else
+                error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+              b1->error = node->errors[error1];
+            }
+          else
+            {
+              next1 = t1->decap_next_index;
 
-          pkts_decapsulated ++;
-          stats_n_packets += 1;
-          stats_n_bytes += len0;
+              /* Required to make the l2 tag push / pop code work on l2 subifs */
+              if (PREDICT_TRUE(next1 == VXLAN_INPUT_NEXT_L2_INPUT))
+                vnet_update_l2_len (b1);
 
-         /* Batch stats increment on the same vxlan tunnel so counter
-            is not incremented per packet */
-         if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index)) 
-           {
-             stats_n_packets -= 1;
-             stats_n_bytes -= len0;
-             if (stats_n_packets)
-               vlib_increment_combined_counter 
-                 (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-                  cpu_index, stats_sw_if_index, 
-                  stats_n_packets, stats_n_bytes);
-             stats_n_packets = 1;
-             stats_n_bytes = len0;
-             stats_sw_if_index = sw_if_index0;
-           }
+              /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
+              vnet_buffer(b1)->sw_if_index[VLIB_RX] = t1->sw_if_index;
+              pkts_decapsulated++;
 
-        trace0:
-          b0->error = error0 ? node->errors[error0] : 0;
+              vlib_increment_combined_counter
+                (rx_counter, thread_index, stats_t1->sw_if_index, 1, len1);
+            }
 
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
             {
-              vxlan_rx_trace_t *tr 
-                = vlib_add_trace (vm, node, b0, sizeof (*tr));
+              vxlan_rx_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
               tr->next_index = next0;
               tr->error = error0;
-              tr->tunnel_index = tunnel_index0;
+              tr->tunnel_index = t0 == 0 ? ~0 : t0 - vxm->tunnels;
               tr->vni = vnet_get_vni (vxlan0);
             }
-
-         if (PREDICT_FALSE (vxlan1->flags != VXLAN_FLAGS_I))
-           {
-             error1 = VXLAN_ERROR_BAD_FLAGS;
-             next1 = VXLAN_INPUT_NEXT_DROP;
-             goto trace1;
-           }
-
-          if (is_ip4) {
-            key4_1.src = ip4_1->src_address.as_u32;
-            key4_1.vni = vxlan1->vni_reserved;
-
-           /* Make sure unicast VXLAN tunnel exist by packet SIP and VNI */
-           if (PREDICT_FALSE (key4_1.as_u64 != last_key4.as_u64))
-              {
-                p1 = hash_get (vxm->vxlan4_tunnel_by_key, key4_1.as_u64);
-                if (PREDICT_FALSE (p1 == NULL))
-                  {
-                    error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next1 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace1;
-                  }
-                last_key4.as_u64 = key4_1.as_u64;
-                tunnel_index1 = last_tunnel_index = p1[0];
-              }
-            else
-              tunnel_index1 = last_tunnel_index;
-           t1 = pool_elt_at_index (vxm->tunnels, tunnel_index1);
-
-           /* Validate VXLAN tunnel encap-fib index agaist packet */
-           if (PREDICT_FALSE (validate_vxlan_fib (b1, t1, is_ip4) == 0))
-             {
-               error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-               next1 = VXLAN_INPUT_NEXT_DROP;
-               goto trace1;
-             }
-
-           /* Validate VXLAN tunnel SIP against packet DIP */
-           if (PREDICT_TRUE (ip4_1->dst_address.as_u32 == t1->src.ip4.as_u32))
-             goto next1; /* valid packet */
-           if (PREDICT_FALSE (ip4_address_is_multicast (&ip4_1->dst_address)))
-             {
-               key4_1.src = ip4_1->dst_address.as_u32;
-               key4_1.vni = vxlan1->vni_reserved;
-               /* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
-               p1 = hash_get (vxm->vxlan4_tunnel_by_key, key4_1.as_u64);
-               if (PREDICT_TRUE (p1 != NULL))
-                 {
-                   mt1 = pool_elt_at_index (vxm->tunnels, p1[0]);
-                   goto next1; /* valid packet */
-                 }
-             }
-           error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-           next1 = VXLAN_INPUT_NEXT_DROP;
-           goto trace1;
-
-         } else /* !is_ip4 */ {
-            key6_1.src.as_u64[0] = ip6_1->src_address.as_u64[0];
-            key6_1.src.as_u64[1] = ip6_1->src_address.as_u64[1];
-            key6_1.vni = vxlan1->vni_reserved;
-
-           /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
-            if (PREDICT_FALSE (memcmp(&key6_1, &last_key6, sizeof(last_key6)) != 0))
-              {
-                p1 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_1);
-
-                if (PREDICT_FALSE (p1 == NULL))
-                  {
-                    error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next1 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace1;
-                  }
-
-                clib_memcpy (&last_key6, &key6_1, sizeof(key6_1));
-                tunnel_index1 = last_tunnel_index = p1[0];
-              }
-            else
-              tunnel_index1 = last_tunnel_index;
-           t1 = pool_elt_at_index (vxm->tunnels, tunnel_index1);
-
-           /* Validate VXLAN tunnel encap-fib index agaist packet */
-           if (PREDICT_FALSE (validate_vxlan_fib (b1, t1, is_ip4) == 0))
-             {
-               error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-               next1 = VXLAN_INPUT_NEXT_DROP;
-               goto trace1;
-             }
-
-           /* Validate VXLAN tunnel SIP against packet DIP */
-           if (PREDICT_TRUE (ip6_address_is_equal (&ip6_1->dst_address,
-                                                   &t1->src.ip6)))
-               goto next1; /* valid packet */
-           if (PREDICT_FALSE (ip6_address_is_multicast (&ip6_1->dst_address)))
-             {
-               key6_1.src.as_u64[0] = ip6_1->dst_address.as_u64[0];
-               key6_1.src.as_u64[1] = ip6_1->dst_address.as_u64[1];
-               key6_1.vni = vxlan1->vni_reserved;
-               p1 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_1);
-               if (PREDICT_TRUE (p1 != NULL)) 
-                 {
-                   mt1 = pool_elt_at_index (vxm->tunnels, p1[0]);
-                   goto next1; /* valid packet */
-                 }
-             }
-           error1 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-           next1 = VXLAN_INPUT_NEXT_DROP;
-           goto trace1;
-         }
-
-       next1:
-          next1 = t1->decap_next_index;
-          sw_if_index1 = t1->sw_if_index;
-          len1 = vlib_buffer_length_in_chain (vm, b1);
-
-          /* Required to make the l2 tag push / pop code work on l2 subifs */
-          if (PREDICT_TRUE(next1 == VXLAN_INPUT_NEXT_L2_INPUT))
-            vnet_update_l2_len (b1);
-
-          /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
-          vnet_buffer(b1)->sw_if_index[VLIB_RX] = sw_if_index1;
-         sw_if_index1 = (mt1) ? mt1->sw_if_index : sw_if_index1;
-
-          pkts_decapsulated ++;
-          stats_n_packets += 1;
-          stats_n_bytes += len1;
-
-         /* Batch stats increment on the same vxlan tunnel so counter
-            is not incremented per packet */
-         if (PREDICT_FALSE (sw_if_index1 != stats_sw_if_index)) 
-           {
-             stats_n_packets -= 1;
-             stats_n_bytes -= len1;
-             if (stats_n_packets)
-               vlib_increment_combined_counter 
-                 (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-                  cpu_index, stats_sw_if_index, 
-                  stats_n_packets, stats_n_bytes);
-             stats_n_packets = 1;
-             stats_n_bytes = len1;
-             stats_sw_if_index = sw_if_index1;
-           }
-
-        trace1:
-          b1->error = error1 ? node->errors[error1] : 0;
-
-          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED)) 
+          if (PREDICT_FALSE(b1->flags & VLIB_BUFFER_IS_TRACED))
             {
-              vxlan_rx_trace_t *tr 
-                = vlib_add_trace (vm, node, b1, sizeof (*tr));
+              vxlan_rx_trace_t *tr = vlib_add_trace (vm, node, b1, sizeof (*tr));
               tr->next_index = next1;
               tr->error = error1;
-              tr->tunnel_index = tunnel_index1;
+              tr->tunnel_index = t1 == 0 ? ~0 : t1 - vxm->tunnels;
               tr->vni = vnet_get_vni (vxlan1);
             }
 
@@ -495,202 +341,76 @@ vxlan_input (vlib_main_t * vm,
 
       while (n_left_from > 0 && n_left_to_next > 0)
        {
-         u32 bi0;
-         vlib_buffer_t * b0;
-         u32 next0;
-          ip4_header_t * ip4_0;
-          ip6_header_t * ip6_0;
-          vxlan_header_t * vxlan0;
-         uword * p0;
-          u32 tunnel_index0;
-          vxlan_tunnel_t * t0, * mt0 = NULL;
-          vxlan4_tunnel_key_t key4_0;
-          vxlan6_tunnel_key_t key6_0;
-          u32 error0;
-         u32 sw_if_index0, len0;
-
-         bi0 = from[0];
-         to_next[0] = bi0;
+         u32 bi0 = to_next[0] = from[0];
          from += 1;
          to_next += 1;
          n_left_from -= 1;
          n_left_to_next -= 1;
 
-         b0 = vlib_get_buffer (vm, bi0);
+         vlib_buffer_t * b0 = vlib_get_buffer (vm, bi0);
 
           /* udp leaves current_data pointing at the vxlan header */
-          vxlan0 = vlib_buffer_get_current (b0);
-          if (is_ip4) {
-           vlib_buffer_advance
-             (b0, -(word)(sizeof(udp_header_t)+sizeof(ip4_header_t)));
-            ip4_0 = vlib_buffer_get_current (b0);
-          } else {
-            vlib_buffer_advance
-              (b0, -(word)(sizeof(udp_header_t)+sizeof(ip6_header_t)));
-            ip6_0 = vlib_buffer_get_current (b0);
-          }
+          void * cur0 = vlib_buffer_get_current (b0);
+          vxlan_header_t * vxlan0 = cur0;
+          ip4_header_t * ip4_0;
+          ip6_header_t * ip6_0;
+          if (is_ip4)
+            ip4_0 = cur0 -sizeof(udp_header_t) - sizeof(ip4_header_t);
+          else
+            ip6_0 = cur0 -sizeof(udp_header_t) - sizeof(ip6_header_t);
 
           /* pop (ip, udp, vxlan) */
-          if (is_ip4) {
-            vlib_buffer_advance
-              (b0, sizeof(*ip4_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
-          } else {
-           vlib_buffer_advance
-              (b0, sizeof(*ip6_0)+sizeof(udp_header_t)+sizeof(*vxlan0));
-          }
-
-          tunnel_index0 = ~0;
-          error0 = 0;
-
-         if (PREDICT_FALSE (vxlan0->flags != VXLAN_FLAGS_I))
-           {
-             error0 = VXLAN_ERROR_BAD_FLAGS;
-             next0 = VXLAN_INPUT_NEXT_DROP;
-             goto trace00;
-           }
+          vlib_buffer_advance (b0, sizeof(*vxlan0));
 
-          if (is_ip4) {
-            key4_0.src = ip4_0->src_address.as_u32;
-            key4_0.vni = vxlan0->vni_reserved;
-
-           /* Make sure unicast VXLAN tunnel exist by packet SIP and VNI */
-            if (PREDICT_FALSE (key4_0.as_u64 != last_key4.as_u64))
-              {
-                p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
-                if (PREDICT_FALSE (p0 == NULL))
-                  {
-                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next0 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace00;
-                  }
-                last_key4.as_u64 = key4_0.as_u64;
-                tunnel_index0 = last_tunnel_index = p0[0];
-              }
-            else
-              tunnel_index0 = last_tunnel_index;
-           t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
-
-           /* Validate VXLAN tunnel encap-fib index agaist packet */
-           if (PREDICT_FALSE (validate_vxlan_fib (b0, t0, is_ip4) == 0))
-             {
-               error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-               next0 = VXLAN_INPUT_NEXT_DROP;
-               goto trace00;
-             }
-
-           /* Validate VXLAN tunnel SIP against packet DIP */
-           if (PREDICT_TRUE (ip4_0->dst_address.as_u32 == t0->src.ip4.as_u32))
-             goto next00; /* valid packet */
-           if (PREDICT_FALSE (ip4_address_is_multicast (&ip4_0->dst_address)))
-             {
-               key4_0.src = ip4_0->dst_address.as_u32;
-               key4_0.vni = vxlan0->vni_reserved;
-               /* Make sure mcast VXLAN tunnel exist by packet DIP and VNI */
-               p0 = hash_get (vxm->vxlan4_tunnel_by_key, key4_0.as_u64);
-               if (PREDICT_TRUE (p0 != NULL))
-                 {
-                   mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
-                   goto next00; /* valid packet */
-                 }
-             }
-           error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-           next0 = VXLAN_INPUT_NEXT_DROP;
-           goto trace00;
-
-          } else /* !is_ip4 */ {
-            key6_0.src.as_u64[0] = ip6_0->src_address.as_u64[0];
-            key6_0.src.as_u64[1] = ip6_0->src_address.as_u64[1];
-            key6_0.vni = vxlan0->vni_reserved;
-
-           /* Make sure VXLAN tunnel exist according to packet SIP and VNI */
-            if (PREDICT_FALSE (memcmp(&key6_0, &last_key6, sizeof(last_key6)) != 0))
-              {
-                p0 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_0);
-                if (PREDICT_FALSE (p0 == NULL))
-                  {
-                    error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-                    next0 = VXLAN_INPUT_NEXT_DROP;
-                    goto trace00;
-                  }
-                clib_memcpy (&last_key6, &key6_0, sizeof(key6_0));
-                tunnel_index0 = last_tunnel_index = p0[0];
-              }
-            else
-              tunnel_index0 = last_tunnel_index;
-           t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
-
-           /* Validate VXLAN tunnel encap-fib index agaist packet */
-           if (PREDICT_FALSE (validate_vxlan_fib (b0, t0, is_ip4) == 0))
-             {
-               error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-               next0 = VXLAN_INPUT_NEXT_DROP;
-               goto trace00;
-             }
-
-           /* Validate VXLAN tunnel SIP against packet DIP */
-           if (PREDICT_TRUE (ip6_address_is_equal (&ip6_0->dst_address,
-                                                   &t0->src.ip6)))
-               goto next00; /* valid packet */
-           if (PREDICT_FALSE (ip6_address_is_multicast (&ip6_0->dst_address)))
-             {
-               key6_0.src.as_u64[0] = ip6_0->dst_address.as_u64[0];
-               key6_0.src.as_u64[1] = ip6_0->dst_address.as_u64[1];
-               key6_0.vni = vxlan0->vni_reserved;
-               p0 = hash_get_mem (vxm->vxlan6_tunnel_by_key, &key6_0);
-               if (PREDICT_TRUE (p0 != NULL)) 
-                 {
-                   mt0 = pool_elt_at_index (vxm->tunnels, p0[0]);
-                   goto next00; /* valid packet */
-                 }
-             }
-           error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
-           next0 = VXLAN_INPUT_NEXT_DROP;
-           goto trace00;
-          }
-
-       next00:
-          next0 = t0->decap_next_index;
-          sw_if_index0 = t0->sw_if_index;
-          len0 = vlib_buffer_length_in_chain (vm, b0);
+          vxlan_tunnel_t * t0, * stats_t0;
+          if (is_ip4)
+            t0 = vxlan4_find_tunnel (vxm, &last4, ip4_0, vxlan0, &stats_t0);
+          else
+            t0 = vxlan6_find_tunnel (vxm, &last6, ip6_0, vxlan0, &stats_t0);
 
-          /* Required to make the l2 tag push / pop code work on l2 subifs */
-          if (PREDICT_TRUE(next0 == VXLAN_INPUT_NEXT_L2_INPUT))
-            vnet_update_l2_len (b0);
+          uword len0 = vlib_buffer_length_in_chain (vm, b0);
 
-          /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
-          vnet_buffer(b0)->sw_if_index[VLIB_RX] = sw_if_index0;
-         sw_if_index0 = (mt0) ? mt0->sw_if_index : sw_if_index0;
+         u32 next0;
+          u8 error0 = 0;
+          /* Validate VXLAN tunnel encap-fib index agaist packet */
+          if (PREDICT_FALSE (t0 == 0 || validate_vxlan_fib (b0, t0, is_ip4) == 0 ||
+                vxlan0->flags != VXLAN_FLAGS_I))
+            {
+              next0 = VXLAN_INPUT_NEXT_DROP;
+
+              if (t0 != 0 && vxlan0->flags != VXLAN_FLAGS_I)
+                {
+                  error0 = VXLAN_ERROR_BAD_FLAGS;
+                  vlib_increment_combined_counter
+                    (drop_counter, thread_index, stats_t0->sw_if_index, 1, len0);
+                }
+              else
+                error0 = VXLAN_ERROR_NO_SUCH_TUNNEL;
+              b0->error = node->errors[error0];
+            }
+          else
+            {
+              next0 = t0->decap_next_index;
 
-          pkts_decapsulated ++;
-          stats_n_packets += 1;
-          stats_n_bytes += len0;
+              /* Required to make the l2 tag push / pop code work on l2 subifs */
+              if (PREDICT_TRUE(next0 == VXLAN_INPUT_NEXT_L2_INPUT))
+                vnet_update_l2_len (b0);
 
-         /* Batch stats increment on the same vxlan tunnel so counter
-            is not incremented per packet */
-         if (PREDICT_FALSE (sw_if_index0 != stats_sw_if_index)) 
-           {
-             stats_n_packets -= 1;
-             stats_n_bytes -= len0;
-             if (stats_n_packets)
-               vlib_increment_combined_counter 
-                 (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-                  cpu_index, stats_sw_if_index, 
-                  stats_n_packets, stats_n_bytes);
-             stats_n_packets = 1;
-             stats_n_bytes = len0;
-             stats_sw_if_index = sw_if_index0;
-           }
+              /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
+              vnet_buffer(b0)->sw_if_index[VLIB_RX] = t0->sw_if_index;
+              pkts_decapsulated++;
 
-        trace00:
-          b0->error = error0 ? node->errors[error0] : 0;
+              vlib_increment_combined_counter
+                (rx_counter, thread_index, stats_t0->sw_if_index, 1, len0);
+            }
 
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
             {
-              vxlan_rx_trace_t *tr 
+              vxlan_rx_trace_t *tr
                 = vlib_add_trace (vm, node, b0, sizeof (*tr));
               tr->next_index = next0;
               tr->error = error0;
-              tr->tunnel_index = tunnel_index0;
+              tr->tunnel_index = t0 == 0 ? ~0 : t0 - vxm->tunnels;
               tr->vni = vnet_get_vni (vxlan0);
             }
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
@@ -701,20 +421,10 @@ vxlan_input (vlib_main_t * vm,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
   /* Do we still need this now that tunnel tx stats is kept? */
-  vlib_node_increment_counter (vm, is_ip4? 
-                              vxlan4_input_node.index:vxlan6_input_node.index,
-                               VXLAN_ERROR_DECAPSULATED, 
+  u32 node_idx = is_ip4 ? vxlan4_input_node.index : vxlan6_input_node.index;
+  vlib_node_increment_counter (vm, node_idx, VXLAN_ERROR_DECAPSULATED,
                                pkts_decapsulated);
 
-  /* Increment any remaining batch stats */
-  if (stats_n_packets)
-    {
-      vlib_increment_combined_counter 
-       (im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
-        cpu_index, stats_sw_if_index, stats_n_packets, stats_n_bytes);
-      node->runtime_data[0] = stats_sw_if_index;
-    }
-
   return from_frame->n_vectors;
 }
 
@@ -896,7 +606,7 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
            goto exit0; /* not VXLAN packet */
 
          /* Validate DIP against VTEPs*/
-         if (is_ip4) 
+         if (is_ip4)
            {
              if (addr4.as_u32 != ip40->dst_address.as_u32)
                {
@@ -916,7 +626,7 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
            }
 
          flags0 = b0->flags;
-         good_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+         good_udp0 = (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 
          /* Don't verify UDP checksum for packets with explicit zero checksum. */
          good_udp0 |= udp0->checksum == 0;
@@ -932,14 +642,14 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
          /* Verify UDP checksum */
          if (PREDICT_FALSE (!good_udp0))
            {
-             if ((flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED) == 0)
+             if ((flags0 & VNET_BUFFER_F_L4_CHECKSUM_COMPUTED) == 0)
                {
                  if (is_ip4)
                    flags0 = ip4_tcp_udp_validate_checksum (vm, b0);
                  else
                    flags0 = ip6_tcp_udp_icmp_validate_checksum (vm, b0);
                  good_udp0 =
-                   (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+                   (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
                }
            }
 
@@ -954,7 +664,7 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
              error0 = (len_diff0 >= 0) ? error0 : IP6_ERROR_UDP_LENGTH;
            }
 
-         next0 = error0 ? 
+         next0 = error0 ?
            IP_VXLAN_BYPASS_NEXT_DROP : IP_VXLAN_BYPASS_NEXT_VXLAN;
          b0->error = error0 ? error_node->errors[error0] : 0;
 
@@ -978,7 +688,7 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
            goto exit1; /* not VXLAN packet */
 
          /* Validate DIP against VTEPs*/
-         if (is_ip4) 
+         if (is_ip4)
            {
              if (addr4.as_u32 != ip41->dst_address.as_u32)
                {
@@ -998,7 +708,7 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
            }
 
          flags1 = b1->flags;
-         good_udp1 = (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+         good_udp1 = (flags1 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 
          /* Don't verify UDP checksum for packets with explicit zero checksum. */
          good_udp1 |= udp1->checksum == 0;
@@ -1014,14 +724,14 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
          /* Verify UDP checksum */
          if (PREDICT_FALSE (!good_udp1))
            {
-             if ((flags1 & IP_BUFFER_L4_CHECKSUM_COMPUTED) == 0)
+             if ((flags1 & VNET_BUFFER_F_L4_CHECKSUM_COMPUTED) == 0)
                {
                  if (is_ip4)
                    flags1 = ip4_tcp_udp_validate_checksum (vm, b1);
                  else
                    flags1 = ip6_tcp_udp_icmp_validate_checksum (vm, b1);
                  good_udp1 =
-                   (flags1 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+                   (flags1 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
                }
            }
 
@@ -1032,14 +742,14 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
            }
          else
            {
-             error1 = good_udp1 ? 0 : IP4_ERROR_UDP_CHECKSUM;
-             error1 = (len_diff1 >= 0) ? error1 : IP4_ERROR_UDP_LENGTH;
+             error1 = good_udp1 ? 0 : IP6_ERROR_UDP_CHECKSUM;
+             error1 = (len_diff1 >= 0) ? error1 : IP6_ERROR_UDP_LENGTH;
            }
 
-         next1 = error1 ? 
+         next1 = error1 ?
            IP_VXLAN_BYPASS_NEXT_DROP : IP_VXLAN_BYPASS_NEXT_VXLAN;
          b1->error = error1 ? error_node->errors[error1] : 0;
+
          /* vxlan-input node expect current at VXLAN header */
          if (is_ip4)
            vlib_buffer_advance (b1, sizeof(ip4_header_t)+sizeof(udp_header_t));
@@ -1096,7 +806,7 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
            goto exit; /* not VXLAN packet */
 
          /* Validate DIP against VTEPs*/
-         if (is_ip4) 
+         if (is_ip4)
            {
              if (addr4.as_u32 != ip40->dst_address.as_u32)
                {
@@ -1116,7 +826,7 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
            }
 
          flags0 = b0->flags;
-         good_udp0 = (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+         good_udp0 = (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
 
          /* Don't verify UDP checksum for packets with explicit zero checksum. */
          good_udp0 |= udp0->checksum == 0;
@@ -1132,14 +842,14 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
          /* Verify UDP checksum */
          if (PREDICT_FALSE (!good_udp0))
            {
-             if ((flags0 & IP_BUFFER_L4_CHECKSUM_COMPUTED) == 0)
+             if ((flags0 & VNET_BUFFER_F_L4_CHECKSUM_COMPUTED) == 0)
                {
                  if (is_ip4)
                    flags0 = ip4_tcp_udp_validate_checksum (vm, b0);
                  else
                    flags0 = ip6_tcp_udp_icmp_validate_checksum (vm, b0);
                  good_udp0 =
-                   (flags0 & IP_BUFFER_L4_CHECKSUM_CORRECT) != 0;
+                   (flags0 & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
                }
            }
 
@@ -1154,7 +864,7 @@ ip_vxlan_bypass_inline (vlib_main_t * vm,
              error0 = (len_diff0 >= 0) ? error0 : IP6_ERROR_UDP_LENGTH;
            }
 
-         next0 = error0 ? 
+         next0 = error0 ?
            IP_VXLAN_BYPASS_NEXT_DROP : IP_VXLAN_BYPASS_NEXT_VXLAN;
          b0->error = error0 ? error_node->errors[error0] : 0;
 
@@ -1237,3 +947,375 @@ clib_error_t * ip6_vxlan_bypass_init (vlib_main_t * vm)
 { return 0; }
 
 VLIB_INIT_FUNCTION (ip6_vxlan_bypass_init);
+
+#define foreach_vxlan_flow_input_next        \
+_(DROP, "error-drop")                           \
+_(L2_INPUT, "l2-input")
+
+typedef enum
+{
+#define _(s,n) VXLAN_FLOW_NEXT_##s,
+  foreach_vxlan_flow_input_next
+#undef _
+  VXLAN_FLOW_N_NEXT,
+} vxlan_flow_input_next_t;
+
+#define foreach_vxlan_flow_error                                       \
+  _(NONE, "no error")                                                  \
+  _(IP_CHECKSUM_ERROR, "Rx ip checksum errors")                                \
+  _(IP_HEADER_ERROR, "Rx ip header errors")                            \
+  _(UDP_CHECKSUM_ERROR, "Rx udp checksum errors")                              \
+  _(UDP_LENGTH_ERROR, "Rx udp length errors")
+
+typedef enum
+{
+#define _(f,s) VXLAN_FLOW_ERROR_##f,
+  foreach_vxlan_flow_error
+#undef _
+    VXLAN_FLOW_N_ERROR,
+} vxlan_flow_error_t;
+
+static char *vxlan_flow_error_strings[] = {
+#define _(n,s) s,
+  foreach_vxlan_flow_error
+#undef _
+};
+
+
+static_always_inline u8
+vxlan_validate_udp_csum (vlib_main_t * vm, vlib_buffer_t *b)
+{
+  u32 flags = b->flags;
+  enum { offset = sizeof(ip4_header_t) + sizeof(udp_header_t) + sizeof(vxlan_header_t), };
+
+  /* Verify UDP checksum */
+  if ((flags & VNET_BUFFER_F_L4_CHECKSUM_COMPUTED) == 0)
+  {
+    vlib_buffer_advance (b, -offset);
+    flags = ip4_tcp_udp_validate_checksum (vm, b);
+    vlib_buffer_advance (b, offset);
+  }
+
+  return (flags & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0;
+}
+
+static_always_inline u8
+vxlan_check_udp_csum (vlib_main_t * vm, vlib_buffer_t *b)
+{
+  ip4_vxlan_header_t * hdr = vlib_buffer_get_current(b) - sizeof *hdr;
+  udp_header_t * udp = &hdr->udp;
+  /* Don't verify UDP checksum for packets with explicit zero checksum. */
+  u8 good_csum = (b->flags & VNET_BUFFER_F_L4_CHECKSUM_CORRECT) != 0 ||
+    udp->checksum == 0;
+
+  return !good_csum;
+}
+
+static_always_inline u8
+vxlan_check_ip (vlib_buffer_t *b, u16 payload_len)
+{
+  ip4_vxlan_header_t * hdr = vlib_buffer_get_current(b) - sizeof *hdr;
+  u16 ip_len = clib_net_to_host_u16 (hdr->ip4.length);
+  u16 expected = payload_len + sizeof *hdr;
+  return ip_len > expected || hdr->ip4.ttl == 0 || hdr->ip4.ip_version_and_header_length != 0x45;
+}
+
+static_always_inline u8
+vxlan_check_ip_udp_len (vlib_buffer_t *b)
+{
+  ip4_vxlan_header_t * hdr = vlib_buffer_get_current(b) - sizeof *hdr;
+  u16 ip_len = clib_net_to_host_u16 (hdr->ip4.length);
+  u16 udp_len = clib_net_to_host_u16 (hdr->udp.length);
+  return udp_len > ip_len;
+}
+
+static_always_inline u8
+vxlan_err_code (u8 ip_err0, u8 udp_err0, u8 csum_err0)
+{
+  u8 error0 = VXLAN_FLOW_ERROR_NONE;
+  if (ip_err0)
+    error0 =  VXLAN_FLOW_ERROR_IP_HEADER_ERROR;
+  if (udp_err0)
+    error0 =  VXLAN_FLOW_ERROR_UDP_LENGTH_ERROR;
+  if (csum_err0)
+    error0 =  VXLAN_FLOW_ERROR_UDP_CHECKSUM_ERROR;
+  return error0;
+}
+
+uword
+CLIB_MULTIARCH_FN (vxlan_flow_input) (vlib_main_t * vm,
+                                             vlib_node_runtime_t * node,
+                                             vlib_frame_t * f)
+{
+  enum { payload_offset = sizeof(ip4_vxlan_header_t) };
+
+  vxlan_main_t * vxm = &vxlan_main;
+  vnet_interface_main_t * im = &vnet_main.interface_main;
+  vlib_combined_counter_main_t * rx_counter[VXLAN_FLOW_N_NEXT] = {
+    [VXLAN_FLOW_NEXT_DROP] = im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_DROP,
+    [VXLAN_FLOW_NEXT_L2_INPUT] = im->combined_sw_if_counters + VNET_INTERFACE_COUNTER_RX,
+  };
+  u32 thread_index = vlib_get_thread_index();
+
+  u32 * from = vlib_frame_vector_args (f);
+  u32 n_left_from = f->n_vectors;
+  u32 next_index = VXLAN_FLOW_NEXT_L2_INPUT;
+
+  while (n_left_from > 0)
+  {
+    u32 n_left_to_next, *to_next;
+
+    vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+    while (n_left_from > 3 && n_left_to_next > 3)
+    {
+      u32 bi0 = to_next[0] = from[0];
+      u32 bi1 = to_next[1] = from[1];
+      u32 bi2 = to_next[2] = from[2];
+      u32 bi3 = to_next[3] = from[3];
+      from+=4;
+      n_left_from-=4;
+      to_next+=4;
+      n_left_to_next-=4;
+
+      vlib_buffer_t * b0 = vlib_get_buffer (vm, bi0);
+      vlib_buffer_t * b1 = vlib_get_buffer (vm, bi1);
+      vlib_buffer_t * b2 = vlib_get_buffer (vm, bi2);
+      vlib_buffer_t * b3 = vlib_get_buffer (vm, bi3);
+
+      vlib_buffer_advance (b0, payload_offset);
+      vlib_buffer_advance (b1, payload_offset);
+      vlib_buffer_advance (b2, payload_offset);
+      vlib_buffer_advance (b3, payload_offset);
+
+      u16 len0 = vlib_buffer_length_in_chain (vm, b0);
+      u16 len1 = vlib_buffer_length_in_chain (vm, b1);
+      u16 len2 = vlib_buffer_length_in_chain (vm, b2);
+      u16 len3 = vlib_buffer_length_in_chain (vm, b3);
+
+      u32 next0 = VXLAN_FLOW_NEXT_L2_INPUT, next1 = VXLAN_FLOW_NEXT_L2_INPUT,
+          next2 = VXLAN_FLOW_NEXT_L2_INPUT, next3 = VXLAN_FLOW_NEXT_L2_INPUT;
+
+      u8 ip_err0 = vxlan_check_ip (b0, len0);
+      u8 ip_err1 = vxlan_check_ip (b1, len1);
+      u8 ip_err2 = vxlan_check_ip (b2, len2);
+      u8 ip_err3 = vxlan_check_ip (b3, len3);
+      u8 ip_err = ip_err0 | ip_err1 | ip_err2 | ip_err3;
+
+      u8 udp_err0 = vxlan_check_ip_udp_len (b0);
+      u8 udp_err1 = vxlan_check_ip_udp_len (b1);
+      u8 udp_err2 = vxlan_check_ip_udp_len (b2);
+      u8 udp_err3 = vxlan_check_ip_udp_len (b3);
+      u8 udp_err = udp_err0 | udp_err1 | udp_err2 | udp_err3;
+
+      u8 csum_err0 = vxlan_check_udp_csum (vm, b0);
+      u8 csum_err1 = vxlan_check_udp_csum (vm, b1);
+      u8 csum_err2 = vxlan_check_udp_csum (vm, b2);
+      u8 csum_err3 = vxlan_check_udp_csum (vm, b3);
+      u8 csum_err = csum_err0 | csum_err1 | csum_err2 | csum_err3;
+
+      if (PREDICT_FALSE(csum_err))
+        {
+          if (csum_err0)
+            csum_err0 = !vxlan_validate_udp_csum (vm, b0);
+          if (csum_err1)
+            csum_err1 = !vxlan_validate_udp_csum (vm, b1);
+          if (csum_err2)
+            csum_err2 = !vxlan_validate_udp_csum (vm, b2);
+          if (csum_err3)
+            csum_err3 = !vxlan_validate_udp_csum (vm, b3);
+          csum_err = csum_err0 | csum_err1 | csum_err2 | csum_err3;
+        }
+
+      if (PREDICT_FALSE(ip_err || udp_err || csum_err))
+      {
+        if (ip_err0 || udp_err0 || csum_err0)
+        {
+          next0 = VXLAN_FLOW_NEXT_DROP;
+          u8 error0 = vxlan_err_code (ip_err0, udp_err0, csum_err0);
+          b0->error = node->errors[error0];
+        }
+        if (ip_err1 || udp_err1 || csum_err1)
+        {
+          next1 = VXLAN_FLOW_NEXT_DROP;
+          u8 error1 = vxlan_err_code (ip_err1, udp_err1, csum_err1);
+          b1->error = node->errors[error1];
+        }
+        if (ip_err2 || udp_err2 || csum_err2)
+        {
+          next2 = VXLAN_FLOW_NEXT_DROP;
+          u8 error2 = vxlan_err_code (ip_err2, udp_err2, csum_err2);
+          b2->error = node->errors[error2];
+        }
+        if (ip_err3 || udp_err3 || csum_err3)
+        {
+          next3 = VXLAN_FLOW_NEXT_DROP;
+          u8 error3 = vxlan_err_code (ip_err3, udp_err3, csum_err3);
+          b3->error = node->errors[error3];
+        }
+      }
+
+      vnet_update_l2_len (b0);
+      vnet_update_l2_len (b1);
+      vnet_update_l2_len (b2);
+      vnet_update_l2_len (b3);
+
+      ASSERT (b0->flow_id != 0);
+      ASSERT (b1->flow_id != 0);
+      ASSERT (b2->flow_id != 0);
+      ASSERT (b3->flow_id != 0);
+
+      u32 t_index0 = b0->flow_id - vxm->flow_id_start;
+      u32 t_index1 = b1->flow_id - vxm->flow_id_start;
+      u32 t_index2 = b2->flow_id - vxm->flow_id_start;
+      u32 t_index3 = b3->flow_id - vxm->flow_id_start;
+
+      vxlan_tunnel_t * t0 = &vxm->tunnels[t_index0];
+      vxlan_tunnel_t * t1 = &vxm->tunnels[t_index1];
+      vxlan_tunnel_t * t2 = &vxm->tunnels[t_index2];
+      vxlan_tunnel_t * t3 = &vxm->tunnels[t_index3];
+
+      /* flow id consumed */
+      b0->flow_id = 0;
+      b1->flow_id = 0;
+      b2->flow_id = 0;
+      b3->flow_id = 0;
+
+      u32 sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX] = t0->sw_if_index;
+      u32 sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX] = t1->sw_if_index;
+      u32 sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_RX] = t2->sw_if_index;
+      u32 sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_RX] = t3->sw_if_index;
+
+      vlib_increment_combined_counter (rx_counter[next0], thread_index, sw_if_index0, 1, len0);
+      vlib_increment_combined_counter (rx_counter[next1], thread_index, sw_if_index1, 1, len1);
+      vlib_increment_combined_counter (rx_counter[next2], thread_index, sw_if_index2, 1, len2);
+      vlib_increment_combined_counter (rx_counter[next3], thread_index, sw_if_index3, 1, len3);
+
+      u32 flags = b0->flags | b1->flags | b2->flags | b3->flags;
+
+      if (PREDICT_FALSE(flags & VLIB_BUFFER_IS_TRACED))
+        {
+          if (b0->flags & VLIB_BUFFER_IS_TRACED)
+            {
+              vxlan_rx_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof *tr);
+              u8 error0 = vxlan_err_code (ip_err0, udp_err0, csum_err0);
+              *tr = (vxlan_rx_trace_t) {
+                .next_index = next0, .error = error0, .tunnel_index = t_index0, .vni = t0->vni };
+            }
+          if (b1->flags & VLIB_BUFFER_IS_TRACED)
+            {
+              vxlan_rx_trace_t *tr = vlib_add_trace (vm, node, b1, sizeof *tr);
+              u8 error1 = vxlan_err_code (ip_err1, udp_err1, csum_err1);
+              *tr = (vxlan_rx_trace_t) {
+                .next_index = next1, .error = error1, .tunnel_index = t_index1, .vni = t1->vni };
+            }
+          if (b2->flags & VLIB_BUFFER_IS_TRACED)
+            {
+              vxlan_rx_trace_t *tr = vlib_add_trace (vm, node, b2, sizeof *tr);
+              u8 error2 = vxlan_err_code (ip_err2, udp_err2, csum_err2);
+              *tr = (vxlan_rx_trace_t) {
+                .next_index = next2, .error = error2, .tunnel_index = t_index2, .vni = t2->vni };
+            }
+          if (b3->flags & VLIB_BUFFER_IS_TRACED)
+            {
+              vxlan_rx_trace_t *tr = vlib_add_trace (vm, node, b3, sizeof *tr);
+              u8 error3 = vxlan_err_code (ip_err3, udp_err3, csum_err3);
+              *tr = (vxlan_rx_trace_t) {
+                .next_index = next3, .error = error3, .tunnel_index = t_index3, .vni = t3->vni };
+            }
+        }
+      vlib_validate_buffer_enqueue_x4
+        (vm, node, next_index, to_next, n_left_to_next,
+          bi0, bi1, bi2, bi3, next0, next1, next2, next3);
+    }
+    while (n_left_from > 0 && n_left_to_next > 0)
+    {
+      u32 bi0 = to_next[0] = from[0];
+      from++;
+      n_left_from--;
+      to_next++;
+      n_left_to_next--;
+
+      vlib_buffer_t * b0 = vlib_get_buffer (vm, bi0);
+      vlib_buffer_advance (b0, payload_offset);
+
+      u16 len0 = vlib_buffer_length_in_chain (vm, b0);
+      u32 next0 = VXLAN_FLOW_NEXT_L2_INPUT;
+
+      u8 ip_err0 = vxlan_check_ip (b0, len0);
+      u8 udp_err0 = vxlan_check_ip_udp_len (b0);
+      u8 csum_err0 = vxlan_check_udp_csum (vm, b0);
+
+      if (csum_err0)
+       csum_err0 = !vxlan_validate_udp_csum (vm, b0);
+      if (ip_err0 || udp_err0 || csum_err0)
+      {
+       next0 = VXLAN_FLOW_NEXT_DROP;
+        u8 error0 = vxlan_err_code (ip_err0, udp_err0, csum_err0);
+       b0->error = node->errors[error0];
+      }
+
+      vnet_update_l2_len (b0);
+
+      ASSERT (b0->flow_id != 0);
+      u32 t_index0 = b0->flow_id - vxm->flow_id_start;
+      vxlan_tunnel_t * t0 = &vxm->tunnels[t_index0];
+      b0->flow_id = 0;
+
+      u32 sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX] = t0->sw_if_index;
+      vlib_increment_combined_counter (rx_counter[next0], thread_index, sw_if_index0, 1, len0);
+
+      if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED)) 
+       {
+         vxlan_rx_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof *tr);
+          u8 error0 = vxlan_err_code (ip_err0, udp_err0, csum_err0);
+         *tr = (vxlan_rx_trace_t) {
+            .next_index = next0, .error = error0, .tunnel_index = t_index0, .vni = t0->vni };
+       }
+      vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
+          to_next, n_left_to_next,
+          bi0, next0);
+    }
+
+    vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+  }
+
+  return f->n_vectors;
+}
+
+/* *INDENT-OFF* */
+#ifndef CLIB_MULTIARCH_VARIANT
+VLIB_REGISTER_NODE (vxlan4_flow_input_node) = {
+  .name = "vxlan-flow-input",
+  .function = vxlan_flow_input,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_vxlan_rx_trace,
+
+  .n_errors = VXLAN_FLOW_N_ERROR,
+  .error_strings = vxlan_flow_error_strings,
+
+  .n_next_nodes = VXLAN_FLOW_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [VXLAN_FLOW_NEXT_##s] = n,
+    foreach_vxlan_flow_input_next
+#undef _
+  },
+};
+#endif
+/* *INDENT-ON* */
+
+vlib_node_function_t __clib_weak vxlan_flow_input_avx512;
+vlib_node_function_t __clib_weak vxlan_flow_input_avx2;
+
+#if __x86_64__
+static void __clib_constructor
+vxlan_flow_input_multiarch_select (void)
+{
+  if (vxlan_flow_input_avx512 && clib_cpu_supports_avx512f ())
+    vxlan4_flow_input_node.function = vxlan_flow_input_avx512;
+  else if (vxlan_flow_input_avx2 && clib_cpu_supports_avx2 ())
+    vxlan4_flow_input_node.function = vxlan_flow_input_avx2;
+}
+#endif