X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fipsec%2Fipsec.c;h=e665db4a0f4b46801015fcf9c32a0ba01631c80f;hb=b4d3053445499a115f0f4debde6a8c7b29a8c071;hp=b8cfc7e6b785b16b9707c320d66d71df90c0aee4;hpb=de412ce51f6f9ca879a09e49594b907e9e99a7ed;p=vpp.git

diff --git a/src/plugins/dpdk/ipsec/ipsec.c b/src/plugins/dpdk/ipsec/ipsec.c
index b8cfc7e6b78..e665db4a0f4 100644
--- a/src/plugins/dpdk/ipsec/ipsec.c
+++ b/src/plugins/dpdk/ipsec/ipsec.c
@@ -407,7 +407,7 @@ static void __attribute__ ((unused)) clear_and_free_obj (void *obj)
 {
   struct rte_mempool *mp = rte_mempool_from_obj (obj);
 
-  memset (obj, 0, mp->elt_size);
+  clib_memset (obj, 0, mp->elt_size);
 
   rte_mempool_put (mp, obj);
 }
@@ -633,7 +633,7 @@ crypto_dev_conf (u8 dev, u16 n_qp, u8 numa)
   struct rte_cryptodev_qp_conf qp_conf;
   i32 ret;
   u16 qp;
-  i8 *error_str;
+  char *error_str;
 
   dev_conf.socket_id = numa;
   dev_conf.nb_queue_pairs = n_qp;
@@ -652,6 +652,10 @@ crypto_dev_conf (u8 dev, u16 n_qp, u8 numa)
 	return clib_error_return (0, error_str, dev, qp);
     }
 
+  error_str = "failed to start crypto device %u";
+  if (rte_cryptodev_start (dev))
+    return clib_error_return (0, error_str, dev);
+
   return 0;
 }
 
@@ -823,7 +827,7 @@ crypto_create_crypto_op_pool (vlib_main_t * vm, u8 numa)
   struct rte_crypto_op_pool_private *priv;
   struct rte_mempool *mp;
   clib_error_t *error = NULL;
-  vlib_physmem_region_index_t pri;
+  u32 map_index;
 
   data = vec_elt_at_index (dcm->data, numa);
 
@@ -833,9 +837,8 @@ crypto_create_crypto_op_pool (vlib_main_t * vm, u8 numa)
 
   pool_name = format (0, "crypto_pool_numa%u%c", numa, 0);
 
-  error =
-    dpdk_pool_create (vm, pool_name, crypto_op_len (), conf->num_mbufs,
-		      pool_priv_size, 512, numa, &mp, &pri);
+  error = dpdk_pool_create (vm, pool_name, crypto_op_len (), conf->num_mbufs,
+			    pool_priv_size, 512, numa, &mp, &map_index);
 
   vec_free (pool_name);
 
@@ -863,8 +866,8 @@ crypto_create_session_h_pool (vlib_main_t * vm, u8 numa)
   u8 *pool_name;
   struct rte_mempool *mp;
   clib_error_t *error = NULL;
-  vlib_physmem_region_index_t pri;
   u32 elt_size;
+  u32 map_index;
 
   data = vec_elt_at_index (dcm->data, numa);
 
@@ -873,11 +876,11 @@ crypto_create_session_h_pool (vlib_main_t * vm, u8 numa)
 
   pool_name = format (0, "session_h_pool_numa%u%c", numa, 0);
 
-  elt_size = rte_cryptodev_get_header_session_size ();
 
-  error =
-    dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS,
-		      0, 512, numa, &mp, &pri);
+  elt_size = rte_cryptodev_sym_get_header_session_size ();
+
+  error = dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS,
+			    0, 512, numa, &mp, &map_index);
 
   vec_free (pool_name);
 
@@ -897,9 +900,9 @@ crypto_create_session_drv_pool (vlib_main_t * vm, crypto_dev_t * dev)
   u8 *pool_name;
   struct rte_mempool *mp;
   clib_error_t *error = NULL;
-  vlib_physmem_region_index_t pri;
   u32 elt_size;
   u8 numa = dev->numa;
+  u32 map_index;
 
   data = vec_elt_at_index (dcm->data, numa);
 
@@ -912,11 +915,11 @@ crypto_create_session_drv_pool (vlib_main_t * vm, crypto_dev_t * dev)
     return NULL;
 
   pool_name = format (0, "session_drv%u_pool_numa%u%c", dev->drv_id, numa, 0);
-  elt_size = rte_cryptodev_get_private_session_size (dev->id);
 
-  error =
-    dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS,
-		      0, 512, numa, &mp, &pri);
+  elt_size = rte_cryptodev_sym_get_private_session_size (dev->id);
+
+  error = dpdk_pool_create (vm, pool_name, elt_size, DPDK_CRYPTO_NB_SESS_OBJS,
+			    0, 512, numa, &mp, &map_index);
 
   vec_free (pool_name);
 
@@ -1025,9 +1028,9 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
     {
       vec_validate_init_empty_aligned (cwm->ops, VLIB_FRAME_SIZE - 1, 0,
 				       CLIB_CACHE_LINE_BYTES);
-      memset (cwm->cipher_resource_idx, ~0,
+      clib_memset (cwm->cipher_resource_idx, ~0,
 	      IPSEC_CRYPTO_N_ALG * sizeof(*cwm->cipher_resource_idx));
-      memset (cwm->auth_resource_idx, ~0,
+      clib_memset (cwm->auth_resource_idx, ~0,
 	      IPSEC_INTEG_N_ALG * sizeof(*cwm->auth_resource_idx));
     }
   /* *INDENT-ON* */
@@ -1042,29 +1045,15 @@ dpdk_ipsec_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
       return 0;
     }
 
-  /* Add new next node and set it as default */
-  vlib_node_t *node, *next_node;
-
-  next_node = vlib_get_node_by_name (vm, (u8 *) "dpdk-esp-encrypt");
-  ASSERT (next_node);
-  node = vlib_get_node_by_name (vm, (u8 *) "ipsec-output-ip4");
-  ASSERT (node);
-  im->esp_encrypt_node_index = next_node->index;
-  im->esp_encrypt_next_index =
-    vlib_node_add_next (vm, node->index, next_node->index);
-
-  next_node = vlib_get_node_by_name (vm, (u8 *) "dpdk-esp-decrypt");
-  ASSERT (next_node);
-  node = vlib_get_node_by_name (vm, (u8 *) "ipsec-input-ip4");
-  ASSERT (node);
-  im->esp_decrypt_node_index = next_node->index;
-  im->esp_decrypt_next_index =
-    vlib_node_add_next (vm, node->index, next_node->index);
 
-  im->cb.check_support_cb = dpdk_ipsec_check_support;
-  im->cb.add_del_sa_sess_cb = add_del_sa_session;
+  ipsec_register_esp_backend (vm, im, "dpdk backend",
+			      "dpdk-esp4-encrypt",
+			      "dpdk-esp4-decrypt",
+			      "dpdk-esp6-encrypt",
+			      "dpdk-esp6-decrypt",
+			      dpdk_ipsec_check_support, add_del_sa_session);
 
-  node = vlib_get_node_by_name (vm, (u8 *) "dpdk-crypto-input");
+  vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "dpdk-crypto-input");
   ASSERT (node);
   for (i = skip_master; i < n_mains; i++)
     vlib_node_set_state (vlib_mains[i], node->index, VLIB_NODE_STATE_POLLING);