examples: use mempool cache for vector pool

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

diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index 3027fbc..7b7bfff 100644 (file)
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -55,37 +55,71 @@ set_ipsec_conf(struct ipsec_sa *sa, struct rte_security_ipsec_xform *ipsec)
 }
 
 int
-create_lookaside_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa,
-               struct rte_ipsec_session *ips)
+create_lookaside_session(struct ipsec_ctx *ipsec_ctx_lcore[],
+       struct socket_ctx *skt_ctx, struct ipsec_sa *sa,
+       struct rte_ipsec_session *ips)
 {
+       uint16_t cdev_id = RTE_CRYPTO_MAX_DEVS;
        struct rte_cryptodev_info cdev_info;
        unsigned long cdev_id_qp = 0;
-       int32_t ret = 0;
        struct cdev_key key = { 0 };
+       struct ipsec_ctx *ipsec_ctx;
+       uint32_t lcore_id;
+       int32_t ret = 0;
 
-       key.lcore_id = (uint8_t)rte_lcore_id();
+       RTE_LCORE_FOREACH(lcore_id) {
+               ipsec_ctx = ipsec_ctx_lcore[lcore_id];
 
-       key.cipher_algo = (uint8_t)sa->cipher_algo;
-       key.auth_algo = (uint8_t)sa->auth_algo;
-       key.aead_algo = (uint8_t)sa->aead_algo;
+               /* Core is not bound to any cryptodev, skip it */
+               if (ipsec_ctx->cdev_map == NULL)
+                       continue;
 
-       ret = rte_hash_lookup_data(ipsec_ctx->cdev_map, &key,
-                       (void **)&cdev_id_qp);
-       if (ret < 0) {
-               RTE_LOG(ERR, IPSEC,
-                               "No cryptodev: core %u, cipher_algo %u, "
-                               "auth_algo %u, aead_algo %u\n",
-                               key.lcore_id,
-                               key.cipher_algo,
-                               key.auth_algo,
-                               key.aead_algo);
-               return -1;
+               /* Looking for cryptodev, which can handle this SA */
+               key.lcore_id = (uint8_t)lcore_id;
+               key.cipher_algo = (uint8_t)sa->cipher_algo;
+               key.auth_algo = (uint8_t)sa->auth_algo;
+               key.aead_algo = (uint8_t)sa->aead_algo;
+
+               ret = rte_hash_lookup_data(ipsec_ctx->cdev_map, &key,
+                               (void **)&cdev_id_qp);
+               if (ret == -ENOENT)
+                       continue;
+               if (ret < 0) {
+                       RTE_LOG(ERR, IPSEC,
+                                       "No cryptodev: core %u, cipher_algo %u, "
+                                       "auth_algo %u, aead_algo %u\n",
+                                       key.lcore_id,
+                                       key.cipher_algo,
+                                       key.auth_algo,
+                                       key.aead_algo);
+                       return ret;
+               }
+
+               /* Verify that all cores are using same cryptodev for current
+                * algorithm combination, required by SA.
+                * Current cryptodev mapping process will map SA to the first
+                * cryptodev that matches requirements, so it's a double check,
+                * not an additional restriction.
+                */
+               if (cdev_id == RTE_CRYPTO_MAX_DEVS)
+                       cdev_id = ipsec_ctx->tbl[cdev_id_qp].id;
+               else if (cdev_id != ipsec_ctx->tbl[cdev_id_qp].id) {
+                       RTE_LOG(ERR, IPSEC,
+                                       "SA mapping to multiple cryptodevs is "
+                                       "not supported!");
+                       return -EINVAL;
+               }
+
+               /* Store per core queue pair information */
+               sa->cqp[lcore_id] = &ipsec_ctx->tbl[cdev_id_qp];
+       }
+       if (cdev_id == RTE_CRYPTO_MAX_DEVS) {
+               RTE_LOG(WARNING, IPSEC, "No cores found to handle SA\n");
+               return 0;
        }
 
-       RTE_LOG_DP(DEBUG, IPSEC, "Create session for SA spi %u on cryptodev "
-                       "%u qp %u\n", sa->spi,
-                       ipsec_ctx->tbl[cdev_id_qp].id,
-                       ipsec_ctx->tbl[cdev_id_qp].qp);
+       RTE_LOG(DEBUG, IPSEC, "Create session for SA spi %u on cryptodev "
+                       "%u\n", sa->spi, cdev_id);
 
        if (ips->type != RTE_SECURITY_ACTION_TYPE_NONE &&
                ips->type != RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
@@ -111,14 +145,14 @@ create_lookaside_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa,
                if (ips->type == RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL) {
                        struct rte_security_ctx *ctx = (struct rte_security_ctx *)
                                                        rte_cryptodev_get_sec_ctx(
-                                                       ipsec_ctx->tbl[cdev_id_qp].id);
+                                                       cdev_id);
 
                        /* Set IPsec parameters in conf */
                        set_ipsec_conf(sa, &(sess_conf.ipsec));
 
                        ips->security.ses = rte_security_session_create(ctx,
-                                       &sess_conf, ipsec_ctx->session_pool,
-                                       ipsec_ctx->session_priv_pool);
+                                       &sess_conf, skt_ctx->session_pool,
+                                       skt_ctx->session_priv_pool);
                        if (ips->security.ses == NULL) {
                                RTE_LOG(ERR, IPSEC,
                                "SEC Session init failed: err: %d\n", ret);
@@ -130,8 +164,6 @@ create_lookaside_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa,
                        return -1;
                }
        } else {
-               uint16_t cdev_id = ipsec_ctx->tbl[cdev_id_qp].id;
-
                if (ips->type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
                        struct rte_cryptodev_info info;
 
@@ -143,16 +175,14 @@ create_lookaside_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa,
                }
                ips->crypto.dev_id = cdev_id;
                ips->crypto.ses = rte_cryptodev_sym_session_create(
-                               ipsec_ctx->session_pool);
+                               skt_ctx->session_pool);
                rte_cryptodev_sym_session_init(cdev_id,
                                ips->crypto.ses, sa->xforms,
-                               ipsec_ctx->session_priv_pool);
+                               skt_ctx->session_priv_pool);
 
                rte_cryptodev_info_get(cdev_id, &cdev_info);
        }
 
-       sa->cdev_id_qp = cdev_id_qp;
-
        return 0;
 }
 
@@ -621,8 +651,7 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
 
                        rte_prefetch0(&priv->sym_cop);
 
-                       if ((unlikely(ips->security.ses == NULL)) &&
-                               create_lookaside_session(ipsec_ctx, sa, ips)) {
+                       if (unlikely(ips->security.ses == NULL)) {
                                free_pkts(&pkts[i], 1);
                                continue;
                        }
@@ -656,8 +685,7 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
 
                        rte_prefetch0(&priv->sym_cop);
 
-                       if ((unlikely(ips->crypto.ses == NULL)) &&
-                               create_lookaside_session(ipsec_ctx, sa, ips)) {
+                       if (unlikely(ips->crypto.ses == NULL)) {
                                free_pkts(&pkts[i], 1);
                                continue;
                        }
@@ -704,8 +732,7 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
                        continue;
                }
 
-               RTE_ASSERT(sa->cdev_id_qp < ipsec_ctx->nb_qps);
-               enqueue_cop(&ipsec_ctx->tbl[sa->cdev_id_qp], &priv->cop);
+               enqueue_cop(sa->cqp[ipsec_ctx->lcore_id], &priv->cop);
        }
 }