examples/ipsec-secgw: fix IPv6 payload length
[dpdk.git] / examples / ipsec-secgw / esp.c
index e1fde36..063e63f 100644 (file)
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2016 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2016-2017 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,6 @@
 #include <unistd.h>
 
 #include <rte_common.h>
-#include <rte_memcpy.h>
 #include <rte_crypto.h>
 #include <rte_cryptodev.h>
 #include <rte_random.h>
 #include "esp.h"
 #include "ipip.h"
 
-static inline void
-random_iv_u64(uint64_t *buf, uint16_t n)
-{
-       uint32_t left = n & 0x7;
-       uint32_t i;
-
-       RTE_ASSERT((n & 0x3) == 0);
-
-       for (i = 0; i < (n >> 3); i++)
-               buf[i] = rte_rand();
-
-       if (left)
-               *((uint32_t *)&buf[i]) = (uint32_t)lrand48();
-}
-
 int
 esp_inbound(struct rte_mbuf *m, struct ipsec_sa *sa,
                struct rte_crypto_op *cop)
 {
-       int32_t payload_len, ip_hdr_len;
+       struct ip *ip4;
        struct rte_crypto_sym_op *sym_cop;
+       int32_t payload_len, ip_hdr_len;
 
        RTE_ASSERT(m != NULL);
        RTE_ASSERT(sa != NULL);
        RTE_ASSERT(cop != NULL);
 
-       ip_hdr_len = 0;
-       switch (sa->flags) {
-       case IP4_TUNNEL:
-               ip_hdr_len = sizeof(struct ip);
-               break;
-       case IP6_TUNNEL:
+       ip4 = rte_pktmbuf_mtod(m, struct ip *);
+       if (likely(ip4->ip_v == IPVERSION))
+               ip_hdr_len = ip4->ip_hl * 4;
+       else if (ip4->ip_v == IP6_VERSION)
+               /* XXX No option headers supported */
                ip_hdr_len = sizeof(struct ip6_hdr);
-               break;
+       else {
+               RTE_LOG(ERR, IPSEC_ESP, "invalid IP packet type %d\n",
+                               ip4->ip_v);
+               return -EINVAL;
        }
 
        payload_len = rte_pktmbuf_pkt_len(m) - ip_hdr_len -
                sizeof(struct esp_hdr) - sa->iv_len - sa->digest_len;
 
        if ((payload_len & (sa->block_size - 1)) || (payload_len <= 0)) {
-               RTE_LOG(DEBUG, IPSEC_ESP, "payload %d not multiple of %u\n",
+               RTE_LOG_DP(DEBUG, IPSEC_ESP, "payload %d not multiple of %u\n",
                                payload_len, sa->block_size);
                return -EINVAL;
        }
 
-       sym_cop = (struct rte_crypto_sym_op *)(cop + 1);
-
+       sym_cop = get_sym_cop(cop);
        sym_cop->m_src = m;
-       sym_cop->cipher.data.offset =  ip_hdr_len + sizeof(struct esp_hdr) +
-               sa->iv_len;
-       sym_cop->cipher.data.length = payload_len;
 
-       sym_cop->cipher.iv.data = rte_pktmbuf_mtod_offset(m, void*,
-                        ip_hdr_len + sizeof(struct esp_hdr));
-       sym_cop->cipher.iv.phys_addr = rte_pktmbuf_mtophys_offset(m,
-                        ip_hdr_len + sizeof(struct esp_hdr));
-       sym_cop->cipher.iv.length = sa->iv_len;
+       if (sa->aead_algo == RTE_CRYPTO_AEAD_AES_GCM) {
+               sym_cop->aead.data.offset =  ip_hdr_len + sizeof(struct esp_hdr) +
+                       sa->iv_len;
+               sym_cop->aead.data.length = payload_len;
+
+               struct cnt_blk *icb;
+               uint8_t *aad;
+               uint8_t *iv = RTE_PTR_ADD(ip4, ip_hdr_len + sizeof(struct esp_hdr));
+
+               icb = get_cnt_blk(m);
+               icb->salt = sa->salt;
+               memcpy(&icb->iv, iv, 8);
+               icb->cnt = rte_cpu_to_be_32(1);
+
+               aad = get_aad(m);
+               memcpy(aad, iv - sizeof(struct esp_hdr), 8);
+               sym_cop->aead.aad.data = aad;
+               sym_cop->aead.aad.phys_addr = rte_pktmbuf_mtophys_offset(m,
+                               aad - rte_pktmbuf_mtod(m, uint8_t *));
+
+               sym_cop->aead.digest.data = rte_pktmbuf_mtod_offset(m, void*,
+                               rte_pktmbuf_pkt_len(m) - sa->digest_len);
+               sym_cop->aead.digest.phys_addr = rte_pktmbuf_mtophys_offset(m,
+                               rte_pktmbuf_pkt_len(m) - sa->digest_len);
+       } else {
+               sym_cop->cipher.data.offset =  ip_hdr_len + sizeof(struct esp_hdr) +
+                       sa->iv_len;
+               sym_cop->cipher.data.length = payload_len;
+
+               struct cnt_blk *icb;
+               uint8_t *iv = RTE_PTR_ADD(ip4, ip_hdr_len + sizeof(struct esp_hdr));
+               uint8_t *iv_ptr = rte_crypto_op_ctod_offset(cop,
+                                       uint8_t *, IV_OFFSET);
+
+               switch (sa->cipher_algo) {
+               case RTE_CRYPTO_CIPHER_NULL:
+               case RTE_CRYPTO_CIPHER_AES_CBC:
+                       /* Copy IV at the end of crypto operation */
+                       rte_memcpy(iv_ptr, iv, sa->iv_len);
+                       break;
+               case RTE_CRYPTO_CIPHER_AES_CTR:
+                       icb = get_cnt_blk(m);
+                       icb->salt = sa->salt;
+                       memcpy(&icb->iv, iv, 8);
+                       icb->cnt = rte_cpu_to_be_32(1);
+                       break;
+               default:
+                       RTE_LOG(ERR, IPSEC_ESP, "unsupported cipher algorithm %u\n",
+                                       sa->cipher_algo);
+                       return -EINVAL;
+               }
 
-       sym_cop->auth.data.offset = ip_hdr_len;
-       sym_cop->auth.data.length = sizeof(struct esp_hdr) +
-               sa->iv_len + payload_len;
+               switch (sa->auth_algo) {
+               case RTE_CRYPTO_AUTH_NULL:
+               case RTE_CRYPTO_AUTH_SHA1_HMAC:
+               case RTE_CRYPTO_AUTH_SHA256_HMAC:
+                       sym_cop->auth.data.offset = ip_hdr_len;
+                       sym_cop->auth.data.length = sizeof(struct esp_hdr) +
+                               sa->iv_len + payload_len;
+                       break;
+               default:
+                       RTE_LOG(ERR, IPSEC_ESP, "unsupported auth algorithm %u\n",
+                                       sa->auth_algo);
+                       return -EINVAL;
+               }
 
-       sym_cop->auth.digest.data = rte_pktmbuf_mtod_offset(m, void*,
-                       rte_pktmbuf_pkt_len(m) - sa->digest_len);
-       sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(m,
-                       rte_pktmbuf_pkt_len(m) - sa->digest_len);
-       sym_cop->auth.digest.length = sa->digest_len;
+               sym_cop->auth.digest.data = rte_pktmbuf_mtod_offset(m, void*,
+                               rte_pktmbuf_pkt_len(m) - sa->digest_len);
+               sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(m,
+                               rte_pktmbuf_pkt_len(m) - sa->digest_len);
+       }
 
        return 0;
 }
@@ -126,6 +165,8 @@ int
 esp_inbound_post(struct rte_mbuf *m, struct ipsec_sa *sa,
                struct rte_crypto_op *cop)
 {
+       struct ip *ip4, *ip;
+       struct ip6_hdr *ip6;
        uint8_t *nexthdr, *pad_len;
        uint8_t *padding;
        uint16_t i;
@@ -135,7 +176,7 @@ esp_inbound_post(struct rte_mbuf *m, struct ipsec_sa *sa,
        RTE_ASSERT(cop != NULL);
 
        if (cop->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
-               RTE_LOG(ERR, IPSEC_ESP, "Failed crypto op\n");
+               RTE_LOG(ERR, IPSEC_ESP, "failed crypto op\n");
                return -1;
        }
 
@@ -146,7 +187,7 @@ esp_inbound_post(struct rte_mbuf *m, struct ipsec_sa *sa,
        padding = pad_len - *pad_len;
        for (i = 0; i < *pad_len; i++) {
                if (padding[i] != i + 1) {
-                       RTE_LOG(ERR, IPSEC_ESP, "invalid pad_len field\n");
+                       RTE_LOG(ERR, IPSEC_ESP, "invalid padding\n");
                        return -EINVAL;
                }
        }
@@ -157,7 +198,24 @@ esp_inbound_post(struct rte_mbuf *m, struct ipsec_sa *sa,
                return -EINVAL;
        }
 
-       ipip_inbound(m, sizeof(struct esp_hdr) + sa->iv_len);
+       if (unlikely(sa->flags == TRANSPORT)) {
+               ip = rte_pktmbuf_mtod(m, struct ip *);
+               ip4 = (struct ip *)rte_pktmbuf_adj(m,
+                               sizeof(struct esp_hdr) + sa->iv_len);
+               if (likely(ip->ip_v == IPVERSION)) {
+                       memmove(ip4, ip, ip->ip_hl * 4);
+                       ip4->ip_p = *nexthdr;
+                       ip4->ip_len = htons(rte_pktmbuf_data_len(m));
+               } else {
+                       ip6 = (struct ip6_hdr *)ip4;
+                       /* XXX No option headers supported */
+                       memmove(ip6, ip, sizeof(struct ip6_hdr));
+                       ip6->ip6_nxt = *nexthdr;
+                       ip6->ip6_plen = htons(rte_pktmbuf_data_len(m) -
+                                             sizeof(struct ip6_hdr));
+               }
+       } else
+               ipip_inbound(m, sizeof(struct esp_hdr) + sa->iv_len);
 
        return 0;
 }
@@ -166,31 +224,57 @@ int
 esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
                struct rte_crypto_op *cop)
 {
-       uint16_t pad_payload_len, pad_len, ip_hdr_len;
        struct ip *ip4;
        struct ip6_hdr *ip6;
-       struct esp_hdr *esp;
-       int32_t i;
-       char *padding;
+       struct esp_hdr *esp = NULL;
+       uint8_t *padding, *new_ip, nlp;
        struct rte_crypto_sym_op *sym_cop;
+       int32_t i;
+       uint16_t pad_payload_len, pad_len, ip_hdr_len;
 
        RTE_ASSERT(m != NULL);
        RTE_ASSERT(sa != NULL);
        RTE_ASSERT(cop != NULL);
 
-       /* Payload length */
-       pad_payload_len = RTE_ALIGN_CEIL(rte_pktmbuf_pkt_len(m) + 2,
-                       sa->block_size);
-       pad_len = pad_payload_len - rte_pktmbuf_pkt_len(m);
-
        ip_hdr_len = 0;
-       switch (sa->flags) {
-       case IP4_TUNNEL:
+
+       ip4 = rte_pktmbuf_mtod(m, struct ip *);
+       if (likely(ip4->ip_v == IPVERSION)) {
+               if (unlikely(sa->flags == TRANSPORT)) {
+                       ip_hdr_len = ip4->ip_hl * 4;
+                       nlp = ip4->ip_p;
+               } else
+                       nlp = IPPROTO_IPIP;
+       } else if (ip4->ip_v == IP6_VERSION) {
+               if (unlikely(sa->flags == TRANSPORT)) {
+                       /* XXX No option headers supported */
+                       ip_hdr_len = sizeof(struct ip6_hdr);
+                       ip6 = (struct ip6_hdr *)ip4;
+                       nlp = ip6->ip6_nxt;
+               } else
+                       nlp = IPPROTO_IPV6;
+       } else {
+               RTE_LOG(ERR, IPSEC_ESP, "invalid IP packet type %d\n",
+                               ip4->ip_v);
+               return -EINVAL;
+       }
+
+       /* Padded payload length */
+       pad_payload_len = RTE_ALIGN_CEIL(rte_pktmbuf_pkt_len(m) -
+                       ip_hdr_len + 2, sa->block_size);
+       pad_len = pad_payload_len + ip_hdr_len - rte_pktmbuf_pkt_len(m);
+
+       RTE_ASSERT(sa->flags == IP4_TUNNEL || sa->flags == IP6_TUNNEL ||
+                       sa->flags == TRANSPORT);
+
+       if (likely(sa->flags == IP4_TUNNEL))
                ip_hdr_len = sizeof(struct ip);
-               break;
-       case IP6_TUNNEL:
+       else if (sa->flags == IP6_TUNNEL)
                ip_hdr_len = sizeof(struct ip6_hdr);
-               break;
+       else if (sa->flags != TRANSPORT) {
+               RTE_LOG(ERR, IPSEC_ESP, "Unsupported SA flags: 0x%x\n",
+                               sa->flags);
+               return -EINVAL;
        }
 
        /* Check maximum packet size */
@@ -200,7 +284,7 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
                return -EINVAL;
        }
 
-       padding = rte_pktmbuf_append(m, pad_len + sa->digest_len);
+       padding = (uint8_t *)rte_pktmbuf_append(m, pad_len + sa->digest_len);
        if (unlikely(padding == NULL)) {
                RTE_LOG(ERR, IPSEC_ESP, "not enough mbuf trailing space\n");
                return -ENOSPC;
@@ -218,51 +302,112 @@ esp_outbound(struct rte_mbuf *m, struct ipsec_sa *sa,
                                &sa->src, &sa->dst);
                esp = (struct esp_hdr *)(ip6 + 1);
                break;
-       default:
-               RTE_LOG(ERR, IPSEC_ESP, "Unsupported SA flags: 0x%x\n",
-                               sa->flags);
-               return -EINVAL;
+       case TRANSPORT:
+               new_ip = (uint8_t *)rte_pktmbuf_prepend(m,
+                               sizeof(struct esp_hdr) + sa->iv_len);
+               memmove(new_ip, ip4, ip_hdr_len);
+               esp = (struct esp_hdr *)(new_ip + ip_hdr_len);
+               ip4 = (struct ip *)new_ip;
+               if (likely(ip4->ip_v == IPVERSION)) {
+                       ip4->ip_p = IPPROTO_ESP;
+                       ip4->ip_len = htons(rte_pktmbuf_data_len(m));
+               } else {
+                       ip6 = (struct ip6_hdr *)new_ip;
+                       ip6->ip6_nxt = IPPROTO_ESP;
+                       ip6->ip6_plen = htons(rte_pktmbuf_data_len(m) -
+                                             sizeof(struct ip6_hdr));
+               }
        }
 
        sa->seq++;
        esp->spi = rte_cpu_to_be_32(sa->spi);
-       esp->seq = rte_cpu_to_be_32(sa->seq);
+       esp->seq = rte_cpu_to_be_32((uint32_t)sa->seq);
 
-       if (sa->cipher_algo == RTE_CRYPTO_CIPHER_AES_CBC)
-               random_iv_u64((uint64_t *)(esp + 1), sa->iv_len);
+       uint64_t *iv = (uint64_t *)(esp + 1);
 
-       /* Fill pad_len using default sequential scheme */
-       for (i = 0; i < pad_len - 2; i++)
-               padding[i] = i + 1;
-       padding[pad_len - 2] = pad_len - 2;
+       sym_cop = get_sym_cop(cop);
+       sym_cop->m_src = m;
 
-       if (RTE_ETH_IS_IPV4_HDR(m->packet_type))
-               padding[pad_len - 1] = IPPROTO_IPIP;
-       else
-               padding[pad_len - 1] = IPPROTO_IPV6;
+       if (sa->aead_algo == RTE_CRYPTO_AEAD_AES_GCM) {
+               uint8_t *aad;
 
-       sym_cop = (struct rte_crypto_sym_op *)(cop + 1);
+               *iv = sa->seq;
+               sym_cop->aead.data.offset = ip_hdr_len +
+                       sizeof(struct esp_hdr) + sa->iv_len;
+               sym_cop->aead.data.length = pad_payload_len;
 
-       sym_cop->m_src = m;
-       sym_cop->cipher.data.offset = ip_hdr_len + sizeof(struct esp_hdr) +
-                       sa->iv_len;
-       sym_cop->cipher.data.length = pad_payload_len;
+               /* Fill pad_len using default sequential scheme */
+               for (i = 0; i < pad_len - 2; i++)
+                       padding[i] = i + 1;
+               padding[pad_len - 2] = pad_len - 2;
+               padding[pad_len - 1] = nlp;
 
-       sym_cop->cipher.iv.data = rte_pktmbuf_mtod_offset(m, uint8_t *,
-                        ip_hdr_len + sizeof(struct esp_hdr));
-       sym_cop->cipher.iv.phys_addr = rte_pktmbuf_mtophys_offset(m,
-                        ip_hdr_len + sizeof(struct esp_hdr));
-       sym_cop->cipher.iv.length = sa->iv_len;
+               struct cnt_blk *icb = get_cnt_blk(m);
+               icb->salt = sa->salt;
+               icb->iv = sa->seq;
+               icb->cnt = rte_cpu_to_be_32(1);
 
-       sym_cop->auth.data.offset = ip_hdr_len;
-       sym_cop->auth.data.length = sizeof(struct esp_hdr) + sa->iv_len +
-               pad_payload_len;
+               aad = get_aad(m);
+               memcpy(aad, esp, 8);
+               sym_cop->aead.aad.data = aad;
+               sym_cop->aead.aad.phys_addr = rte_pktmbuf_mtophys_offset(m,
+                               aad - rte_pktmbuf_mtod(m, uint8_t *));
 
-       sym_cop->auth.digest.data = rte_pktmbuf_mtod_offset(m, uint8_t *,
+               sym_cop->aead.digest.data = rte_pktmbuf_mtod_offset(m, uint8_t *,
                        rte_pktmbuf_pkt_len(m) - sa->digest_len);
-       sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(m,
+               sym_cop->aead.digest.phys_addr = rte_pktmbuf_mtophys_offset(m,
                        rte_pktmbuf_pkt_len(m) - sa->digest_len);
-       sym_cop->auth.digest.length = sa->digest_len;
+       } else {
+               switch (sa->cipher_algo) {
+               case RTE_CRYPTO_CIPHER_NULL:
+               case RTE_CRYPTO_CIPHER_AES_CBC:
+                       memset(iv, 0, sa->iv_len);
+                       sym_cop->cipher.data.offset = ip_hdr_len +
+                               sizeof(struct esp_hdr);
+                       sym_cop->cipher.data.length = pad_payload_len + sa->iv_len;
+                       break;
+               case RTE_CRYPTO_CIPHER_AES_CTR:
+                       *iv = sa->seq;
+                       sym_cop->cipher.data.offset = ip_hdr_len +
+                               sizeof(struct esp_hdr) + sa->iv_len;
+                       sym_cop->cipher.data.length = pad_payload_len;
+                       break;
+               default:
+                       RTE_LOG(ERR, IPSEC_ESP, "unsupported cipher algorithm %u\n",
+                                       sa->cipher_algo);
+                       return -EINVAL;
+               }
+
+               /* Fill pad_len using default sequential scheme */
+               for (i = 0; i < pad_len - 2; i++)
+                       padding[i] = i + 1;
+               padding[pad_len - 2] = pad_len - 2;
+               padding[pad_len - 1] = nlp;
+
+               struct cnt_blk *icb = get_cnt_blk(m);
+               icb->salt = sa->salt;
+               icb->iv = sa->seq;
+               icb->cnt = rte_cpu_to_be_32(1);
+
+               switch (sa->auth_algo) {
+               case RTE_CRYPTO_AUTH_NULL:
+               case RTE_CRYPTO_AUTH_SHA1_HMAC:
+               case RTE_CRYPTO_AUTH_SHA256_HMAC:
+                       sym_cop->auth.data.offset = ip_hdr_len;
+                       sym_cop->auth.data.length = sizeof(struct esp_hdr) +
+                               sa->iv_len + pad_payload_len;
+                       break;
+               default:
+                       RTE_LOG(ERR, IPSEC_ESP, "unsupported auth algorithm %u\n",
+                                       sa->auth_algo);
+                       return -EINVAL;
+               }
+
+               sym_cop->auth.digest.data = rte_pktmbuf_mtod_offset(m, uint8_t *,
+                               rte_pktmbuf_pkt_len(m) - sa->digest_len);
+               sym_cop->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(m,
+                               rte_pktmbuf_pkt_len(m) - sa->digest_len);
+       }
 
        return 0;
 }