[dpdk-stable] [PATCH 19.11] examples/ipsec-secgw: extend inline session to non AES-GCM

[Ankur Dwivedi]

________________________________
From: Ankur Dwivedi <adwivedi at marvell.com>
Sent: 28 February 2020 15:13
To: stable at dpdk.org <stable at dpdk.org>
Cc: Ankur Dwivedi <adwivedi at marvell.com>
Subject: [PATCH 19.11] examples/ipsec-secgw: extend inline session to non AES-GCM

[ upstream commit b685f931e1ce33d287e3891d4f19ab07f8d2aa79 ]

This patch extends creation of inline session to all the algorithms.
Previously the inline session was enabled only for AES-GCM cipher.

Fixes: 3a690d5a65e2 ("examples/ipsec-secgw: fix first packet with inline crypto")

Signed-off-by: Ankur Dwivedi <adwivedi at marvell.com>
---
 examples/ipsec-secgw/sa.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index c75a5a1..fcc6695 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -993,7 +993,6 @@ struct sa_ctx {
                 }

                 if (sa->aead_algo == RTE_CRYPTO_AEAD_AES_GCM) {
-                       struct rte_ipsec_session *ips;
                         iv_length = 12;

                         sa_ctx->xf[idx].a.type = RTE_CRYPTO_SYM_XFORM_AEAD;
@@ -1013,20 +1012,6 @@ struct sa_ctx {
                                 sa->digest_len;

                         sa->xforms = &sa_ctx->xf[idx].a;
-
-                       ips = ipsec_get_primary_session(sa);
-                       if (ips->type ==
-                               RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL ||
-                               ips->type ==
-                               RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO) {
-                               rc = create_inline_session(skt_ctx, sa, ips);
-                               if (rc != 0) {
-                                       RTE_LOG(ERR, IPSEC_ESP,
-                                               "create_inline_session() failed\n");
-                                       return -EINVAL;
-                               }
-                       }
-                       print_one_sa_rule(sa, inbound);
                 } else {
                         switch (sa->cipher_algo) {
                         case RTE_CRYPTO_CIPHER_NULL:
@@ -1091,9 +1076,21 @@ struct sa_ctx {
                         sa_ctx->xf[idx].a.next = &sa_ctx->xf[idx].b;
                         sa_ctx->xf[idx].b.next = NULL;
                         sa->xforms = &sa_ctx->xf[idx].a;
+               }

-                       print_one_sa_rule(sa, inbound);
+               if (ips->type ==
+                       RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL ||
+                       ips->type ==
+                       RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO) {
+                       rc = create_inline_session(skt_ctx, sa, ips);
+                       if (rc != 0) {
+                               RTE_LOG(ERR, IPSEC_ESP,
+                                       "create_inline_session() failed\n");
+                               return -EINVAL;
+                       }
                 }
+
+               print_one_sa_rule(sa, inbound);
         }

         return 0;
--
1.9.3