common/cnxk: allow reuse of SSO API for inline dev
[dpdk.git] / drivers / common / cnxk / cnxk_security.c
index 2f5003e..c117fa7 100644 (file)
@@ -2,14 +2,49 @@
  * Copyright(C) 2021 Marvell.
  */
 
+#include <rte_udp.h>
+
 #include "cnxk_security.h"
 
+#include "roc_api.h"
+
+static void
+ipsec_hmac_opad_ipad_gen(struct rte_crypto_sym_xform *auth_xform,
+                        uint8_t *hmac_opad_ipad)
+{
+       const uint8_t *key = auth_xform->auth.key.data;
+       uint32_t length = auth_xform->auth.key.length;
+       uint8_t opad[128] = {[0 ... 127] = 0x5c};
+       uint8_t ipad[128] = {[0 ... 127] = 0x36};
+       uint32_t i;
+
+       /* HMAC OPAD and IPAD */
+       for (i = 0; i < 127 && i < length; i++) {
+               opad[i] = opad[i] ^ key[i];
+               ipad[i] = ipad[i] ^ key[i];
+       }
+
+       /* Precompute hash of HMAC OPAD and IPAD to avoid
+        * per packet computation
+        */
+       switch (auth_xform->auth.algo) {
+       case RTE_CRYPTO_AUTH_SHA1_HMAC:
+               roc_hash_sha1_gen(opad, (uint32_t *)&hmac_opad_ipad[0]);
+               roc_hash_sha1_gen(ipad, (uint32_t *)&hmac_opad_ipad[24]);
+               break;
+       default:
+               break;
+       }
+}
+
 static int
 ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2,
                              uint8_t *cipher_key, uint8_t *salt_key,
