examples/ipsec-secgw: move IV to crypto op private data

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

diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index 4cc316c..d48b299 100644 (file)
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -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
@@ -90,13 +90,14 @@ struct ip_addr {
        } ip;
 };
 
-#define MAX_KEY_SIZE           20
+#define MAX_KEY_SIZE           32
 
 struct ipsec_sa {
        uint32_t spi;
        uint32_t cdev_id_qp;
+       uint64_t seq;
+       uint32_t salt;
        struct rte_cryptodev_sym_session *crypto_session;
-       uint32_t seq;
        enum rte_crypto_cipher_algorithm cipher_algo;
        enum rte_crypto_auth_algorithm auth_algo;
        uint16_t digest_len;
@@ -112,6 +113,7 @@ struct ipsec_sa {
        uint16_t cipher_key_len;
        uint8_t auth_key[MAX_KEY_SIZE];
        uint16_t auth_key_len;
+       uint16_t aad_len;
        struct rte_crypto_sym_xform *xforms;
 } __rte_cache_aligned;
 
@@ -119,7 +121,8 @@ struct ipsec_mbuf_metadata {
        struct ipsec_sa *sa;
        struct rte_crypto_op cop;
        struct rte_crypto_sym_op sym_cop;
-};
+       uint8_t buf[32];
+} __rte_cache_aligned;
 
 struct cdev_qp {
        uint16_t id;
@@ -157,6 +160,12 @@ struct socket_ctx {
        struct rte_mempool *mbuf_pool;
 };
 
+struct cnt_blk {
+       uint32_t salt;
+       uint64_t iv;
+       uint32_t cnt;
+} __attribute__((packed));
+
 uint16_t
 ipsec_inbound(struct ipsec_ctx *ctx, struct rte_mbuf *pkts[],
                uint16_t nb_pkts, uint16_t len);
@@ -177,6 +186,28 @@ get_priv(struct rte_mbuf *m)
        return RTE_PTR_ADD(m, sizeof(struct rte_mbuf));
 }
 
+static inline void *
+get_cnt_blk(struct rte_mbuf *m)
+{
+       struct ipsec_mbuf_metadata *priv = get_priv(m);
+
+       return &priv->buf[0];
+}
+
+static inline void *
+get_aad(struct rte_mbuf *m)
+{
+       struct ipsec_mbuf_metadata *priv = get_priv(m);
+
+       return &priv->buf[16];
+}
+
+static inline void *
+get_sym_cop(struct rte_crypto_op *cop)
+{
+       return (cop + 1);
+}
+
 int
 inbound_sa_check(struct sa_ctx *sa_ctx, struct rte_mbuf *m, uint32_t sa_idx);