examples/vm_power_manager: fix build

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

diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index 5b63a13..d406571 100644 (file)
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2016-2017 Intel Corporation
+ * Copyright(c) 2016-2020 Intel Corporation
  */
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -10,6 +10,7 @@
 #include <rte_crypto.h>
 #include <rte_security.h>
 #include <rte_cryptodev.h>
+#include <rte_ipsec.h>
 #include <rte_ethdev.h>
 #include <rte_mbuf.h>
 #include <rte_hash.h>
@@ -49,6 +50,8 @@ set_ipsec_conf(struct ipsec_sa *sa, struct rte_security_ipsec_xform *ipsec)
                /* TODO support for Transport */
        }
        ipsec->esn_soft_limit = IPSEC_OFFLOAD_ESN_SOFTLIMIT;
+       ipsec->replay_win_sz = app_sa_prm.window_size;
+       ipsec->options.esn = app_sa_prm.enable_esn;
 }
 
 int
@@ -84,7 +87,8 @@ create_lookaside_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa,
                        ipsec_ctx->tbl[cdev_id_qp].id,
                        ipsec_ctx->tbl[cdev_id_qp].qp);
 
-       if (ips->type != RTE_SECURITY_ACTION_TYPE_NONE) {
+       if (ips->type != RTE_SECURITY_ACTION_TYPE_NONE &&
+               ips->type != RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
                struct rte_security_session_conf sess_conf = {
                        .action_type = ips->type,
                        .protocol = RTE_SECURITY_PROTOCOL_IPSEC,
@@ -92,6 +96,7 @@ create_lookaside_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa,
                                .spi = sa->spi,
                                .salt = sa->salt,
                                .options = { 0 },
+                               .replay_win_sz = 0,
                                .direction = sa->direction,
                                .proto = RTE_SECURITY_IPSEC_SA_PROTO_ESP,
                                .mode = (IS_TUNNEL(sa->flags)) ?
@@ -123,6 +128,18 @@ create_lookaside_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa,
                        return -1;
                }
        } else {
+               if (ips->type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+                       struct rte_cryptodev_info info;
+                       uint16_t cdev_id;
+
+                       cdev_id = ipsec_ctx->tbl[cdev_id_qp].id;
+                       rte_cryptodev_info_get(cdev_id, &info);
+                       if (!(info.feature_flags &
+                               RTE_CRYPTODEV_FF_SYM_CPU_CRYPTO))
+                               return -ENOTSUP;
+
+                       ips->crypto.dev_id = cdev_id;
+               }
                ips->crypto.ses = rte_cryptodev_sym_session_create(
                                ipsec_ctx->session_pool);
                rte_cryptodev_sym_session_init(ipsec_ctx->tbl[cdev_id_qp].id,
@@ -151,6 +168,7 @@ create_inline_session(struct socket_ctx *skt_ctx, struct ipsec_sa *sa,
                        .spi = sa->spi,
                        .salt = sa->salt,
                        .options = { 0 },
+                       .replay_win_sz = 0,
                        .direction = sa->direction,
                        .proto = RTE_SECURITY_IPSEC_SA_PROTO_ESP,
                        .mode = (sa->flags == IP4_TUNNEL ||
@@ -257,6 +275,10 @@ create_inline_session(struct socket_ctx *skt_ctx, struct ipsec_sa *sa,
                        unsigned int i;
                        unsigned int j;
 
+                       /* Don't create flow if default flow is created */
+                       if (flow_info_tbl[sa->portid].rx_def_flow)
+                               return 0;
+
                        ret = rte_eth_dev_info_get(sa->portid, &dev_info);
                        if (ret != 0) {
                                RTE_LOG(ERR, IPSEC,
@@ -392,7 +414,6 @@ flow_create_failure:
                ips->security.ol_flags = sec_cap->ol_flags;
                ips->security.ctx = sec_ctx;
        }
-       sa->cdev_id_qp = 0;
 
        return 0;
 }
@@ -430,7 +451,7 @@ enqueue_cop(struct cdev_qp *cqp, struct rte_crypto_op *cop)
 
 static inline void
 ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
-               struct rte_mbuf *pkts[], struct ipsec_sa *sas[],
+               struct rte_mbuf *pkts[], void *sas[],
                uint16_t nb_pkts)
 {
        int32_t ret = 0, i;
@@ -449,9 +470,9 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
                rte_prefetch0(pkts[i]);
 
                priv = get_priv(pkts[i]);
-               sa = sas[i];
+               sa = ipsec_mask_saptr(sas[i]);
                priv->sa = sa;
-               ips = ipsec_get_session(sa);
+               ips = ipsec_get_primary_session(sa);
 
                switch (ips->type) {
                case RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL:
@@ -472,6 +493,13 @@ ipsec_enqueue(ipsec_xform_fn xform_func, struct ipsec_ctx *ipsec_ctx,
                        rte_security_attach_session(&priv->cop,
                                ips->security.ses);
                        break;
+
+               case RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO:
+                       RTE_LOG(ERR, IPSEC, "CPU crypto is not supported by the"
+                                       " legacy mode.");
+                       rte_pktmbuf_free(pkts[i]);
+                       continue;
+
                case RTE_SECURITY_ACTION_TYPE_NONE:
 
                        priv->cop.type = RTE_CRYPTO_OP_TYPE_SYMMETRIC;
@@ -618,7 +646,7 @@ uint16_t
 ipsec_inbound(struct ipsec_ctx *ctx, struct rte_mbuf *pkts[],
                uint16_t nb_pkts, uint16_t len)
 {
-       struct ipsec_sa *sas[nb_pkts];
+       void *sas[nb_pkts];
 
        inbound_sa_lookup(ctx->sa_ctx, pkts, sas, nb_pkts);
 
@@ -638,7 +666,7 @@ uint16_t
 ipsec_outbound(struct ipsec_ctx *ctx, struct rte_mbuf *pkts[],
                uint32_t sa_idx[], uint16_t nb_pkts, uint16_t len)
 {
-       struct ipsec_sa *sas[nb_pkts];
+       void *sas[nb_pkts];
 
        outbound_sa_lookup(ctx->sa_ctx, sa_idx, sas, nb_pkts);