dpdk-cryptodev: improve cryptodev cache ring implementation

[vpp.git] / src / plugins / dpdk / cryptodev / cryptodev.c

diff --git a/src/plugins/dpdk/cryptodev/cryptodev.c b/src/plugins/dpdk/cryptodev/cryptodev.c
index 84a307d..c66e9ed 100644 (file)
--- a/src/plugins/dpdk/cryptodev/cryptodev.c
+++ b/src/plugins/dpdk/cryptodev/cryptodev.c
@@ -579,14 +579,14 @@ cryptodev_assign_resource (cryptodev_engine_thread_t * cet,
        return -EBUSY;
 
       vec_foreach_index (idx, cmt->cryptodev_inst)
-      {
-       cinst = cmt->cryptodev_inst + idx;
-       if (cinst->dev_id == cet->cryptodev_id &&
-           cinst->q_id == cet->cryptodev_q)
-         break;
-      }
+       {
+         cinst = cmt->cryptodev_inst + idx;
+         if (cinst->dev_id == cet->cryptodev_id &&
+             cinst->q_id == cet->cryptodev_q)
+           break;
+       }
       /* invalid existing worker resource assignment */
-      if (idx == vec_len (cmt->cryptodev_inst))
+      if (idx >= vec_len (cmt->cryptodev_inst))
        return -EINVAL;
       clib_spinlock_lock (&cmt->tlock);
       clib_bitmap_set_no_check (cmt->active_cdev_inst_mask, idx, 0);
@@ -666,6 +666,69 @@ VLIB_CLI_COMMAND (show_cryptodev_assignment, static) = {
     .function = cryptodev_show_assignment_fn,
 };
 
+static clib_error_t *
+cryptodev_show_cache_rings_fn (vlib_main_t *vm, unformat_input_t *input,
+                              vlib_cli_command_t *cmd)
+{
+  cryptodev_main_t *cmt = &cryptodev_main;
+  u32 thread_index = 0;
+  vec_foreach_index (thread_index, cmt->per_thread_data)
+    {
+      cryptodev_engine_thread_t *cet = cmt->per_thread_data + thread_index;
+      cryptodev_cache_ring_t *ring = &cet->cache_ring;
+      u16 head = ring->head;
+      u16 tail = ring->tail;
+      u16 n_cached = ((head == tail) && (ring->frames[head].f == 0)) ?
+                            0 :
+                    ((head == tail) && (ring->frames[head].f != 0)) ?
+                            (CRYPTODEV_CACHE_QUEUE_MASK + 1) :
+                    (head > tail) ?
+                            (head - tail) :
+                            (CRYPTODEV_CACHE_QUEUE_MASK - tail + head);
+
+      u16 enq_head = ring->enq_head;
+      u16 deq_tail = ring->deq_tail;
+      u16 n_frames_inflight =
+       ((enq_head == deq_tail) && (ring->frames[enq_head].f == 0)) ?
+               0 :
+       ((enq_head == deq_tail) && (ring->frames[enq_head].f != 0)) ?
+               CRYPTODEV_CACHE_QUEUE_MASK + 1 :
+       (enq_head > deq_tail) ?
+               (enq_head - deq_tail) :
+               (CRYPTODEV_CACHE_QUEUE_MASK - deq_tail + enq_head);
+
+      u16 n_frames_processed =
+       ((tail == deq_tail) && (ring->frames[deq_tail].f == 0)) ?
+               0 :
+       ((tail == deq_tail) && (ring->frames[deq_tail].f != 0)) ?
+                                 (CRYPTODEV_CACHE_QUEUE_MASK + 1) :
+       (deq_tail > tail) ? (deq_tail - tail) :
+                                 (CRYPTODEV_CACHE_QUEUE_MASK - tail + deq_tail);
+
+      if (vlib_num_workers () > 0 && thread_index == 0)
+       continue;
+      vlib_cli_output (vm, "\n\n");
+      vlib_cli_output (vm, "Frames total: %d", n_cached);
+      vlib_cli_output (vm, "Frames pending in the ring: %d",
+                      n_cached - n_frames_inflight - n_frames_processed);
+      vlib_cli_output (vm, "Frames enqueued but not dequeued: %d",
+                      n_frames_inflight);
+      vlib_cli_output (vm, "Frames dequed but not returned: %d",
+                      n_frames_processed);
+      vlib_cli_output (vm, "inflight: %d", cet->inflight);
+      vlib_cli_output (vm, "Head: %d", ring->head);
+      vlib_cli_output (vm, "Tail: %d", ring->tail);
+      vlib_cli_output (vm, "\n\n");
+    }
+  return 0;
+}
+
+VLIB_CLI_COMMAND (show_cryptodev_sw_rings, static) = {
+  .path = "show cryptodev cache status",
+  .short_help = "show status of all cryptodev cache rings",
+  .function = cryptodev_show_cache_rings_fn,
+};
+
 static clib_error_t *
 cryptodev_set_assignment_fn (vlib_main_t * vm, unformat_input_t * input,
                             vlib_cli_command_t * cmd)
@@ -1235,7 +1298,7 @@ dpdk_cryptodev_init (vlib_main_t * vm)
   vec_free (unique_drivers);
 #endif
 
-  clib_bitmap_vec_validate (cmt->active_cdev_inst_mask, tm->n_vlib_mains);
+  clib_bitmap_vec_validate (cmt->active_cdev_inst_mask, n_workers);
   clib_spinlock_init (&cmt->tlock);
 
   vec_validate_aligned(cmt->per_thread_data, tm->n_vlib_mains - 1,