Remove c-11 memcpy checks from perf-critical code

[vpp.git] / src / plugins / ioam / ip6 / ioam_cache_tunnel_select_node.c

diff --git a/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c b/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
index 0cf742c..63bcaff 100644 (file)
--- a/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
+++ b/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
@@ -43,7 +43,7 @@
 #include <vnet/pg/pg.h>
 #include <vppinfra/error.h>
 #include <vnet/ip/ip.h>
-#include <vnet/sr/sr.h>
+#include <vnet/srv6/sr.h>
 #include <ioam/ip6/ioam_cache.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
 #include <vnet/ip/ip6_hop_by_hop_packet.h>
@@ -415,7 +415,7 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
 
              hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
              /* $$$ tune, rewrite_length is a multiple of 8 */
-             clib_memcpy (hbh0, rewrite, rewrite_length);
+             clib_memcpy_fast (hbh0, rewrite, rewrite_length);
              e2e =
                (ioam_e2e_cache_option_t *) ((u8 *) hbh0 +
                                             cm->rewrite_pool_index_offset);
@@ -424,7 +424,7 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
              ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
                                           ((u8 *) e2e +
                                            sizeof (ioam_e2e_cache_option_t)),
-                                          b0);
+                                          &cm->sr_localsid_ts);
              /* Patch the protocol chain, insert the h-b-h (type 0) header */
              hbh0->protocol = ip0->protocol;
              ip0->protocol = 0;
@@ -475,7 +475,7 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
 
              hbh1 = (ip6_hop_by_hop_header_t *) (ip1 + 1);
              /* $$$ tune, rewrite_length is a multiple of 8 */
-             clib_memcpy (hbh1, rewrite, rewrite_length);
+             clib_memcpy_fast (hbh1, rewrite, rewrite_length);
              e2e =
                (ioam_e2e_cache_option_t *) ((u8 *) hbh1 +
                                             cm->rewrite_pool_index_offset);
@@ -484,7 +484,7 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
              ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
                                           ((u8 *) e2e +
                                            sizeof (ioam_e2e_cache_option_t)),
-                                          b1);
+                                          &cm->sr_localsid_ts);
              /* Patch the protocol chain, insert the h-b-h (type 0) header */
              hbh1->protocol = ip1->protocol;
              ip1->protocol = 0;
@@ -581,7 +581,7 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
 
              hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
              /* $$$ tune, rewrite_length is a multiple of 8 */
-             clib_memcpy (hbh0, rewrite, rewrite_length);
+             clib_memcpy_fast (hbh0, rewrite, rewrite_length);
              e2e =
                (ioam_e2e_cache_option_t *) ((u8 *) hbh0 +
                                             cm->rewrite_pool_index_offset);
@@ -590,7 +590,7 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
              ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
                                           ((u8 *) e2e +
                                            sizeof (ioam_e2e_cache_option_t)),
-                                          b0);
+                                          &cm->sr_localsid_ts);
              /* Patch the protocol chain, insert the h-b-h (type 0) header */
              hbh0->protocol = ip0->protocol;
              ip0->protocol = 0;