cryptodev: add dequeue count parameter in raw API

This patch changes the experimental raw data path dequeue burst API.
Originally the API enforces the user to provide callback function
to get maximum dequeue count. This change gives the user one more
option to pass directly the expected dequeue count.

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index d68855c442d9732724145dfb1e49f52b84ef4e3c..32e64e2dd1fd2f02ac1fce95fd3f26b9302143af 100644 (file)
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -162,12 +162,6 @@ ceil_byte_length(uint32_t num_bits)
                return (num_bits >> 3);
 }
 
-static uint32_t
-get_raw_dp_dequeue_count(void *user_data __rte_unused)
-{
-       return 1;
-}
-
 static void
 post_process_raw_dp_op(void *user_data,        uint32_t index __rte_unused,
                uint8_t is_op_success)
@@ -345,7 +339,7 @@ process_sym_raw_dp_op(uint8_t dev_id, uint16_t qp_id,
        n = n_success = 0;
        while (count++ < MAX_RAW_DEQUEUE_COUNT && n == 0) {
                n = rte_cryptodev_raw_dequeue_burst(ctx,
-                       get_raw_dp_dequeue_count, post_process_raw_dp_op,
+                       NULL, 1, post_process_raw_dp_op,
                                (void **)&ret_op, 0, &n_success,
                                &dequeue_status);
                if (dequeue_status < 0) {

diff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst
index 62a51edf922ea0bd5d3a93238555fdaaeddb2c0e..c0492b61b9f889df4deb5cf4d78dbd3fb2602728 100644 (file)
--- a/doc/guides/rel_notes/release_21_05.rst
+++ b/doc/guides/rel_notes/release_21_05.rst
@@ -236,6 +236,10 @@ API Changes
 * pci: The value ``PCI_ANY_ID`` is marked as deprecated
   and can be replaced with ``RTE_PCI_ANY_ID``.
 
+* cryptodev: The experimental raw data path API for dequeue
+  ``rte_cryptodev_raw_dequeue_burst`` got a new parameter
+  ``max_nb_to_dequeue`` to provide flexible control on dequeue.
+
 
 ABI Changes
 -----------

diff --git a/drivers/crypto/qat/qat_sym_hw_dp.c b/drivers/crypto/qat/qat_sym_hw_dp.c
index 01afb883e39c99a8f13c64f75dc7b8b0e1230f83..2f64de44a1e102e1a59c6ab8713a6a07631e8129 100644 (file)
--- a/drivers/crypto/qat/qat_sym_hw_dp.c
+++ b/drivers/crypto/qat/qat_sym_hw_dp.c
@@ -707,6 +707,7 @@ qat_sym_dp_enqueue_chain_jobs(void *qp_data, uint8_t *drv_ctx,
 static __rte_always_inline uint32_t
 qat_sym_dp_dequeue_burst(void *qp_data, uint8_t *drv_ctx,
        rte_cryptodev_raw_get_dequeue_count_t get_dequeue_count,
+       uint32_t max_nb_to_dequeue,
        rte_cryptodev_raw_post_dequeue_t post_dequeue,
        void **out_user_data, uint8_t is_user_data_array,
        uint32_t *n_success_jobs, int *return_status)
@@ -736,9 +737,23 @@ qat_sym_dp_dequeue_burst(void *qp_data, uint8_t *drv_ctx,
 
        resp_opaque = (void *)(uintptr_t)resp->opaque_data;
        /* get the dequeue count */
-       n = get_dequeue_count(resp_opaque);
-       if (unlikely(n == 0))
-               return 0;
+       if (get_dequeue_count) {
+               n = get_dequeue_count(resp_opaque);
+               if (unlikely(n == 0))
+                       return 0;
+               else if (n > 1) {
+                       head = (head + rx_queue->msg_size * (n - 1)) &
+                               rx_queue->modulo_mask;
+                       resp = (struct icp_qat_fw_comn_resp *)(
+                               (uint8_t *)rx_queue->base_addr + head);
+                       if (*(uint32_t *)resp == ADF_RING_EMPTY_SIG)
+                               return 0;
+               }
+       } else {
+               if (unlikely(max_nb_to_dequeue == 0))
+                       return 0;
+               n = max_nb_to_dequeue;
+       }
 
        out_user_data[0] = resp_opaque;
        status = QAT_SYM_DP_IS_RESP_SUCCESS(resp);

diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c
index e02e001325d875b651facb35f6b71e93e3e099ae..25d86a1081208efe753888d9cc82f1f1a4ce7cb6 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -2234,13 +2234,14 @@ rte_cryptodev_raw_enqueue_done(struct rte_crypto_raw_dp_ctx *ctx,
 uint32_t
 rte_cryptodev_raw_dequeue_burst(struct rte_crypto_raw_dp_ctx *ctx,
        rte_cryptodev_raw_get_dequeue_count_t get_dequeue_count,
+       uint32_t max_nb_to_dequeue,
        rte_cryptodev_raw_post_dequeue_t post_dequeue,
        void **out_user_data, uint8_t is_user_data_array,
        uint32_t *n_success_jobs, int *status)
 {
        return (*ctx->dequeue_burst)(ctx->qp_data, ctx->drv_ctx_data,
-               get_dequeue_count, post_dequeue, out_user_data,
-               is_user_data_array, n_success_jobs, status);
+               get_dequeue_count, max_nb_to_dequeue, post_dequeue,
+               out_user_data, is_user_data_array, n_success_jobs, status);
 }
 
 int

diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h
index 7e80f4be266951b50188a926c203118087ce4fc4..307f0fa8632a6385369b30167b087310badefef4 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -1562,6 +1562,9 @@ typedef void (*rte_cryptodev_raw_post_dequeue_t)(void *user_data,
  * @param      drv_ctx                 Driver specific context data.
  * @param      get_dequeue_count       User provided callback function to
  *                                     obtain dequeue operation count.
+ * @param      max_nb_to_dequeue       When get_dequeue_count is NULL this
+ *                                     value is used to pass the maximum
+ *                                     number of operations to be dequeued.
  * @param      post_dequeue            User provided callback function to
  *                                     post-process a dequeued operation.
  * @param      out_user_data           User data pointer array to be retrieve
@@ -1596,6 +1599,7 @@ typedef void (*rte_cryptodev_raw_post_dequeue_t)(void *user_data,
 typedef uint32_t (*cryptodev_sym_raw_dequeue_burst_t)(void *qp,
        uint8_t *drv_ctx,
        rte_cryptodev_raw_get_dequeue_count_t get_dequeue_count,
+       uint32_t max_nb_to_dequeue,
        rte_cryptodev_raw_post_dequeue_t post_dequeue,
        void **out_user_data, uint8_t is_user_data_array,
        uint32_t *n_success, int *dequeue_status);
@@ -1763,6 +1767,9 @@ rte_cryptodev_raw_enqueue_done(struct rte_crypto_raw_dp_ctx *ctx,
  *                                     data.
  * @param      get_dequeue_count       User provided callback function to
  *                                     obtain dequeue operation count.
+ * @param      max_nb_to_dequeue       When get_dequeue_count is NULL this
+ *                                     value is used to pass the maximum
+ *                                     number of operations to be dequeued.
  * @param      post_dequeue            User provided callback function to
  *                                     post-process a dequeued operation.
  * @param      out_user_data           User data pointer array to be retrieve
@@ -1798,6 +1805,7 @@ __rte_experimental
 uint32_t
 rte_cryptodev_raw_dequeue_burst(struct rte_crypto_raw_dp_ctx *ctx,
        rte_cryptodev_raw_get_dequeue_count_t get_dequeue_count,
+       uint32_t max_nb_to_dequeue,
        rte_cryptodev_raw_post_dequeue_t post_dequeue,
        void **out_user_data, uint8_t is_user_data_array,
        uint32_t *n_success, int *dequeue_status);