cryptodev: change queue pair configure structure

[dpdk.git] / test / test / test_event_crypto_adapter.c

diff --git a/test/test/test_event_crypto_adapter.c b/test/test/test_event_crypto_adapter.c
index 17eae5d..5471787 100644 (file)
--- a/test/test/test_event_crypto_adapter.c
+++ b/test/test/test_event_crypto_adapter.c
@@ -21,6 +21,7 @@
 #define MBUF_CACHE_SIZE           (256)
 #define MAXIMUM_IV_LENGTH         (16)
 #define DEFAULT_NUM_OPS_INFLIGHT  (128)
+#define MAX_NB_SESSIONS            4
 #define TEST_APP_PORT_ID           0
 #define TEST_APP_EV_QUEUE_ID       0
 #define TEST_APP_EV_PRIORITY       0
@@ -204,12 +205,12 @@ test_op_forward_mode(uint8_t session_less)
                TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
                if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA) {
-                       /* Fill in private date information */
+                       /* Fill in private user data information */
                        rte_memcpy(&m_data.response_info, &response_info,
                                sizeof(response_info));
                        rte_memcpy(&m_data.request_info, &request_info,
                                sizeof(request_info));
-                       rte_cryptodev_sym_session_set_private_data(sess,
+                       rte_cryptodev_sym_session_set_user_data(sess,
                                                &m_data, sizeof(m_data));
                }
 
@@ -388,10 +389,10 @@ test_op_new_mode(uint8_t session_less)
                TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
                if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA) {
-                       /* Fill in private data information */
+                       /* Fill in private user data information */
                        rte_memcpy(&m_data.response_info, &response_info,
                                   sizeof(m_data));
-                       rte_cryptodev_sym_session_set_private_data(sess,
+                       rte_cryptodev_sym_session_set_user_data(sess,
                                                &m_data, sizeof(m_data));
                }
                rte_cryptodev_sym_session_init(TEST_CDEV_ID, sess,
@@ -522,12 +523,12 @@ configure_cryptodev(void)
         * Create mempool with maximum number of sessions * 2,
         * to include the session headers & private data
         */
-       session_size = rte_cryptodev_get_private_session_size(TEST_CDEV_ID);
+       session_size = rte_cryptodev_sym_get_private_session_size(TEST_CDEV_ID);
        session_size += sizeof(union rte_event_crypto_metadata);
 
        params.session_mpool = rte_mempool_create(
                                "CRYPTO_ADAPTER_SESSION_MP",
-                               info.sym.max_nb_sessions * 2,
+                               MAX_NB_SESSIONS * 2,
                                session_size,
                                0, 0, NULL, NULL, NULL,
                                NULL, SOCKET_ID_ANY,
@@ -545,11 +546,12 @@ configure_cryptodev(void)
                        TEST_CDEV_ID, conf.nb_queue_pairs);
 
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;
+       qp_conf.mp_session = params.session_mpool;
+       qp_conf.mp_session_private = params.session_mpool;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
                        TEST_CDEV_ID, TEST_CDEV_QP_ID, &qp_conf,
-                       rte_cryptodev_socket_id(TEST_CDEV_ID),
-                       params.session_mpool),
+                       rte_cryptodev_socket_id(TEST_CDEV_ID)),
                        "Failed to setup queue pair %u on cryptodev %u\n",
                        TEST_CDEV_QP_ID, TEST_CDEV_ID);