test: improve filtering

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

diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c
index 389f796..a6044b2 100644 (file)
--- a/test/test/test_cryptodev.c
+++ b/test/test/test_cryptodev.c
@@ -39,6 +39,7 @@
 #include "test_cryptodev_hmac_test_vectors.h"
 
 #define VDEV_ARGS_SIZE 100
+#define MAX_NB_SESSIONS            4
 
 static int gbl_driver_id;
 
@@ -435,9 +436,17 @@ testsuite_setup(void)
         * Create mempool with maximum number of sessions * 2,
         * to include the session headers
         */
+       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);
+               return TEST_FAILED;
+       }
+
        ts_params->session_mpool = rte_mempool_create(
                                "test_sess_mp",
-                               info.sym.max_nb_sessions * 2,
+                               MAX_NB_SESSIONS * 2,
                                session_size,
                                0, 0, NULL, NULL, NULL,
                                NULL, SOCKET_ID_ANY,
@@ -585,7 +594,7 @@ test_device_configure_invalid_dev_id(void)
        dev_id = ts_params->valid_devs[ts_params->valid_dev_count - 1];
 
        /* Stop the device in case it's started so it can be configured */
-       rte_cryptodev_stop(ts_params->valid_devs[dev_id]);
+       rte_cryptodev_stop(dev_id);
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(dev_id, &ts_params->conf),
                        "Failed test for rte_cryptodev_configure: "
@@ -3151,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;
        }
@@ -3299,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;
        }
@@ -3650,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;
        }
@@ -4484,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);
@@ -4998,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)
@@ -6499,10 +6539,10 @@ test_multi_session(void)
 
        sessions = rte_malloc(NULL,
                        (sizeof(struct rte_cryptodev_sym_session *) *
-                       dev_info.sym.max_nb_sessions) + 1, 0);
+                       MAX_NB_SESSIONS) + 1, 0);
 
        /* Create multiple crypto sessions*/
-       for (i = 0; i < dev_info.sym.max_nb_sessions; i++) {
+       for (i = 0; i < MAX_NB_SESSIONS; i++) {
 
                sessions[i] = rte_cryptodev_sym_session_create(
                                ts_params->session_mpool);
@@ -6551,7 +6591,7 @@ test_multi_session(void)
        TEST_ASSERT_NULL(sessions[i],
                        "Session creation succeeded unexpectedly!");
 
-       for (i = 0; i < dev_info.sym.max_nb_sessions; i++) {
+       for (i = 0; i < MAX_NB_SESSIONS; i++) {
                rte_cryptodev_sym_session_clear(ts_params->valid_devs[0],
                                sessions[i]);
                rte_cryptodev_sym_session_free(sessions[i]);
@@ -6610,7 +6650,7 @@ test_multi_session_random_usage(void)
 
        sessions = rte_malloc(NULL,
                        (sizeof(struct rte_cryptodev_sym_session *)
-                                       * dev_info.sym.max_nb_sessions) + 1, 0);
+                                       * MAX_NB_SESSIONS) + 1, 0);
 
        for (i = 0; i < MB_SESSION_NUMBER; i++) {
                sessions[i] = rte_cryptodev_sym_session_create(
@@ -8538,6 +8578,14 @@ test_scheduler_attach_slave_op(void)
                unsigned int session_size =
                        rte_cryptodev_sym_get_private_session_size(i);
 
+               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);
+                       return TEST_FAILED;
+               }
                /*
                 * Create mempool with maximum number of sessions * 2,
                 * to include the session headers
@@ -8545,7 +8593,7 @@ test_scheduler_attach_slave_op(void)
                if (ts_params->session_mpool == NULL) {
                        ts_params->session_mpool = rte_mempool_create(
                                        "test_sess_mp",
-                                       info.sym.max_nb_sessions * 2,
+                                       MAX_NB_SESSIONS * 2,
                                        session_size,
                                        0, 0, NULL, NULL, NULL,
                                        NULL, SOCKET_ID_ANY,
@@ -9002,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,
@@ -9908,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;
        }