crypto/armv8: do not append digest

When performing an authentication verification,
the PMD was using memory at the end of the input buffer,
to store temporarily the digest.
This operation requires the buffer to have enough
tailroom unnecessarily.
Instead, memory is allocated for each queue pair, to store
temporarily the digest generated by the driver, so it can
be compared with the one provided in the crypto operation,
without needing to touch the input buffer.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>

diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
index b0d68d10ae52ef6b18e8c031e2b5cc53deaa350a..dbe6bee5799dad021840f77c0d8a39d7abaeaad0 100644 (file)
--- a/drivers/crypto/armv8/rte_armv8_pmd.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
@@ -575,8 +575,8 @@ get_session(struct armv8_crypto_qp *qp, struct rte_crypto_op *op)
 
 /** Process cipher operation */
 static inline void
-process_armv8_chained_op
-               (struct rte_crypto_op *op, struct armv8_crypto_session *sess,
+process_armv8_chained_op(struct armv8_crypto_qp *qp, struct rte_crypto_op *op,
+               struct armv8_crypto_session *sess,
                struct rte_mbuf *mbuf_src, struct rte_mbuf *mbuf_dst)
 {
        crypto_func_t crypto_func;
@@ -633,8 +633,7 @@ process_armv8_chained_op
                                        op->sym->auth.data.length);
                }
        } else {
-               adst = (uint8_t *)rte_pktmbuf_append(m_asrc,
-                               sess->auth.digest_length);
+               adst = qp->temp_digest;
        }
 
        arg.cipher.iv = rte_crypto_op_ctod_offset(op, uint8_t *,
@@ -655,15 +654,12 @@ process_armv8_chained_op
                                sess->auth.digest_length) != 0) {
                        op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
                }
-               /* Trim area used for digest from mbuf. */
-               rte_pktmbuf_trim(m_asrc,
-                               sess->auth.digest_length);
        }
 }
 
 /** Process crypto operation for mbuf */
 static inline int
-process_op(const struct armv8_crypto_qp *qp, struct rte_crypto_op *op,
+process_op(struct armv8_crypto_qp *qp, struct rte_crypto_op *op,
                struct armv8_crypto_session *sess)
 {
        struct rte_mbuf *msrc, *mdst;
@@ -676,7 +672,7 @@ process_op(const struct armv8_crypto_qp *qp, struct rte_crypto_op *op,
        switch (sess->chain_order) {
        case ARMV8_CRYPTO_CHAIN_CIPHER_AUTH:
        case ARMV8_CRYPTO_CHAIN_AUTH_CIPHER: /* Fall through */
-               process_armv8_chained_op(op, sess, msrc, mdst);
+               process_armv8_chained_op(qp, op, sess, msrc, mdst);
                break;
        default:
                op->status = RTE_CRYPTO_OP_STATUS_ERROR;

diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h
index d02992a6481ecaa3aaf80c9783fad0e8f8718969..fa31f0a01c4c60b945b13aaf66107a2ae5513f8a 100644 (file)
--- a/drivers/crypto/armv8/rte_armv8_pmd_private.h
+++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h
@@ -69,6 +69,9 @@ do {                                                          \
 #define NBBY           8               /* Number of bits in a byte */
 #define BYTE_LENGTH(x) ((x) / NBBY)    /* Number of bytes in x (round down) */
 
+/* Maximum length for digest (SHA-256 needs 32 bytes) */
+#define DIGEST_LENGTH_MAX 32
+
 /** ARMv8 operation order mode enumerator */
 enum armv8_crypto_chain_order {
        ARMV8_CRYPTO_CHAIN_CIPHER_AUTH,
@@ -147,6 +150,11 @@ struct armv8_crypto_qp {
        /**< Queue pair statistics */
        char name[RTE_CRYPTODEV_NAME_LEN];
        /**< Unique Queue Pair Name */
+       uint8_t temp_digest[DIGEST_LENGTH_MAX];
+       /**< Buffer used to store the digest generated
+        * by the driver when verifying a digest provided
+        * by the user (using authentication verify operation)
+        */
 } __rte_cache_aligned;
 
 /** ARMv8 crypto private session structure */