Remove c-11 memcpy checks from perf-critical code

[vpp.git] / src / plugins / dpdk / ipsec / esp_decrypt.c

diff --git a/src/plugins/dpdk/ipsec/esp_decrypt.c b/src/plugins/dpdk/ipsec/esp_decrypt.c
index bc40b4b..f0fa506 100644 (file)
--- a/src/plugins/dpdk/ipsec/esp_decrypt.c
+++ b/src/plugins/dpdk/ipsec/esp_decrypt.c
@@ -245,7 +245,10 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm,
                }
            }
 
-         priv->next = DPDK_CRYPTO_INPUT_NEXT_DECRYPT_POST;
+         if(is_ip6)
+           priv->next = DPDK_CRYPTO_INPUT_NEXT_DECRYPT6_POST;
+         else
+           priv->next = DPDK_CRYPTO_INPUT_NEXT_DECRYPT4_POST;
 
          /* FIXME multi-seg */
          sa0->total_data_size += b0->current_length;
@@ -301,7 +304,7 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm,
            mb0->buf_physaddr + digest - ((u8 *) mb0->buf_addr);
 
          if (!is_aead && cipher_alg->alg == RTE_CRYPTO_CIPHER_AES_CBC)
-           clib_memcpy(icb, iv, 16);
+              clib_memcpy_fast(icb, iv, 16);
          else /* CTR/GCM */
            {
              u32 *_iv = (u32 *) iv;
@@ -313,7 +316,7 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm,
             {
               aad = priv->aad;
              u32 * _aad = (u32 *) aad;
-              clib_memcpy (aad, esp0, 8);
+              clib_memcpy_fast (aad, esp0, 8);
 
              /* _aad[3] should always be 0 */
               if (PREDICT_FALSE (sa0->use_esn))
@@ -327,7 +330,7 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm,
 
               if (sa0->use_esn)
                 {
-                  clib_memcpy (priv->icv, digest, trunc_size);
+                  clib_memcpy_fast (priv->icv, digest, trunc_size);
                  u32 *_digest = (u32 *) digest;
                   _digest[0] = clib_host_to_net_u32 (sa0->seq_hi);
                  auth_len += sizeof(sa0->seq_hi);
@@ -346,7 +349,7 @@ trace:
              esp_decrypt_trace_t *tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
              tr->crypto_alg = sa0->crypto_alg;
              tr->integ_alg = sa0->integ_alg;
-             clib_memcpy (tr->packet_data, vlib_buffer_get_current (b0),
+             clib_memcpy_fast (tr->packet_data, vlib_buffer_get_current (b0),
                           sizeof (esp_header_t));
            }
        }
@@ -376,8 +379,7 @@ trace:
   return from_frame->n_vectors;
 }
 
-static uword
-dpdk_esp4_decrypt_node_fn (vlib_main_t * vm,
+VLIB_NODE_FN(dpdk_esp4_decrypt_node) (vlib_main_t * vm,
             vlib_node_runtime_t * node,
             vlib_frame_t * from_frame)
 {
@@ -386,8 +388,7 @@ dpdk_esp4_decrypt_node_fn (vlib_main_t * vm,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (dpdk_esp4_decrypt_node) = {
-  .function = dpdk_esp4_decrypt_node_fn,
-  .name = "dpdk4-esp-decrypt",
+  .name = "dpdk-esp4-decrypt",
   .vector_size = sizeof (u32),
   .format_trace = format_esp_decrypt_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
@@ -404,7 +405,31 @@ VLIB_REGISTER_NODE (dpdk_esp4_decrypt_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp4_decrypt_node, dpdk_esp4_decrypt_node_fn);
+VLIB_NODE_FN(dpdk_esp6_decrypt_node) (vlib_main_t * vm,
+            vlib_node_runtime_t * node,
+            vlib_frame_t * from_frame)
+{
+  return dpdk_esp_decrypt_inline(vm, node, from_frame, 1 /*is_ip6*/);
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (dpdk_esp6_decrypt_node) = {
+  .name = "dpdk-esp6-decrypt",
+  .vector_size = sizeof (u32),
+  .format_trace = format_esp_decrypt_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = ARRAY_LEN(esp_decrypt_error_strings),
+  .error_strings = esp_decrypt_error_strings,
+
+  .n_next_nodes = ESP_DECRYPT_N_NEXT,
+  .next_nodes = {
+#define _(s,n) [ESP_DECRYPT_NEXT_##s] = n,
+    foreach_esp_decrypt_next
+#undef _
+  },
+};
+/* *INDENT-ON* */
 
 /*
  * Decrypt Post Node
@@ -622,7 +647,7 @@ dpdk_esp_decrypt_post_inline (vlib_main_t * vm,
              tr->crypto_alg = sa0->crypto_alg;
              tr->integ_alg = sa0->integ_alg;
              ih4 = vlib_buffer_get_current (b0);
-             clib_memcpy (tr->packet_data, ih4, sizeof (ip6_header_t));
+             clib_memcpy_fast (tr->packet_data, ih4, sizeof (ip6_header_t));
            }
 
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
@@ -643,16 +668,14 @@ dpdk_esp_decrypt_post_inline (vlib_main_t * vm,
   return from_frame->n_vectors;
 }
 
-static uword
-dpdk_esp4_decrypt_post_node_fn (vlib_main_t * vm,
+VLIB_NODE_FN(dpdk_esp4_decrypt_post_node) (vlib_main_t * vm,
             vlib_node_runtime_t * node,
             vlib_frame_t * from_frame)
 {return dpdk_esp_decrypt_post_inline(vm, node, from_frame, 0/*is_ip6*/);}
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (dpdk_esp4_decrypt_post_node) = {
-  .function = dpdk_esp4_decrypt_post_node_fn,
-  .name = "dpdk4-esp-decrypt-post",
+  .name = "dpdk-esp4-decrypt-post",
   .vector_size = sizeof (u32),
   .format_trace = format_esp_decrypt_post_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
@@ -669,18 +692,14 @@ VLIB_REGISTER_NODE (dpdk_esp4_decrypt_post_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp4_decrypt_post_node, dpdk_esp4_decrypt_post_node_fn);
-
-static uword
-dpdk_esp6_decrypt_post_node_fn (vlib_main_t * vm,
+VLIB_NODE_FN(dpdk_esp6_decrypt_post_node) (vlib_main_t * vm,
             vlib_node_runtime_t * node,
             vlib_frame_t * from_frame)
 {return dpdk_esp_decrypt_post_inline(vm, node, from_frame, 0/*is_ip6*/);}
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (dpdk_esp6_decrypt_post_node) = {
-  .function = dpdk_esp6_decrypt_post_node_fn,
-  .name = "dpdk6-esp-decrypt-post",
+  .name = "dpdk-esp6-decrypt-post",
   .vector_size = sizeof (u32),
   .format_trace = format_esp_decrypt_post_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
@@ -696,5 +715,3 @@ VLIB_REGISTER_NODE (dpdk_esp6_decrypt_post_node) = {
   },
 };
 /* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp6_decrypt_post_node, dpdk_esp6_decrypt_post_node_fn);