dpdk-ipsec: use single queue pair per crypto resource

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

diff --git a/src/plugins/dpdk/ipsec/cli.c b/src/plugins/dpdk/ipsec/cli.c
index 2dcfe1d..b773cd2 100644 (file)
--- a/src/plugins/dpdk/ipsec/cli.c
+++ b/src/plugins/dpdk/ipsec/cli.c
@@ -25,7 +25,7 @@ format_crypto (u8 * s, va_list * args)
   crypto_drv_t *drv = vec_elt_at_index (dcm->drv, dev->drv_id);
   u64 feat, mask;
   u32 i;
-  i8 *pre = "  ";
+  char *pre = "  ";
 
   s = format (s, "%-25s%-20s%-10s\n", dev->name, drv->name,
              rte_cryptodevs[dev->id].data->dev_started ? "up" : "down");
@@ -128,7 +128,7 @@ format_crypto_worker (u8 * s, va_list * args)
   crypto_worker_main_t *cwm;
   crypto_resource_t *res;
   u16 *res_idx;
-  i8 *pre, *ind;
+  char *pre, *ind;
   u32 i;
 
   cwm = vec_elt_at_index (dcm->workers_main, thread_idx);
@@ -141,9 +141,9 @@ format_crypto_worker (u8 * s, va_list * args)
     {
       ind = "  ";
       res = vec_elt_at_index (dcm->resource, res_idx[0]);
-      s = format (s, "%s%-20s dev-id %2u inbound-queue %2u outbound-queue %2u\n",
+      s = format (s, "%s%-20s dev-id %2u queue-pair %2u\n",
                  ind, vec_elt_at_index (dcm->dev, res->dev_id)->name,
-                 res->dev_id, res->qp_id, res->qp_id + 1);
+                 res->dev_id, res->qp_id);
 
       ind = "    ";
       if (verbose)
@@ -226,12 +226,12 @@ show_dpdk_crypto_placement_v_fn (vlib_main_t * vm, unformat_input_t * input,
  * @cliexstart{show dpdk crypto placement}
  * vpp# show dpdk crypto placement
  * Thread 1 (vpp_wk_0):
- *   cryptodev_aesni_mb_p dev-id  0 inbound-queue  0 outbound-queue  1
- *   cryptodev_aesni_gcm_ dev-id  1 inbound-queue  0 outbound-queue  1
+ *   cryptodev_aesni_mb_p dev-id  0 queue-pair  0
+ *   cryptodev_aesni_gcm_ dev-id  1 queue-pair  0
  *
  * Thread 2 (vpp_wk_1):
- *   cryptodev_aesni_mb_p dev-id  0 inbound-queue  2 outbound-queue  3
- *   cryptodev_aesni_gcm_ dev-id  1 inbound-queue  2 outbound-queue  3
+ *   cryptodev_aesni_mb_p dev-id  0 queue-pair  1
+ *   cryptodev_aesni_gcm_ dev-id  1 queue-pair  1
  * @cliexend
 ?*/
 /* *INDENT-OFF* */
@@ -251,18 +251,18 @@ VLIB_CLI_COMMAND (show_dpdk_crypto_placement, static) = {
  * @cliexstart{show dpdk crypto placement verbose}
  * vpp# show dpdk crypto placement verbose
  * Thread 1 (vpp_wk_0):
- *   cryptodev_aesni_mb_p dev-id  0 inbound-queue  0 outbound-queue  1
+ *   cryptodev_aesni_mb_p dev-id  0 queue-pair  0
  *     Cipher: aes-cbc-128, aes-cbc-192, aes-cbc-256, aes-ctr-128, aes-ctr-192, aes-ctr-256
  *     Auth: md5-96, sha1-96, sha-256-128, sha-384-192, sha-512-256
- *     cryptodev_aesni_gcm_ dev-id  1 inbound-queue  0 outbound-queue  1
+ *     cryptodev_aesni_gcm_ dev-id  1 queue-pair  0
  *     Cipher: aes-gcm-128, aes-gcm-192, aes-gcm-256
  *     Auth:
  *
  * Thread 2 (vpp_wk_1):
- *   cryptodev_aesni_mb_p dev-id  0 inbound-queue  2 outbound-queue  3
+ *   cryptodev_aesni_mb_p dev-id  0 queue-pair  1
  *     Cipher: aes-cbc-128, aes-cbc-192, aes-cbc-256, aes-ctr-128, aes-ctr-192, aes-ctr-256
  *     Auth: md5-96, sha1-96, sha-256-128, sha-384-192, sha-512-256
- *     cryptodev_aesni_gcm_ dev-id  1 inbound-queue  2 outbound-queue  3
+ *     cryptodev_aesni_gcm_ dev-id  1 queue-pair  1
  *     Cipher: aes-gcm-128, aes-gcm-192, aes-gcm-256
  *     Auth:
  *
@@ -287,7 +287,7 @@ set_dpdk_crypto_placement_fn (vlib_main_t * vm,
   crypto_dev_t *dev;
   u32 thread_idx, i;
   u16 res_idx, *idx;
-  u8 dev_idx, auto_en;
+  u8 dev_idx, auto_en = 0;
 
   if (!unformat_user (input, unformat_line_input, line_input))
     return clib_error_return (0, "invalid syntax");
@@ -393,7 +393,7 @@ VLIB_CLI_COMMAND (set_dpdk_crypto_placement, static) = {
 /* *INDENT-ON* */
 
 /*
- * The thread will not enqueue more operatios to the device but will poll
+ * The thread will not enqueue more operations to the device but will poll
  * from it until there are no more inflight operations.
 */
 static void
@@ -501,7 +501,7 @@ u8 *
 format_dpdk_mempool (u8 * s, va_list * args)
 {
   struct rte_mempool *mp = va_arg (*args, struct rte_mempool *);
-  uword indent = format_get_indent (s);
+  u32 indent = format_get_indent (s);
   u32 count = rte_mempool_avail_count (mp);
 
   s = format (s, "%s\n%Uavailable %7d, allocated %7d total %7d\n",
@@ -532,7 +532,6 @@ show_dpdk_crypto_pools_fn (vlib_main_t * vm,
   {
     if (data->crypto_op)
       vlib_cli_output (vm, "%U\n", format_dpdk_mempool, data->crypto_op);
-#if ! DPDK_NO_AEAD
     if (data->session_h)
       vlib_cli_output (vm, "%U\n", format_dpdk_mempool, data->session_h);
 
@@ -540,19 +539,9 @@ show_dpdk_crypto_pools_fn (vlib_main_t * vm,
     vec_foreach (mp, data->session_drv)
       if (mp[0])
        vlib_cli_output (vm, "%U\n", format_dpdk_mempool, mp[0]);
-#endif
   }
   /* *INDENT-ON* */
 
-#if DPDK_NO_AEAD
-  crypto_dev_t *dev;
-  /* *INDENT-OFF* */
-  vec_foreach (dev, dcm->dev) if (rte_cryptodevs[dev->id].data->session_pool)
-    vlib_cli_output (vm, "%U\n", format_dpdk_mempool,
-                    rte_cryptodevs[dev->id].data->session_pool);
-  /* *INDENT-ON* */
-#endif
-
   return NULL;
 }
 
@@ -560,7 +549,7 @@ show_dpdk_crypto_pools_fn (vlib_main_t * vm,
  * This command is used to display the DPDK Crypto pools information.
  *
  * @cliexpar
- * Example of how to display the DPDK Cypto pools information:
+ * Example of how to display the DPDK Crypto pools information:
  * @cliexstart{show crypto device mapping}
  * vpp# show dpdk crypto pools
  * crypto_pool_numa1