diff options
Diffstat (limited to 'src/vnet/vxlan-gpe')
| -rw-r--r-- | src/vnet/vxlan-gpe/decap.c | 44 |
1 files changed, 32 insertions, 12 deletions
diff --git a/src/vnet/vxlan-gpe/decap.c b/src/vnet/vxlan-gpe/decap.c index f2961d5ff5b..77b5328c8f6 100644 --- a/src/vnet/vxlan-gpe/decap.c +++ b/src/vnet/vxlan-gpe/decap.c @@ -792,11 +792,18 @@ ip_vxlan_gpe_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); @@ -823,16 +830,11 @@ ip_vxlan_gpe_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 (p2, LOAD); - vlib_prefetch_buffer_header (p3, LOAD); + vlib_prefetch_buffer_header (b[2], LOAD); + vlib_prefetch_buffer_header (b[3], 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]; @@ -842,8 +844,9 @@ ip_vxlan_gpe_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); @@ -885,7 +888,12 @@ ip_vxlan_gpe_bypass_inline (vlib_main_t * vm, /* Validate DIP against VTEPs */ if (is_ip4) { +#ifdef CLIB_HAVE_VEC512 + if (!vtep4_check_vector + (&ngm->vtep_table, b0, ip40, &last_vtep4, &vtep4_u512)) +#else if (!vtep4_check (&ngm->vtep_table, b0, ip40, &last_vtep4)) +#endif goto exit0; /* no local VTEP for VXLAN packet */ } else @@ -963,7 +971,12 @@ ip_vxlan_gpe_bypass_inline (vlib_main_t * vm, /* Validate DIP against VTEPs */ if (is_ip4) { +#ifdef CLIB_HAVE_VEC512 + if (!vtep4_check_vector + (&ngm->vtep_table, b1, ip41, &last_vtep4, &vtep4_u512)) +#else if (!vtep4_check (&ngm->vtep_table, b1, ip41, &last_vtep4)) +#endif goto exit1; /* no local VTEP for VXLAN packet */ } else @@ -1047,7 +1060,8 @@ ip_vxlan_gpe_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 @@ -1073,9 +1087,15 @@ ip_vxlan_gpe_bypass_inline (vlib_main_t * vm, goto exit; /* not VXLAN packet */ /* Validate DIP against VTEPs */ + if (is_ip4) { +#ifdef CLIB_HAVE_VEC512 + if (!vtep4_check_vector + (&ngm->vtep_table, b0, ip40, &last_vtep4, &vtep4_u512)) +#else if (!vtep4_check (&ngm->vtep_table, b0, ip40, &last_vtep4)) +#endif goto exit; /* no local VTEP for VXLAN packet */ } else |