app/testpmd: register a specific log type

[dpdk.git] / lib / librte_cryptodev / rte_crypto.h

diff --git a/lib/librte_cryptodev/rte_crypto.h b/lib/librte_cryptodev/rte_crypto.h
index dd17020..3d672fe 100644 (file)
--- a/lib/librte_cryptodev/rte_crypto.h
+++ b/lib/librte_cryptodev/rte_crypto.h
@@ -66,8 +66,6 @@ enum rte_crypto_op_status {
        /**< Operation completed successfully */
        RTE_CRYPTO_OP_STATUS_NOT_PROCESSED,
        /**< Operation has not yet been processed by a crypto device */
-       RTE_CRYPTO_OP_STATUS_ENQUEUED,
-       /**< Operation is enqueued on device */
        RTE_CRYPTO_OP_STATUS_AUTH_FAILED,
        /**< Authentication verification failed */
        RTE_CRYPTO_OP_STATUS_INVALID_SESSION,
@@ -88,7 +86,8 @@ enum rte_crypto_op_status {
  */
 enum rte_crypto_op_sess_type {
        RTE_CRYPTO_OP_WITH_SESSION,     /**< Session based crypto operation */
-       RTE_CRYPTO_OP_SESSIONLESS       /**< Session-less crypto operation */
+       RTE_CRYPTO_OP_SESSIONLESS,      /**< Session-less crypto operation */
+       RTE_CRYPTO_OP_SECURITY_SESSION  /**< Security session crypto operation */
 };
 
 /**
@@ -119,18 +118,15 @@ struct rte_crypto_op {
        struct rte_mempool *mempool;
        /**< crypto operation mempool which operation is allocated from */
 
-       phys_addr_t phys_addr;
+       rte_iova_t phys_addr;
        /**< physical address of crypto operation */
 
-       void *opaque_data;
-       /**< Opaque pointer for user data */
-
        RTE_STD_C11
        union {
-               struct rte_crypto_sym_op *sym;
+               struct rte_crypto_sym_op sym[0];
                /**< Symmetric operation parameters */
        }; /**< operation specific parameters */
-} __rte_cache_aligned;
+};
 
 /**
  * Reset the fields of a crypto operation to their default values.
@@ -147,19 +143,12 @@ __rte_crypto_op_reset(struct rte_crypto_op *op, enum rte_crypto_op_type type)
 
        switch (type) {
        case RTE_CRYPTO_OP_TYPE_SYMMETRIC:
-               /** Symmetric operation structure starts after the end of the
-                * rte_crypto_op structure.
-                */
-               op->sym = (struct rte_crypto_sym_op *)(op + 1);
-               op->type = type;
-
                __rte_crypto_sym_op_reset(op->sym);
                break;
+       case RTE_CRYPTO_OP_TYPE_UNDEFINED:
        default:
                break;
        }
-
-       op->opaque_data = NULL;
 }
 
 /**
@@ -279,8 +268,9 @@ rte_crypto_op_alloc(struct rte_mempool *mempool, enum rte_crypto_op_type type)
  * @param      nb_ops  Number of crypto operations to allocate
  *
  * @returns
- * - On success returns a valid rte_crypto_op structure
- * - On failure returns NULL
+ * - nb_ops if the number of operations requested were allocated.
+ * - 0 if the requested number of ops are not available.
+ *   None are allocated in this case.
  */
 
 static inline unsigned