test/security: check session stats

[dpdk.git] / app / test / test_cryptodev_blockcipher.c

diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c
index 885a20e..4973c74 100644 (file)
--- a/app/test/test_cryptodev_blockcipher.c
+++ b/app/test/test_cryptodev_blockcipher.c
@@ -77,6 +77,8 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,
                        RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
        int octeontx_pmd = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD));
+       int octeontx2_pmd = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
        int null_pmd = rte_cryptodev_driver_id_get(
                                RTE_STR(CRYPTODEV_NAME_NULL_PMD));
        int nitrox_pmd = rte_cryptodev_driver_id_get(
@@ -91,7 +93,7 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,
                uint64_t feat_flags = dev_info.feature_flags;
                uint64_t oop_flag = RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT;
 
-               if (t->feature_mask && BLOCKCIPHER_TEST_FEATURE_OOP) {
+               if (t->feature_mask & BLOCKCIPHER_TEST_FEATURE_OOP) {
                        if (!(feat_flags & oop_flag)) {
                                printf("Device doesn't support out-of-place "
                                        "scatter-gather in input mbuf. "
@@ -127,6 +129,7 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,
                        driver_id == ccp_pmd ||
                        driver_id == virtio_pmd ||
                        driver_id == octeontx_pmd ||
+                       driver_id == octeontx2_pmd ||
                        driver_id == null_pmd ||
                        driver_id == nitrox_pmd) { /* Fall through */
                digest_len = tdata->digest.len;
@@ -718,6 +721,8 @@ test_blockcipher_all_tests(struct rte_mempool *mbuf_pool,
                        RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
        int octeontx_pmd = rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD));
+       int octeontx2_pmd = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
        int null_pmd = rte_cryptodev_driver_id_get(
                                RTE_STR(CRYPTODEV_NAME_NULL_PMD));
        int nitrox_pmd = rte_cryptodev_driver_id_get(
@@ -792,12 +797,14 @@ test_blockcipher_all_tests(struct rte_mempool *mbuf_pool,
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_VIRTIO;
        else if (driver_id == octeontx_pmd)
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX;
+       else if (driver_id == octeontx2_pmd)
+               target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2;
        else if (driver_id == null_pmd)
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_NULL;
        else if (driver_id == nitrox_pmd)
                target_pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_NITROX;
        else
-               TEST_ASSERT(0, "Unrecognized cryptodev type");
+               return -ENOTSUP; /* Unrecognized cryptodev type */
 
        for (i = 0; i < n_test_cases; i++) {
                const struct blockcipher_test_case *tc = &tcs[i];