+                             uint8_t *hmac_opad_ipad,
                              struct rte_security_ipsec_xform *ipsec_xfrm,
                              struct rte_crypto_sym_xform *crypto_xfrm)
 {
+       struct rte_crypto_sym_xform *auth_xfrm, *cipher_xfrm;
        const uint8_t *key;
        uint32_t *tmp_salt;
        uint64_t *tmp_key;
@@ -18,10 +53,14 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2,
        /* Set direction */
        switch (ipsec_xfrm->direction) {
        case RTE_SECURITY_IPSEC_SA_DIR_INGRESS:
-               w2->s.dir = ROC_IE_OT_SA_DIR_INBOUND;
+               w2->s.dir = ROC_IE_SA_DIR_INBOUND;
+               auth_xfrm = crypto_xfrm;
+               cipher_xfrm = crypto_xfrm->next;
                break;
        case RTE_SECURITY_IPSEC_SA_DIR_EGRESS:
-               w2->s.dir = ROC_IE_OT_SA_DIR_OUTBOUND;
+               w2->s.dir = ROC_IE_SA_DIR_OUTBOUND;
+               cipher_xfrm = crypto_xfrm;
+               auth_xfrm = crypto_xfrm->next;
                break;
        default:
                return -EINVAL;
@@ -30,10 +69,10 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2,
        /* Set protocol - ESP vs AH */
        switch (ipsec_xfrm->proto) {
        case RTE_SECURITY_IPSEC_SA_PROTO_ESP:
-               w2->s.protocol = ROC_IE_OT_SA_PROTOCOL_ESP;
+               w2->s.protocol = ROC_IE_SA_PROTOCOL_ESP;
                break;
        case RTE_SECURITY_IPSEC_SA_PROTO_AH:
-               w2->s.protocol = ROC_IE_OT_SA_PROTOCOL_AH;
+               w2->s.protocol = ROC_IE_SA_PROTOCOL_AH;
                break;
        default:
                return -EINVAL;
@@ -42,10 +81,10 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2,
        /* Set mode - transport vs tunnel */
        switch (ipsec_xfrm->mode) {
        case RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT:
-               w2->s.mode = ROC_IE_OT_SA_MODE_TRANSPORT;
+               w2->s.mode = ROC_IE_SA_MODE_TRANSPORT;
                break;
        case RTE_SECURITY_IPSEC_SA_MODE_TUNNEL:
-               w2->s.mode = ROC_IE_OT_SA_MODE_TUNNEL;
+               w2->s.mode = ROC_IE_SA_MODE_TUNNEL;
                break;
        default:
                return -EINVAL;
@@ -68,9 +107,38 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2,
                        return -ENOTSUP;
                }
        } else {
-               return -ENOTSUP;
+               switch (cipher_xfrm->cipher.algo) {
+               case RTE_CRYPTO_CIPHER_AES_CBC:
+                       w2->s.enc_type = ROC_IE_OT_SA_ENC_AES_CBC;
+                       break;
+               default:
+                       return -ENOTSUP;
+               }
+
+               switch (auth_xfrm->auth.algo) {
+               case RTE_CRYPTO_AUTH_SHA1_HMAC:
+                       w2->s.auth_type = ROC_IE_OT_SA_AUTH_SHA1;
+                       break;
+               default:
+                       return -ENOTSUP;
+               }
+
+               key = cipher_xfrm->cipher.key.data;
+               length = cipher_xfrm->cipher.key.length;
+
+               ipsec_hmac_opad_ipad_gen(auth_xfrm, hmac_opad_ipad);
+
+               tmp_key = (uint64_t *)hmac_opad_ipad;
+               for (i = 0;
+                    i < (int)(ROC_CTX_MAX_OPAD_IPAD_LEN / sizeof(uint64_t));
+                    i++)
+                       tmp_key[i] = rte_be_to_cpu_64(tmp_key[i]);
        }
 
+       /* Set encapsulation type */
+       if (ipsec_xfrm->options.udp_encap)
+               w2->s.encap_type = ROC_IE_OT_SA_ENCAP_UDP;
+
        w2->s.spi = ipsec_xfrm->spi;
 
        /* Copy encryption key */
@@ -81,18 +149,38 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2,
 
        switch (length) {
        case ROC_CPT_AES128_KEY_LEN:
-               w2->s.aes_key_len = ROC_IE_OT_SA_AES_KEY_LEN_128;
+               w2->s.aes_key_len = ROC_IE_SA_AES_KEY_LEN_128;
                break;
        case ROC_CPT_AES192_KEY_LEN:
-               w2->s.aes_key_len = ROC_IE_OT_SA_AES_KEY_LEN_192;
+               w2->s.aes_key_len = ROC_IE_SA_AES_KEY_LEN_192;
                break;
        case ROC_CPT_AES256_KEY_LEN:
-               w2->s.aes_key_len = ROC_IE_OT_SA_AES_KEY_LEN_256;
+               w2->s.aes_key_len = ROC_IE_SA_AES_KEY_LEN_256;
                break;
        default:
                return -EINVAL;
        }
 
+       if (ipsec_xfrm->life.packets_soft_limit != 0 ||
+           ipsec_xfrm->life.packets_hard_limit != 0) {
+               if (ipsec_xfrm->life.bytes_soft_limit != 0 ||
+                   ipsec_xfrm->life.bytes_hard_limit != 0) {
+                       plt_err("Expiry tracking with both packets & bytes is not supported");
+                       return -EINVAL;
+               }
+               w2->s.life_unit = ROC_IE_OT_SA_LIFE_UNIT_PKTS;
+       }
+
+       if (ipsec_xfrm->life.bytes_soft_limit != 0 ||
+           ipsec_xfrm->life.bytes_hard_limit != 0) {
+               if (ipsec_xfrm->life.packets_soft_limit != 0 ||
+                   ipsec_xfrm->life.packets_hard_limit != 0) {
+                       plt_err("Expiry tracking with both packets & bytes is not supported");
+                       return -EINVAL;
+               }
+               w2->s.life_unit = ROC_IE_OT_SA_LIFE_UNIT_OCTETS;
+       }
+
        return 0;
 }
 
@@ -111,6 +199,62 @@ ot_ipsec_inb_ctx_size(struct roc_ot_ipsec_inb_sa *sa)
        return size;
 }
 
