net/mlx5: add Direct Verbs translate items

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

diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index 0887c05..c63662d 100644 (file)
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -436,7 +436,8 @@ testsuite_setup(void)
         * Create mempool with maximum number of sessions * 2,
         * to include the session headers
         */
-       if (info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+       if (info.sym.max_nb_sessions != 0 &&
+                       info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
                RTE_LOG(ERR, USER1, "Device does not support "
                                "at least %u sessions\n",
                                MAX_NB_SESSIONS);
@@ -634,7 +635,7 @@ test_device_configure_invalid_queue_pair_ids(void)
 
 
        /* valid - max value queue pairs */
-       ts_params->conf.nb_queue_pairs = MAX_NUM_QPS_PER_QAT_DEVICE;
+       ts_params->conf.nb_queue_pairs = orig_nb_qps;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
@@ -666,7 +667,7 @@ test_device_configure_invalid_queue_pair_ids(void)
 
 
        /* invalid - max value + 1 queue pairs */
-       ts_params->conf.nb_queue_pairs = MAX_NUM_QPS_PER_QAT_DEVICE + 1;
+       ts_params->conf.nb_queue_pairs = orig_nb_qps + 1;
 
        TEST_ASSERT_FAIL(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
@@ -818,7 +819,7 @@ test_queue_pair_descriptor_setup(void)
        /* test invalid queue pair id */
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;      /*valid */
 
-       qp_id = DEFAULT_NUM_QPS_PER_QAT_DEVICE;         /*invalid */
+       qp_id = ts_params->conf.nb_queue_pairs;         /*invalid */
 
        TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
                        ts_params->valid_devs[0],
@@ -3159,8 +3160,11 @@ test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
        struct rte_cryptodev_info dev_info;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {
-               printf("Device doesn't support scatter-gather. "
+
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+               printf("Device doesn't support in-place scatter-gather. "
                                "Test Skipped.\n");
                return 0;
        }
@@ -3307,8 +3311,11 @@ test_kasumi_encryption_oop_sgl(const struct kasumi_test_data *tdata)
        struct rte_cryptodev_info dev_info;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {
-               printf("Device doesn't support scatter-gather. "
+
+       uint64_t feat_flags = dev_info.feature_flags;
+       if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+               printf("Device doesn't support out-of-place scatter-gather "
+                               "in both input and output mbufs. "
                                "Test Skipped.\n");
                return 0;
        }
@@ -3658,8 +3665,12 @@ test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata)
        struct rte_cryptodev_info dev_info;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {
-               printf("Device doesn't support scatter-gather. "
+
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+               printf("Device doesn't support out-of-place scatter-gather "
+                               "in both input and output mbufs. "
                                "Test Skipped.\n");
                return 0;
        }
@@ -4492,10 +4503,13 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
                return -ENOTSUP;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {
-               printf("Device doesn't support scatter-gather. "
+
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+               printf("Device doesn't support in-place scatter-gather. "
                                "Test Skipped.\n");
-               return -ENOTSUP;
+               return 0;
        }
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
@@ -5006,6 +5020,24 @@ test_DES_cipheronly_mb_all(void)
 
        return TEST_SUCCESS;
 }
+static int
+test_3DES_cipheronly_mb_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
+
+       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+               ts_params->op_mpool,
+               ts_params->session_mpool,
+               ts_params->valid_devs[0],
+               rte_cryptodev_driver_id_get(
+               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
+               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
 
 static int
 test_DES_docsis_mb_all(void)
@@ -8546,7 +8578,8 @@ test_scheduler_attach_slave_op(void)
                unsigned int session_size =
                        rte_cryptodev_sym_get_private_session_size(i);
 
-               if (info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+               if (info.sym.max_nb_sessions != 0 &&
+                               info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
                        RTE_LOG(ERR, USER1,
                                        "Device does not support "
                                        "at least %u sessions\n",
@@ -9017,6 +9050,8 @@ static struct unit_test_suite cryptodev_aesni_mb_testsuite  = {
                                                test_DES_cipheronly_mb_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
                                                test_DES_docsis_mb_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                                               test_3DES_cipheronly_mb_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_CCM_authenticated_encryption_test_case_128_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -9923,9 +9958,9 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
                        RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
 
        if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_QAT is enabled "
-                               "in config file to run this testsuite.\n");
+               RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that both "
+               "CONFIG_RTE_LIBRTE_PMD_QAT and CONFIG_RTE_LIBRTE_PMD_QAT_SYM "
+               "are enabled in config file to run this testsuite.\n");
                return TEST_SKIPPED;
        }