devtools: pass custom options to checkpatch

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

diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index ee24973..7b85330 100644 (file)
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -39,7 +39,7 @@ set_ipsec_conf(struct ipsec_sa *sa, struct rte_security_ipsec_xform *ipsec)
        ipsec->esn_soft_limit = IPSEC_OFFLOAD_ESN_SOFTLIMIT;
 }
 
-static inline int
+int
 create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
 {
        struct rte_cryptodev_info cdev_info;
@@ -102,7 +102,7 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
                        set_ipsec_conf(sa, &(sess_conf.ipsec));
 
                        sa->sec_session = rte_security_session_create(ctx,
-                                       &sess_conf, ipsec_ctx->session_pool);
+                                       &sess_conf, ipsec_ctx->session_priv_pool);
                        if (sa->sec_session == NULL) {
                                RTE_LOG(ERR, IPSEC,
                                "SEC Session init failed: err: %d\n", ret);
@@ -117,7 +117,7 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
                        int ret = 0;
 
                        sa->sec_session = rte_security_session_create(ctx,
-                                       &sess_conf, ipsec_ctx->session_pool);
+                                       &sess_conf, ipsec_ctx->session_priv_pool);
                        if (sa->sec_session == NULL) {
                                RTE_LOG(ERR, IPSEC,
                                "SEC Session init failed: err: %d\n", ret);
@@ -323,49 +323,45 @@ flow_create_failure:
                                ipsec_ctx->session_pool);
                rte_cryptodev_sym_session_init(ipsec_ctx->tbl[cdev_id_qp].id,
                                sa->crypto_session, sa->xforms,
-                               ipsec_ctx->session_pool);
+                               ipsec_ctx->session_priv_pool);
 
                rte_cryptodev_info_get(ipsec_ctx->tbl[cdev_id_qp].id,
                                &cdev_info);
-               if (cdev_info.sym.max_nb_sessions_per_qp > 0) {
-                       ret = rte_cryptodev_queue_pair_attach_sym_session(
-                                       ipsec_ctx->tbl[cdev_id_qp].id,
-                                       ipsec_ctx->tbl[cdev_id_qp].qp,
-                                       sa->crypto_session);
-                       if (ret < 0) {
-                               RTE_LOG(ERR, IPSEC,
-                                       "Session cannot be attached to qp %u\n",
-                                       ipsec_ctx->tbl[cdev_id_qp].qp);
-                               return -1;
-                       }
-               }
        }
        sa->cdev_id_qp = cdev_id_qp;
 
        return 0;
 }
 
+/*
+ * queue crypto-ops into PMD queue.
+ */
+void
+enqueue_cop_burst(struct cdev_qp *cqp)
+{
+       uint32_t i, len, ret;
+
+       len = cqp->len;
+       ret = rte_cryptodev_enqueue_burst(cqp->id, cqp->qp, cqp->buf, len);
+       if (ret < len) {
+               RTE_LOG_DP(DEBUG, IPSEC, "Cryptodev %u queue %u:"
+                       " enqueued %u crypto ops out of %u\n",
+                       cqp->id, cqp->qp, ret, len);
+                       /* drop packets that we fail to enqueue */
+                       for (i = ret; i < len; i++)
+                               rte_pktmbuf_free(cqp->buf[i]->sym->m_src);
+       }
+       cqp->in_flight += ret;
+       cqp->len = 0;
+}
+
 static inline void
 enqueue_cop(struct cdev_qp *cqp, struct rte_crypto_op *cop)
 {
-       int32_t ret, i;
-
        cqp->buf[cqp->len++] = cop;
 
-       if (cqp->len == MAX_PKT_BURST) {
-               ret = rte_cryptodev_enqueue_burst(cqp->id, cqp->qp,
-                               cqp->buf, cqp->len);
-               if (ret < cqp->len) {
-                       RTE_LOG_DP(DEBUG, IPSEC, "Cryptodev %u queue %u:"
-                                       " enqueued %u crypto ops out of %u\n",
-                                        cqp->id, cqp->qp,
-                                        ret, cqp->len);
-                       for (i = ret; i < cqp->len; i++)
-                               rte_pktmbuf_free(cqp->buf[i]->sym->m_src);
-               }
-               cqp->in_flight += ret;
-               cqp->len = 0;
-       }
+       if (cqp->len == MAX_PKT_BURST)
+               enqueue_cop_burst(cqp);
 }
 
 static inline void
@@ -479,6 +475,32 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
        }
 }
 