+static int
+ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa,
+                            struct rte_security_ipsec_xform *ipsec_xfrm)
+{
+       struct rte_security_ipsec_tunnel_param *tunnel;
+
+       if (ipsec_xfrm->mode != RTE_SECURITY_IPSEC_SA_MODE_TUNNEL)
+               return 0;
+
+       if (ipsec_xfrm->options.tunnel_hdr_verify == 0)
+               return 0;
+
+       tunnel = &ipsec_xfrm->tunnel;
+
+       switch (tunnel->type) {
+       case RTE_SECURITY_IPSEC_TUNNEL_IPV4:
+               sa->w2.s.outer_ip_ver = ROC_IE_SA_IP_VERSION_4;
+               memcpy(&sa->outer_hdr.ipv4.src_addr, &tunnel->ipv4.src_ip,
+                      sizeof(struct in_addr));
+               memcpy(&sa->outer_hdr.ipv4.dst_addr, &tunnel->ipv4.dst_ip,
+                      sizeof(struct in_addr));
+
+               /* IP Source and Dest are in LE/CPU endian */
+               sa->outer_hdr.ipv4.src_addr =
+                       rte_be_to_cpu_32(sa->outer_hdr.ipv4.src_addr);
+               sa->outer_hdr.ipv4.dst_addr =
+                       rte_be_to_cpu_32(sa->outer_hdr.ipv4.dst_addr);
+
+               break;
+       case RTE_SECURITY_IPSEC_TUNNEL_IPV6:
+               sa->w2.s.outer_ip_ver = ROC_IE_SA_IP_VERSION_6;
+               memcpy(&sa->outer_hdr.ipv6.src_addr, &tunnel->ipv6.src_addr,
+                      sizeof(struct in6_addr));
+               memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,
+                      sizeof(struct in6_addr));
+
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       switch (ipsec_xfrm->options.tunnel_hdr_verify) {
+       case RTE_SECURITY_IPSEC_TUNNEL_VERIFY_DST_ADDR:
+               sa->w2.s.ip_hdr_verify = ROC_IE_OT_SA_IP_HDR_VERIFY_DST_ADDR;
+               break;
+       case RTE_SECURITY_IPSEC_TUNNEL_VERIFY_SRC_DST_ADDR:
+               sa->w2.s.ip_hdr_verify =
+                       ROC_IE_OT_SA_IP_HDR_VERIFY_SRC_DST_ADDR;
+               break;
+       default:
+               return -ENOTSUP;
+       }
+
+       return 0;
+}
+
 int
 cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
                          struct rte_security_ipsec_xform *ipsec_xfrm,
@@ -123,7 +267,8 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
 
        w2.u64 = 0;
        rc = ot_ipsec_sa_common_param_fill(&w2, sa->cipher_key, sa->w8.s.salt,
-                                          ipsec_xfrm, crypto_xfrm);
+                                          sa->hmac_opad_ipad, ipsec_xfrm,
+                                          crypto_xfrm);
        if (rc)
                return rc;
 
@@ -140,6 +285,10 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
                sa->w0.s.ar_win = rte_log2_u32(replay_win_sz) - 5;
        }
 
+       rc = ot_ipsec_inb_tunnel_hdr_fill(sa, ipsec_xfrm);
+       if (rc)
+               return rc;
+
        /* Default options for pkt_out and pkt_fmt are with
         * second pass meta and no defrag.
         */
@@ -149,6 +298,10 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
 
        /* ESN */
        sa->w2.s.esn_en = !!ipsec_xfrm->options.esn;
+       if (ipsec_xfrm->options.udp_encap) {
+               sa->w10.s.udp_src_port = 4500;
+               sa->w10.s.udp_dst_port = 4500;
+       }
 
        offset = offsetof(struct roc_ot_ipsec_inb_sa, ctx);
        /* Word offset for HW managed SA field */
@@ -163,6 +316,31 @@ cnxk_ot_ipsec_inb_sa_fill(struct roc_ot_ipsec_inb_sa *sa,
                 ROC_CTX_UNIT_128B) -
                1;
 
+       /**
+        * CPT MC triggers expiry when counter value changes from 2 to 1. To
+        * mitigate this behaviour add 1 to the life counter values provided.
+        */
+
+       if (ipsec_xfrm->life.bytes_soft_limit) {
+               sa->ctx.soft_life = ipsec_xfrm->life.bytes_soft_limit + 1;
+               sa->w0.s.soft_life_dec = 1;
+       }
+
+       if (ipsec_xfrm->life.packets_soft_limit) {
+               sa->ctx.soft_life = ipsec_xfrm->life.packets_soft_limit + 1;
+               sa->w0.s.soft_life_dec = 1;
+       }
+
+       if (ipsec_xfrm->life.bytes_hard_limit) {
+               sa->ctx.hard_life = ipsec_xfrm->life.bytes_hard_limit + 1;
+               sa->w0.s.hard_life_dec = 1;
+       }
+
+       if (ipsec_xfrm->life.packets_hard_limit) {
+               sa->ctx.hard_life = ipsec_xfrm->life.packets_hard_limit + 1;
+               sa->w0.s.hard_life_dec = 1;
+       }
+
        /* There are two words of CPT_CTX_HW_S for ucode to skip */
        sa->w0.s.ctx_hdr_size = 1;
        sa->w0.s.aop_valid = 1;
