net/ixgbe: support committing TM hierarchy

[dpdk.git] / app / test-crypto-perf / main.c

diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index cdd3cc8..51345ea 100644 (file)
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -107,13 +107,11 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs,
        uint32_t max_sess_size = 0, sess_size;
 
        for (cdev_id = 0; cdev_id < rte_cryptodev_count(); cdev_id++) {
-               sess_size = sizeof(struct rte_cryptodev_sym_session) +
-                       rte_cryptodev_get_private_session_size(cdev_id);
+               sess_size = rte_cryptodev_get_private_session_size(cdev_id);
                if (sess_size > max_sess_size)
                        max_sess_size = sess_size;
        }
 
-
        for (i = 0; i < enabled_cdev_count &&
                        i < RTE_CRYPTO_MAX_DEVS; i++) {
                cdev_id = enabled_cdevs[i];
@@ -154,20 +152,20 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs,
                        session_pool_socket[socket_id] = sess_mp;
                }
 
-               ret = rte_cryptodev_configure(cdev_id, &conf,
-                               session_pool_socket[socket_id]);
+               ret = rte_cryptodev_configure(cdev_id, &conf);
                if (ret < 0) {
                        printf("Failed to configure cryptodev %u", cdev_id);
                        return -EINVAL;
                }
 
-               ret = rte_cryptodev_queue_pair_setup(cdev_id, 0, &qp_conf,
-                               socket_id);
-               if (ret < 0) {
-                       printf("Failed to setup queue pair %u on "
-                               "cryptodev %u", 0, cdev_id);
-                       return -EINVAL;
-               }
+               ret = rte_cryptodev_queue_pair_setup(cdev_id, 0,
+                               &qp_conf, socket_id,
+                               session_pool_socket[socket_id]);
+                       if (ret < 0) {
+                               printf("Failed to setup queue pair %u on "
+                                       "cryptodev %u", 0, cdev_id);
+                               return -EINVAL;
+                       }
 
                ret = rte_cryptodev_start(cdev_id);
                if (ret < 0) {
@@ -475,7 +473,10 @@ main(int argc, char **argv)
 
                cdev_id = enabled_cdevs[i];
 
-               ctx[cdev_id] = cperf_testmap[opts.test].constructor(cdev_id, 0,
+               uint8_t socket_id = rte_cryptodev_socket_id(cdev_id);
+
+               ctx[cdev_id] = cperf_testmap[opts.test].constructor(
+                               session_pool_socket[socket_id], cdev_id, 0,
                                &opts, t_vec, &op_fns);
                if (ctx[cdev_id] == NULL) {
                        RTE_LOG(ERR, USER1, "Test run constructor failed\n");
@@ -503,7 +504,14 @@ main(int argc, char **argv)
                                ctx[cdev_id], lcore_id);
                        i++;
                }
-               rte_eal_mp_wait_lcore();
+               i = 0;
+               RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+
+                       if (i == nb_cryptodevs)
+                               break;
+                       rte_eal_wait_lcore(lcore_id);
+                       i++;
+               }
 
                /* Get next size from range or list */
                if (opts.inc_buffer_size != 0)