Add clib_memcpy macro based on DPDK rte_memcpy implementation

Change-Id: I22cb443c4bd0bf298abb6f06e8e4ca65a44a2854
Signed-off-by: Damjan Marion <damarion@cisco.com>

5 files changed, 11 insertions, 11 deletions

diff --git a/vnet/vnet/map/ip4_map.c b/vnet/vnet/map/ip4_map.c
index adbc72e97a4..85b72e105d3 100644
--- a/vnet/vnet/map/ip4_map.c
+++ b/vnet/vnet/map/ip4_map.c
@@ -566,11 +566,11 @@ ip4_map_reass (vlib_main_t *vm,
         from = vlib_frame_vector_args(frame);
         u32 len = vec_len(fragments_to_loopback);
         if(len <= VLIB_FRAME_SIZE) {
-          memcpy(from, fragments_to_loopback, sizeof(u32)*len);
+          clib_memcpy(from, fragments_to_loopback, sizeof(u32)*len);
           n_left_from = len;
           vec_reset_length(fragments_to_loopback);
         } else {
-          memcpy(from, fragments_to_loopback + (len - VLIB_FRAME_SIZE), sizeof(u32)*VLIB_FRAME_SIZE);
+          clib_memcpy(from, fragments_to_loopback + (len - VLIB_FRAME_SIZE), sizeof(u32)*VLIB_FRAME_SIZE);
           n_left_from = VLIB_FRAME_SIZE;
           _vec_len(fragments_to_loopback) = len - VLIB_FRAME_SIZE;
         }
diff --git a/vnet/vnet/map/ip4_map_t.c b/vnet/vnet/map/ip4_map_t.c
index 7a72068143a..78cfae79e35 100644
--- a/vnet/vnet/map/ip4_map_t.c
+++ b/vnet/vnet/map/ip4_map_t.c
@@ -263,7 +263,7 @@ _ip4_map_t_icmp (map_domain_t *d, vlib_buffer_t *p, u8 *error)
 
       vlib_buffer_advance(p, - 2*(sizeof(*ip6) - sizeof(*ip4)) - sizeof(*inner_frag));
       ip6 = vlib_buffer_get_current(p);
-      memcpy(u8_ptr_add(ip6, sizeof(*ip6) - sizeof(*ip4)), ip4, 20 + 8);
+      clib_memcpy(u8_ptr_add(ip6, sizeof(*ip6) - sizeof(*ip4)), ip4, 20 + 8);
       ip4 = (ip4_header_t *) u8_ptr_add(ip6, sizeof(*ip6) - sizeof(*ip4));
       icmp = (icmp46_header_t *) (ip4 + 1);
 
@@ -276,7 +276,7 @@ _ip4_map_t_icmp (map_domain_t *d, vlib_buffer_t *p, u8 *error)
     } else {
       vlib_buffer_advance(p, - 2*(sizeof(*ip6) - sizeof(*ip4)));
       ip6 = vlib_buffer_get_current(p);
-      memcpy(u8_ptr_add(ip6, sizeof(*ip6) - sizeof(*ip4)), ip4, 20 + 8);
+      clib_memcpy(u8_ptr_add(ip6, sizeof(*ip6) - sizeof(*ip4)), ip4, 20 + 8);
       ip4 = (ip4_header_t *) u8_ptr_add(ip6, sizeof(*ip6) - sizeof(*ip4));
       icmp = (icmp46_header_t *) u8_ptr_add(ip4, sizeof(*ip4));
       inner_ip6 = (ip6_header_t *) u8_ptr_add(inner_ip4, sizeof(*ip4) - sizeof(*ip6));
diff --git a/vnet/vnet/map/ip6_map.c b/vnet/vnet/map/ip6_map.c
index 208f45f521c..694d249472e 100644
--- a/vnet/vnet/map/ip6_map.c
+++ b/vnet/vnet/map/ip6_map.c
@@ -453,7 +453,7 @@ ip6_map_ip6_reass_prepare(vlib_main_t *vm, vlib_node_runtime_t *node, map_ip6_re
 
     if (ip6_frag_hdr_offset(frag0)) {
       //Not first fragment, add the IPv4 header
-      memcpy(ip40, &r->ip4_header, 20);
+      clib_memcpy(ip40, &r->ip4_header, 20);
     }
 
 #ifdef MAP_IP6_REASS_COUNT_BYTES
@@ -462,7 +462,7 @@ ip6_map_ip6_reass_prepare(vlib_main_t *vm, vlib_node_runtime_t *node, map_ip6_re
 
     if (ip6_frag_hdr_more(frag0)) {
       //Not last fragment, we copy end of next
-      memcpy(u8_ptr_add(ip60, p0->current_length), r->fragments[i].next_data, 20);
+      clib_memcpy(u8_ptr_add(ip60, p0->current_length), r->fragments[i].next_data, 20);
       p0->current_length += 20;
       ip60->payload_length = u16_net_add(ip60->payload_length, 20);
     }
@@ -760,11 +760,11 @@ ip6_map_ip4_reass (vlib_main_t *vm,
         from = vlib_frame_vector_args(frame);
         u32 len = vec_len(fragments_to_loopback);
         if(len <= VLIB_FRAME_SIZE) {
-          memcpy(from, fragments_to_loopback, sizeof(u32)*len);
+          clib_memcpy(from, fragments_to_loopback, sizeof(u32)*len);
           n_left_from = len;
           vec_reset_length(fragments_to_loopback);
         } else {
-          memcpy(from, fragments_to_loopback + (len - VLIB_FRAME_SIZE), sizeof(u32)*VLIB_FRAME_SIZE);
+          clib_memcpy(from, fragments_to_loopback + (len - VLIB_FRAME_SIZE), sizeof(u32)*VLIB_FRAME_SIZE);
           n_left_from = VLIB_FRAME_SIZE;
           _vec_len(fragments_to_loopback) = len - VLIB_FRAME_SIZE;
         }
diff --git a/vnet/vnet/map/ip6_map_t.c b/vnet/vnet/map/ip6_map_t.c
index b2c102ac3e7..39e8e0abb78 100644
--- a/vnet/vnet/map/ip6_map_t.c
+++ b/vnet/vnet/map/ip6_map_t.c
@@ -337,7 +337,7 @@ _ip6_map_t_icmp (map_domain_t *d, vlib_buffer_t *p, u8 *error)
 
     //Move up icmp header
     ip4 = (ip4_header_t *) u8_ptr_add(inner_l4, - 2 * sizeof(*ip4) - 8);
-    memcpy(u8_ptr_add(inner_l4, - sizeof(*ip4) - 8), icmp, 8);
+    clib_memcpy(u8_ptr_add(inner_l4, - sizeof(*ip4) - 8), icmp, 8);
     icmp = (icmp46_header_t *) u8_ptr_add(inner_l4, - sizeof(*ip4) - 8);
   } else {
     //Only one header to translate
diff --git a/vnet/vnet/map/map.c b/vnet/vnet/map/map.c
index deeab4d1450..f91a8718aff 100644
--- a/vnet/vnet/map/map.c
+++ b/vnet/vnet/map/map.c
@@ -1420,7 +1420,7 @@ map_ip6_reass_add_fragment(map_ip6_reass_t *r, u32 pi,
     if (!prev_f)
       return -1;
 
-    memcpy(prev_f->next_data, data_start, copied_len);
+    clib_memcpy(prev_f->next_data, data_start, copied_len);
     prev_f->next_data_len = copied_len;
     prev_f->next_data_offset = data_offset;
   } else {
@@ -1428,7 +1428,7 @@ map_ip6_reass_add_fragment(map_ip6_reass_t *r, u32 pi,
       return -1;
 
     if (r->ip4_header.ip_version_and_header_length == 0)
-      memcpy(&r->ip4_header, data_start, sizeof(ip4_header_t));
+      clib_memcpy(&r->ip4_header, data_start, sizeof(ip4_header_t));
   }
 
   if(data_len > 20) {