@@ -186,7 +364,8 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,
 
        w2.u64 = 0;
        rc = ot_ipsec_sa_common_param_fill(&w2, sa->cipher_key, sa->iv.s.salt,
-                                          ipsec_xfrm, crypto_xfrm);
+                                          sa->hmac_opad_ipad, ipsec_xfrm,
+                                          crypto_xfrm);
        if (rc)
                return rc;
 
@@ -199,7 +378,7 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,
        /* Tunnel header info */
        switch (tunnel->type) {
        case RTE_SECURITY_IPSEC_TUNNEL_IPV4:
-               sa->w2.s.outer_ip_ver = ROC_IE_OT_SA_IP_VERSION_4;
+               sa->w2.s.outer_ip_ver = ROC_IE_SA_IP_VERSION_4;
                memcpy(&sa->outer_hdr.ipv4.src_addr, &tunnel->ipv4.src_ip,
                       sizeof(struct in_addr));
                memcpy(&sa->outer_hdr.ipv4.dst_addr, &tunnel->ipv4.dst_ip,
@@ -230,7 +409,7 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa,
                }
                break;
        case RTE_SECURITY_IPSEC_TUNNEL_IPV6:
-               sa->w2.s.outer_ip_ver = ROC_IE_OT_SA_IP_VERSION_6;
+               sa->w2.s.outer_ip_ver = ROC_IE_SA_IP_VERSION_6;
                memcpy(&sa->outer_hdr.ipv6.src_addr, &tunnel->ipv6.src_addr,
                       sizeof(struct in6_addr));
                memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr,
@@ -267,6 +446,11 @@ skip_tunnel_info:
        /* ESN */
        sa->w0.s.esn_en = !!ipsec_xfrm->options.esn;
 
+       if (ipsec_xfrm->options.udp_encap) {
+               sa->w10.s.udp_src_port = 4500;
+               sa->w10.s.udp_dst_port = 4500;
+       }
+
        offset = offsetof(struct roc_ot_ipsec_outb_sa, ctx);
        /* Word offset for HW managed SA field */
        sa->w0.s.hw_ctx_off = offset / 8;
@@ -281,6 +465,31 @@ skip_tunnel_info:
        /* IPID gen */
        sa->w2.s.ipid_gen = 1;
 
+       /**
+        * CPT MC triggers expiry when counter value changes from 2 to 1. To
+        * mitigate this behaviour add 1 to the life counter values provided.
+        */
+
+       if (ipsec_xfrm->life.bytes_soft_limit) {
+               sa->ctx.soft_life = ipsec_xfrm->life.bytes_soft_limit + 1;
+               sa->w0.s.soft_life_dec = 1;
+       }
+
+       if (ipsec_xfrm->life.packets_soft_limit) {
+               sa->ctx.soft_life = ipsec_xfrm->life.packets_soft_limit + 1;
+               sa->w0.s.soft_life_dec = 1;
+       }
+
+       if (ipsec_xfrm->life.bytes_hard_limit) {
+               sa->ctx.hard_life = ipsec_xfrm->life.bytes_hard_limit + 1;
+               sa->w0.s.hard_life_dec = 1;
+       }
+
+       if (ipsec_xfrm->life.packets_hard_limit) {
+               sa->ctx.hard_life = ipsec_xfrm->life.packets_hard_limit + 1;
+               sa->w0.s.hard_life_dec = 1;
+       }
+
        /* There are two words of CPT_CTX_HW_S for ucode to skip */
        sa->w0.s.ctx_hdr_size = 1;
        sa->w0.s.aop_valid = 1;
@@ -304,6 +513,217 @@ cnxk_ot_ipsec_outb_sa_valid(struct roc_ot_ipsec_outb_sa *sa)
        return !!sa->w2.s.valid;
 }
 
