net/mlx5: fix VLAN push action validation

[dpdk.git] / examples / fips_validation / main.c

diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index c175fe6..e06ae37 100644 (file)
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -7,7 +7,7 @@
 #include <dirent.h>
 
 #include <rte_cryptodev.h>
-#include <rte_cryptodev_pmd.h>
+#include <rte_malloc.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_string_fns.h>
@@ -73,10 +73,7 @@ cryptodev_fips_validate_app_int(void)
        if (env.self_test) {
                ret = fips_dev_self_test(env.dev_id, env.broken_test_config);
                if (ret < 0) {
-                       struct rte_cryptodev *cryptodev =
-                                       rte_cryptodev_pmd_get_dev(env.dev_id);
-
-                       rte_cryptodev_pmd_destroy(cryptodev);
+                       rte_cryptodev_close(env.dev_id);
 
                        return ret;
                }
@@ -137,17 +134,18 @@ cryptodev_fips_validate_app_int(void)
        if (ret < 0)
                goto error_exit;
 
+       ret = rte_cryptodev_start(env.dev_id);
+       if (ret < 0)
+               goto error_exit;
+
        return 0;
 
 error_exit:
 
        rte_mempool_free(env.mpool);
-       if (env.sess_mpool)
-               rte_mempool_free(env.sess_mpool);
-       if (env.sess_priv_mpool)
-               rte_mempool_free(env.sess_priv_mpool);
-       if (env.op_pool)
-               rte_mempool_free(env.op_pool);
+       rte_mempool_free(env.sess_mpool);
+       rte_mempool_free(env.sess_priv_mpool);
+       rte_mempool_free(env.op_pool);
 
        return ret;
 }
@@ -196,7 +194,7 @@ parse_cryptodev_id_arg(char *arg)
        }
 
 
-       if (!rte_cryptodev_pmd_is_valid_dev(cryptodev_id)) {
+       if (!rte_cryptodev_is_valid_dev(cryptodev_id)) {
                RTE_LOG(ERR, USER1, "Error %i: invalid cryptodev id %s\n",
                                cryptodev_id, arg);
                return -1;
@@ -522,8 +520,7 @@ prepare_data_mbufs(struct fips_val *val)
        uint16_t nb_seg;
        int ret = 0;
 
-       if (env.mbuf)
-               rte_pktmbuf_free(env.mbuf);
+       rte_pktmbuf_free(env.mbuf);
 
        if (total_len > RTE_MBUF_MAX_NB_SEGS) {
                RTE_LOG(ERR, USER1, "Data len %u too big\n", total_len);
@@ -597,8 +594,7 @@ prepare_data_mbufs(struct fips_val *val)
        return 0;
 
 error_exit:
-       if (head)
-               rte_pktmbuf_free(head);
+       rte_pktmbuf_free(head);
        return ret;
 }
 
@@ -655,8 +651,7 @@ prepare_auth_op(void)
        if (ret < 0)
                return ret;
 
-       if (env.digest)
-               rte_free(env.digest);
+       rte_free(env.digest);
 
        env.digest = rte_zmalloc(NULL, vec.cipher_auth.digest.len,
                        RTE_CACHE_LINE_SIZE);
@@ -704,8 +699,7 @@ prepare_aead_op(void)
                if (ret < 0)
                        return ret;
 
-               if (env.digest)
-                       rte_free(env.digest);
+               rte_free(env.digest);
                env.digest = rte_zmalloc(NULL, vec.aead.digest.len,
                                RTE_CACHE_LINE_SIZE);
                if (!env.digest) {
@@ -1429,8 +1423,7 @@ fips_mct_tdes_test(void)
                }
        }
 
-       if (val.val)
-               free(val.val);
+       free(val.val);
 
        return 0;
 }
@@ -1509,8 +1502,7 @@ fips_mct_aes_ecb_test(void)
                }
        }
 
-       if (val.val)
-               free(val.val);
+       free(val.val);
 
        return 0;
 }
@@ -1618,8 +1610,7 @@ fips_mct_aes_test(void)
                        memcpy(vec.iv.val, val.val, AES_BLOCK_SIZE);
        }
 
-       if (val.val)
-               free(val.val);
+       free(val.val);
 
        return 0;
 }
@@ -1635,7 +1626,6 @@ fips_mct_sha_test(void)
        int ret;
        uint32_t i, j;
 
-       val.val = rte_malloc(NULL, (MAX_DIGEST_SIZE*SHA_MD_BLOCK), 0);
        for (i = 0; i < SHA_MD_BLOCK; i++)
                md[i].val = rte_malloc(NULL, (MAX_DIGEST_SIZE*2), 0);
 
@@ -1706,8 +1696,7 @@ fips_mct_sha_test(void)
 
        rte_free(vec.pt.val);
 
-       if (val.val)
-               free(val.val);
+       free(val.val);
 
        return 0;
 }
@@ -1847,10 +1836,11 @@ error_one_case:
 
        fips_test_clear();
 
-       if (env.digest)
+       if (env.digest) {
                rte_free(env.digest);
-       if (env.mbuf)
-               rte_pktmbuf_free(env.mbuf);
+               env.digest = NULL;
+       }
+       rte_pktmbuf_free(env.mbuf);
 
        return ret;
 }