examples: remove extra new line after link duplex

[dpdk.git] / examples / ipsec-secgw / ipsec-secgw.c

diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index af6e3de..f777ce2 100644 (file)
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -62,7 +62,6 @@ volatile bool force_quit;
 
 #define CDEV_QUEUE_DESC 2048
 #define CDEV_MAP_ENTRIES 16384
-#define CDEV_MP_NB_OBJS 1024
 #define CDEV_MP_CACHE_SZ 64
 #define MAX_QUEUE_PAIRS 1
 
@@ -1183,6 +1182,28 @@ ipsec_poll_mode_worker(void)
        }
 }
 
+int
+check_flow_params(uint16_t fdir_portid, uint8_t fdir_qid)
+{
+       uint16_t i;
+       uint16_t portid;
+       uint8_t queueid;
+
+       for (i = 0; i < nb_lcore_params; ++i) {
+               portid = lcore_params_array[i].port_id;
+               if (portid == fdir_portid) {
+                       queueid = lcore_params_array[i].queue_id;
+                       if (queueid == fdir_qid)
+                               break;
+               }
+
+               if (i == nb_lcore_params - 1)
+                       return -1;
+       }
+
+       return 1;
+}
+
 static int32_t
 check_poll_mode_params(struct eh_conf *eh_conf)
 {
@@ -1778,7 +1799,7 @@ check_all_ports_link_status(uint32_t port_mask)
                                        "Port%d Link Up - speed %u Mbps -%s\n",
                                                portid, link.link_speed,
                                (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-                                       ("full-duplex") : ("half-duplex\n"));
+                                       ("full-duplex") : ("half-duplex"));
                                else
                                        printf("Port %d Link Down\n", portid);
                                continue;
@@ -1930,7 +1951,7 @@ check_cryptodev_mask(uint8_t cdev_id)
 }
 
 static uint16_t
-cryptodevs_init(void)
+cryptodevs_init(uint16_t req_queue_num)
 {
        struct rte_cryptodev_config dev_conf;
        struct rte_cryptodev_qp_conf qp_conf;
@@ -1993,6 +2014,7 @@ cryptodevs_init(void)
                        i++;
                }
 
+               qp = RTE_MIN(max_nb_qps, RTE_MAX(req_queue_num, qp));
                if (qp == 0)
                        continue;
 
@@ -2002,10 +2024,11 @@ cryptodevs_init(void)
                dev_conf.ff_disable = RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO;
 
                uint32_t dev_max_sess = cdev_info.sym.max_nb_sessions;
-               if (dev_max_sess != 0 && dev_max_sess < CDEV_MP_NB_OBJS)
+               if (dev_max_sess != 0 &&
+                               dev_max_sess < get_nb_crypto_sessions())
                        rte_exit(EXIT_FAILURE,
                                "Device does not support at least %u "
-                               "sessions", CDEV_MP_NB_OBJS);
+                               "sessions", get_nb_crypto_sessions());
 
                if (rte_cryptodev_configure(cdev_id, &dev_conf))
                        rte_panic("Failed to initialize cryptodev %u\n",
@@ -2257,12 +2280,18 @@ session_pool_init(struct socket_ctx *ctx, int32_t socket_id, size_t sess_sz)
 {
        char mp_name[RTE_MEMPOOL_NAMESIZE];
        struct rte_mempool *sess_mp;
+       uint32_t nb_sess;
 
        snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
                        "sess_mp_%u", socket_id);
+       /*
+        * Doubled due to rte_security_session_create() uses one mempool for
+        * session and for session private data.
+        */
+       nb_sess = (get_nb_crypto_sessions() + CDEV_MP_CACHE_SZ *
+               rte_lcore_count()) * 2;
        sess_mp = rte_cryptodev_sym_session_pool_create(
-                       mp_name, CDEV_MP_NB_OBJS,
-                       sess_sz, CDEV_MP_CACHE_SZ, 0,
+                       mp_name, nb_sess, sess_sz, CDEV_MP_CACHE_SZ, 0,
                        socket_id);
        ctx->session_pool = sess_mp;
 
@@ -2279,11 +2308,18 @@ session_priv_pool_init(struct socket_ctx *ctx, int32_t socket_id,
 {
        char mp_name[RTE_MEMPOOL_NAMESIZE];
        struct rte_mempool *sess_mp;
+       uint32_t nb_sess;
 
        snprintf(mp_name, RTE_MEMPOOL_NAMESIZE,
                        "sess_mp_priv_%u", socket_id);
+       /*
+        * Doubled due to rte_security_session_create() uses one mempool for
+        * session and for session private data.
+        */
+       nb_sess = (get_nb_crypto_sessions() + CDEV_MP_CACHE_SZ *
+               rte_lcore_count()) * 2;
        sess_mp = rte_mempool_create(mp_name,
-                       CDEV_MP_NB_OBJS,
+                       nb_sess,
                        sess_sz,
                        CDEV_MP_CACHE_SZ,
                        0, NULL, NULL, NULL,
@@ -2761,7 +2797,16 @@ main(int32_t argc, char **argv)
 
        sess_sz = max_session_size();
 
-       nb_crypto_qp = cryptodevs_init();
+       /*
+        * In event mode request minimum number of crypto queues
+        * to be reserved equal to number of ports.
+        */
+       if (eh_conf->mode == EH_PKT_TRANSFER_MODE_EVENT)
+               nb_crypto_qp = rte_eth_dev_count_avail();
+       else
+               nb_crypto_qp = 0;
+
+       nb_crypto_qp = cryptodevs_init(nb_crypto_qp);
 
        if (nb_bufs_in_pool == 0) {
                RTE_ETH_FOREACH_DEV(portid) {