+static inline int32_t
+ipsec_inline_dequeue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
+             struct rte_mbuf *pkts[], uint16_t max_pkts)
+{
+       int32_t nb_pkts, ret;
+       struct ipsec_mbuf_metadata *priv;
+       struct ipsec_sa *sa;
+       struct rte_mbuf *pkt;
+
+       nb_pkts = 0;
+       while (ipsec_ctx->ol_pkts_cnt > 0 && nb_pkts < max_pkts) {
+               pkt = ipsec_ctx->ol_pkts[--ipsec_ctx->ol_pkts_cnt];
+               rte_prefetch0(pkt);
+               priv = get_priv(pkt);
+               sa = priv->sa;
+               ret = xform_func(pkt, sa, &priv->cop);
+               if (unlikely(ret)) {
+                       rte_pktmbuf_free(pkt);
+                       continue;
+               }
+               pkts[nb_pkts++] = pkt;
+       }
+
+       return nb_pkts;
+}
+
 static inline int
 ipsec_dequeue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
              struct rte_mbuf *pkts[], uint16_t max_pkts)
@@ -489,30 +511,15 @@ ipsec_dequeue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
        struct ipsec_sa *sa;
        struct rte_mbuf *pkt;
 
-       for (i = 0; i < ipsec_ctx->nb_qps && nb_pkts < max_pkts;) {
+       for (i = 0; i < ipsec_ctx->nb_qps && nb_pkts < max_pkts; i++) {
                struct cdev_qp *cqp;
-               cqp = &ipsec_ctx->tbl[ipsec_ctx->last_qp];
 
-               while (ipsec_ctx->ol_pkts_cnt > 0 && nb_pkts < max_pkts) {
-                       pkt = ipsec_ctx->ol_pkts[--ipsec_ctx->ol_pkts_cnt];
-                       rte_prefetch0(pkt);
-                       priv = get_priv(pkt);
-                       sa = priv->sa;
-                       ret = xform_func(pkt, sa, &priv->cop);
-                       if (unlikely(ret)) {
-                               rte_pktmbuf_free(pkt);
-                               continue;
-                       }
-                       pkts[nb_pkts++] = pkt;
-               }
+               cqp = &ipsec_ctx->tbl[ipsec_ctx->last_qp++];
+               if (ipsec_ctx->last_qp == ipsec_ctx->nb_qps)
+                       ipsec_ctx->last_qp %= ipsec_ctx->nb_qps;
 
-               if (cqp->in_flight == 0) {
-                       ipsec_ctx->last_qp++;
-                       if (ipsec_ctx->last_qp == ipsec_ctx->nb_qps)
-                               ipsec_ctx->last_qp %= ipsec_ctx->nb_qps;
-                       i++;
+               if (cqp->in_flight == 0)
                        continue;
-               }
 
                nb_cops = rte_cryptodev_dequeue_burst(cqp->id, cqp->qp,
                                cops, max_pkts - nb_pkts);
@@ -536,12 +543,6 @@ ipsec_dequeue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
                                }
                        }
                        pkts[nb_pkts++] = pkt;
-                       if (cqp->in_flight < max_pkts) {
-                               ipsec_ctx->last_qp++;
-                               if (ipsec_ctx->last_qp == ipsec_ctx->nb_qps)
-                                       ipsec_ctx->last_qp %= ipsec_ctx->nb_qps;
-                               i++;
-                       }
                }
        }
 
@@ -559,6 +560,13 @@ ipsec_inbound(struct ipsec_ctx *ctx, struct rte_mbuf *pkts[],
 
        ipsec_enqueue(esp_inbound, ctx, pkts, sas, nb_pkts);
 
+       return ipsec_inline_dequeue(esp_inbound_post, ctx, pkts, len);
+}
+
+uint16_t
+ipsec_inbound_cqp_dequeue(struct ipsec_ctx *ctx, struct rte_mbuf *pkts[],
+               uint16_t len)
+{
        return ipsec_dequeue(esp_inbound_post, ctx, pkts, len);
 }
 
@@ -572,5 +580,12 @@ ipsec_outbound(struct ipsec_ctx *ctx, struct rte_mbuf *pkts[],
 
        ipsec_enqueue(esp_outbound, ctx, pkts, sas, nb_pkts);
 
+       return ipsec_inline_dequeue(esp_outbound_post, ctx, pkts, len);
+}
+
+uint16_t
+ipsec_outbound_cqp_dequeue(struct ipsec_ctx *ctx, struct rte_mbuf *pkts[],
+               uint16_t len)
+{
        return ipsec_dequeue(esp_outbound_post, ctx, pkts, len);
 }