+static inline int
+ipsec_xfrm_verify(struct rte_security_ipsec_xform *ipsec_xfrm,
+                 struct rte_crypto_sym_xform *crypto_xfrm)
+{
+       if (crypto_xfrm->next == NULL)
+               return -EINVAL;
+
+       if (ipsec_xfrm->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS) {
+               if (crypto_xfrm->type != RTE_CRYPTO_SYM_XFORM_AUTH ||
+                   crypto_xfrm->next->type != RTE_CRYPTO_SYM_XFORM_CIPHER)
+                       return -EINVAL;
+       } else {
+               if (crypto_xfrm->type != RTE_CRYPTO_SYM_XFORM_CIPHER ||
+                   crypto_xfrm->next->type != RTE_CRYPTO_SYM_XFORM_AUTH)
+                       return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int
+onf_ipsec_sa_common_param_fill(struct roc_ie_onf_sa_ctl *ctl, uint8_t *salt,
+                              uint8_t *cipher_key, uint8_t *hmac_opad_ipad,
+                              struct rte_security_ipsec_xform *ipsec_xfrm,
+                              struct rte_crypto_sym_xform *crypto_xfrm)
+{
+       struct rte_crypto_sym_xform *auth_xfrm, *cipher_xfrm;
+       int rc, length, auth_key_len;
+       const uint8_t *key = NULL;
+
+       /* Set direction */
+       switch (ipsec_xfrm->direction) {
+       case RTE_SECURITY_IPSEC_SA_DIR_INGRESS:
+               ctl->direction = ROC_IE_SA_DIR_INBOUND;
+               auth_xfrm = crypto_xfrm;
+               cipher_xfrm = crypto_xfrm->next;
+               break;
+       case RTE_SECURITY_IPSEC_SA_DIR_EGRESS:
+               ctl->direction = ROC_IE_SA_DIR_OUTBOUND;
+               cipher_xfrm = crypto_xfrm;
+               auth_xfrm = crypto_xfrm->next;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       /* Set protocol - ESP vs AH */
+       switch (ipsec_xfrm->proto) {
+       case RTE_SECURITY_IPSEC_SA_PROTO_ESP:
+               ctl->ipsec_proto = ROC_IE_SA_PROTOCOL_ESP;
+               break;
+       case RTE_SECURITY_IPSEC_SA_PROTO_AH:
+               return -ENOTSUP;
+       default:
+               return -EINVAL;
+       }
+
+       /* Set mode - transport vs tunnel */
+       switch (ipsec_xfrm->mode) {
+       case RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT:
+               ctl->ipsec_mode = ROC_IE_SA_MODE_TRANSPORT;
+               break;
+       case RTE_SECURITY_IPSEC_SA_MODE_TUNNEL:
+               ctl->ipsec_mode = ROC_IE_SA_MODE_TUNNEL;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       /* Set encryption algorithm */
+       if (crypto_xfrm->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
+               length = crypto_xfrm->aead.key.length;
+
+               switch (crypto_xfrm->aead.algo) {
+               case RTE_CRYPTO_AEAD_AES_GCM:
+                       ctl->enc_type = ROC_IE_ON_SA_ENC_AES_GCM;
+                       ctl->auth_type = ROC_IE_ON_SA_AUTH_NULL;
+                       memcpy(salt, &ipsec_xfrm->salt, 4);
+                       key = crypto_xfrm->aead.key.data;
+                       break;
+               default:
+                       return -ENOTSUP;
+               }
+
+       } else {
+               rc = ipsec_xfrm_verify(ipsec_xfrm, crypto_xfrm);
+               if (rc)
+                       return rc;
+
+               switch (cipher_xfrm->cipher.algo) {
+               case RTE_CRYPTO_CIPHER_AES_CBC:
+                       ctl->enc_type = ROC_IE_ON_SA_ENC_AES_CBC;
+                       break;
+               default:
+                       return -ENOTSUP;
+               }
+
+               switch (auth_xfrm->auth.algo) {
+               case RTE_CRYPTO_AUTH_SHA1_HMAC:
+                       ctl->auth_type = ROC_IE_ON_SA_AUTH_SHA1;
+                       break;
+               default:
+                       return -ENOTSUP;
+               }
+               auth_key_len = auth_xfrm->auth.key.length;
+               if (auth_key_len < 20 || auth_key_len > 64)
+                       return -ENOTSUP;
+
+               key = cipher_xfrm->cipher.key.data;
+               length = cipher_xfrm->cipher.key.length;
+
+               ipsec_hmac_opad_ipad_gen(auth_xfrm, hmac_opad_ipad);
+       }
+
+       switch (length) {
+       case ROC_CPT_AES128_KEY_LEN:
+               ctl->aes_key_len = ROC_IE_SA_AES_KEY_LEN_128;
+               break;
+       case ROC_CPT_AES192_KEY_LEN:
+               ctl->aes_key_len = ROC_IE_SA_AES_KEY_LEN_192;
+               break;
+       case ROC_CPT_AES256_KEY_LEN:
+               ctl->aes_key_len = ROC_IE_SA_AES_KEY_LEN_256;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       memcpy(cipher_key, key, length);
+
+       if (ipsec_xfrm->options.esn)
+               ctl->esn_en = 1;
+
+       ctl->spi = rte_cpu_to_be_32(ipsec_xfrm->spi);
+       return 0;
+}
+
+int
+cnxk_onf_ipsec_inb_sa_fill(struct roc_onf_ipsec_inb_sa *sa,
+                          struct rte_security_ipsec_xform *ipsec_xfrm,
+                          struct rte_crypto_sym_xform *crypto_xfrm)
+{
+       struct roc_ie_onf_sa_ctl *ctl = &sa->ctl;
+       int rc;
+
+       rc = onf_ipsec_sa_common_param_fill(ctl, sa->nonce, sa->cipher_key,
+                                           sa->hmac_key, ipsec_xfrm,
+                                           crypto_xfrm);
+       if (rc)
+               return rc;
+
+       rte_wmb();
+
+       /* Enable SA */
+       ctl->valid = 1;
+       return 0;
+}
+
+int
+cnxk_onf_ipsec_outb_sa_fill(struct roc_onf_ipsec_outb_sa *sa,
+                           struct rte_security_ipsec_xform *ipsec_xfrm,
+                           struct rte_crypto_sym_xform *crypto_xfrm)
+{
+       struct rte_security_ipsec_tunnel_param *tunnel = &ipsec_xfrm->tunnel;
+       struct roc_ie_onf_sa_ctl *ctl = &sa->ctl;
+       int rc;
+
+       /* Fill common params */
+       rc = onf_ipsec_sa_common_param_fill(ctl, sa->nonce, sa->cipher_key,
+                                           sa->hmac_key, ipsec_xfrm,
+                                           crypto_xfrm);
+       if (rc)
+               return rc;
+
+       if (ipsec_xfrm->mode != RTE_SECURITY_IPSEC_SA_MODE_TUNNEL)
+               goto skip_tunnel_info;
+
+       /* Tunnel header info */
+       switch (tunnel->type) {
+       case RTE_SECURITY_IPSEC_TUNNEL_IPV4:
+               memcpy(&sa->ip_src, &tunnel->ipv4.src_ip,
+                      sizeof(struct in_addr));
+               memcpy(&sa->ip_dst, &tunnel->ipv4.dst_ip,
+                      sizeof(struct in_addr));
+               break;
+       case RTE_SECURITY_IPSEC_TUNNEL_IPV6:
+               return -ENOTSUP;
+       default:
+               return -EINVAL;
+       }
+
+skip_tunnel_info:
+       rte_wmb();
+
+       /* Enable SA */
+       ctl->valid = 1;
+       return 0;
+}
+
+bool
+cnxk_onf_ipsec_inb_sa_valid(struct roc_onf_ipsec_inb_sa *sa)
+{
+       return !!sa->ctl.valid;
+}
+
+bool
+cnxk_onf_ipsec_outb_sa_valid(struct roc_onf_ipsec_outb_sa *sa)
+{
+       return !!sa->ctl.valid;
+}
+
 uint8_t
 cnxk_ipsec_ivlen_get(enum rte_crypto_cipher_algorithm c_algo,
                     enum rte_crypto_auth_algorithm a_algo,
@@ -460,6 +880,9 @@ cnxk_ipsec_outb_rlens_get(struct cnxk_ipsec_outb_rlens *rlens,
        partial_len += cnxk_ipsec_icvlen_get(c_algo, a_algo, aead_algo);
        roundup_byte = cnxk_ipsec_outb_roundup_byte(c_algo, aead_algo);
 
+       if (ipsec_xfrm->options.udp_encap)
+               partial_len += sizeof(struct rte_udp_hdr);
+
        rlens->partial_len = partial_len;
        rlens->roundup_len = roundup_len;
        rlens->roundup_byte = roundup_byte;