kernel: fix cross-build of Linux modules with meson

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

diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index acdd189..6c89647 100644 (file)
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -187,14 +187,8 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
                                        .rss_key_len = 40,
                                };
                                struct rte_eth_dev *eth_dev;
-                               union {
-                                       struct rte_flow_action_rss rss;
-                                       struct {
-                                       const struct rte_eth_rss_conf *rss_conf;
-                                       uint16_t num;
-                                       uint16_t queue[RTE_MAX_QUEUES_PER_PORT];
-                                       } local;
-                               } action_rss;
+                               uint16_t queue[RTE_MAX_QUEUES_PER_PORT];
+                               struct rte_flow_action_rss action_rss;
                                unsigned int i;
                                unsigned int j;
 
@@ -208,9 +202,14 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
                                for (i = 0, j = 0;
                                     i < eth_dev->data->nb_rx_queues; ++i)
                                        if (eth_dev->data->rx_queues[i])
-                                               action_rss.local.queue[j++] = i;
-                               action_rss.local.num = j;
-                               action_rss.local.rss_conf = &rss_conf;
+                                               queue[j++] = i;
+                               action_rss = (struct rte_flow_action_rss){
+                                       .types = rss_conf.rss_hf,
+                                       .key_len = rss_conf.rss_key_len,
+                                       .queue_num = j,
+                                       .key = rss_key,
+                                       .queue = queue,
+                               };
                                ret = rte_flow_validate(sa->portid, &sa->attr,
                                                        sa->pattern, sa->action,
                                                        &err);
@@ -349,13 +348,19 @@ flow_create_failure:
 static inline void
 enqueue_cop(struct cdev_qp *cqp, struct rte_crypto_op *cop)
 {
-       int32_t ret, i;
+       int32_t ret = 0, 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);
+               int enq_size = cqp->len;
+               if ((cqp->in_flight + enq_size) > MAX_INFLIGHT)
+                       enq_size -=
+                           (int)((cqp->in_flight + enq_size) - MAX_INFLIGHT);
+
+               if (enq_size > 0)
+                       ret = rte_cryptodev_enqueue_burst(cqp->id, cqp->qp,
+                                       cqp->buf, enq_size);
                if (ret < cqp->len) {
                        RTE_LOG_DP(DEBUG, IPSEC, "Cryptodev %u queue %u:"
                                        " enqueued %u crypto ops out of %u\n",
@@ -490,9 +495,12 @@ 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];
+
+               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;
 
                while (ipsec_ctx->ol_pkts_cnt > 0 && nb_pkts < max_pkts) {
                        pkt = ipsec_ctx->ol_pkts[--ipsec_ctx->ol_pkts_cnt];
@@ -507,13 +515,8 @@ ipsec_dequeue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
                        pkts[nb_pkts++] = pkt;
                }
 
-               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);
@@ -537,12 +540,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++;
-                       }
                }
        }