crypto/ccp: aes-gcm driver bug fix
Subsystems (2)
PATCH 1/1 crypto/ccp: aes-gcm driver bug fix
fixes ccp crypto driver to make aes-gcm output match with openssl/NIST output
--- drivers/crypto/ccp/ccp_crypto.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/crypto/ccp/ccp_crypto.c +11 -10
@@ -1515,8 +1515,8 @@ ccp_perform_passthru(struct ccp_passthru *pst,CCP_CMD_SOC (desc) =0 ;CCP_CMD_IOC (desc) =0 ; -CCP_CMD_INIT (desc) =0 ; -CCP_CMD_EOM (desc) =0 ; +CCP_CMD_INIT (desc) =1 ; +CCP_CMD_EOM (desc) =1 ;CCP_CMD_PROT (desc) =0 ; function.raw =0 ;
@@ -2383,7 +2383,7 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct ccp_queue *cmd_q) op->sym->session, ccp_cryptodev_driver_id); iv = rte_crypto_op_ctod_offset(op, uint8_t *, session->iv.offset); - key_addr = session->cipher.key_phys; + key_addr = (phys_addr_t )rte_mem_virt2phy (session->cipher.key_ccp); src_addr =rte_pktmbuf_mtophys_offset (op->sym->m_src, op->sym->aead.data.offset);
@@ -2393,7 +2393,8 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct ccp_queue *cmd_q)else dest_addr = src_addr;rte_pktmbuf_append (op->sym->m_src, session->auth.ctx_len); - digest_dest_addr = op->sym->aead.digest.phys_addr; + digest_dest_addr = + (phys_addr_t )rte_mem_virt2phy (op->sym->aead.digest.data); temp = (uint64_t *)(op->sym->aead.digest.data +AES_BLOCK_SIZE ); *temp++ =rte_bswap64 (session->auth.aad_length <<3 ); *temp =rte_bswap64 (op->sym->aead.data.length <<3 );
@@ -2401,10 +2402,10 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct ccp_queue *cmd_q) non_align_len = op->sym->aead.data.length %AES_BLOCK_SIZE ; length =CCP_ALIGN (op->sym->aead.data.length,AES_BLOCK_SIZE ); - aad_addr = op->sym->aead.aad.phys_addr; + aad_addr = (phys_addr_t )rte_mem_virt2phy (op->sym->aead.aad.data);/* CMD1 IV Passthru */ -rte_memcpy (session->cipher.nonce +AES_BLOCK_SIZE , iv, +rte_memcpy (session->cipher.nonce, iv, session->iv.length); pst.src_addr = session->cipher.nonce_phys; pst.dest_addr = (phys_addr_t)(cmd_q->sb_iv *CCP_SB_BYTES );
@@ -2512,12 +2513,12 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct ccp_queue *cmd_q)/* Last block (AAD_len || PT_len)*/ CCP_CMD_LEN (desc) =AES_BLOCK_SIZE ; -CCP_CMD_SRC_LO (desc) = ((uint32_t )digest_dest_addr +AES_BLOCK_SIZE ); -CCP_CMD_SRC_HI (desc) =high32_value (digest_dest_addr +AES_BLOCK_SIZE ); +CCP_CMD_SRC_LO (desc) = ((uint32_t )digest_dest_addr); +CCP_CMD_SRC_HI (desc) =high32_value (digest_dest_addr);CCP_CMD_SRC_MEM (desc) =CCP_MEMTYPE_SYSTEM ; -CCP_CMD_DST_LO (desc) = ((uint32_t )digest_dest_addr); -CCP_CMD_DST_HI (desc) =high32_value (digest_dest_addr); +CCP_CMD_DST_LO (desc) = ((uint32_t )digest_dest_addr +AES_BLOCK_SIZE ); +CCP_CMD_DST_HI (desc) =high32_value (digest_dest_addr +AES_BLOCK_SIZE );CCP_CMD_SRC_MEM (desc) =CCP_MEMTYPE_SYSTEM ;CCP_CMD_KEY_LO (desc) = ((uint32_t )key_addr);
Signature · 1 line
2.17.1
[AMD Official Use Only - Internal Distribution Only]
Looks good to me.
Regards,
Ravi
Quoted 84 lines
-----Original Message-----
From: dev <[email protected]> On Behalf Of Selwin Sebastian
Sent: Tuesday, December 31, 2019 12:38 AM
To: [email protected]
Cc: Sebastian, Selwin <[email protected]>
Subject: [dpdk-dev] [PATCH v1]crypto/ccp: aes-gcm driver bug fix[CAUTION: External Email]
fixes ccp crypto driver to make aes-gcm output match with openssl/NIST output
Signed-off-by Selwin Sebastian <[email protected]>---
drivers/crypto/ccp/ccp_crypto.c| 21 +++++++++++----------1 file changed, 11 insertions(+), 10 deletions(-)drivers/crypto/ccp/ccp_crypto.c +15
-11@@ -1515,8 +1515,8 @@ ccp_perform_passthru(struct ccp_passthru *pst,CCP_CMD_SOC (desc) =0 ;CCP_CMD_IOC (desc) =0 ; -CCP_CMD_INIT (desc) =0 ; -CCP_CMD_EOM (desc) =0 ; +CCP_CMD_INIT (desc) =1 ; +CCP_CMD_EOM (desc) =1 ;CCP_CMD_PROT (desc) =0 ; function.raw =0 ;@@ -2383,7 +2383,7 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct ccp_queue *cmd_q) op->sym->session, ccp_cryptodev_driver_id); iv = rte_crypto_op_ctod_offset(op, uint8_t *, session->iv.offset); - key_addr = session->cipher.key_phys; + key_addr = + (phys_addr_t )rte_mem_virt2phy (session->cipher.key_ccp); src_addr =rte_pktmbuf_mtophys_offset (op->sym->m_src, op->sym->aead.data.offset); @@ -2393,7 +2393,8 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct ccp_queue *cmd_q) else dest_addr = src_addr;rte_pktmbuf_append (op->sym->m_src, session->auth.ctx_len); - digest_dest_addr = op->sym->aead.digest.phys_addr; + digest_dest_addr = + + (phys_addr_t )rte_mem_virt2phy (op->sym->aead.digest.data); temp = (uint64_t *)(op->sym->aead.digest.data +AES_BLOCK_SIZE ); *temp++ =rte_bswap64 (session->auth.aad_length <<3 ); *temp = rte_bswap64(op->sym->aead.data.length << 3); @@ -2401,10 +2402,10 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct ccp_queue *cmd_q) non_align_len = op->sym->aead.data.length %AES_BLOCK_SIZE ; length =CCP_ALIGN (op->sym->aead.data.length,AES_BLOCK_SIZE ); - aad_addr = op->sym->aead.aad.phys_addr; + aad_addr = + (phys_addr_t )rte_mem_virt2phy (op->sym->aead.aad.data);/* CMD1 IV Passthru */ -rte_memcpy (session->cipher.nonce +AES_BLOCK_SIZE , iv, +rte_memcpy (session->cipher.nonce, iv, session->iv.length); pst.src_addr = session->cipher.nonce_phys; pst.dest_addr = (phys_addr_t)(cmd_q->sb_iv * CCP_SB_BYTES); @@ -2512,12 +2513,12 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct ccp_queue *cmd_q)/* Last block (AAD_len || PT_len)*/ CCP_CMD_LEN (desc) =AES_BLOCK_SIZE ; -CCP_CMD_SRC_LO (desc) = ((uint32_t )digest_dest_addr +AES_BLOCK_SIZE ); -CCP_CMD_SRC_HI (desc) =high32_value (digest_dest_addr +AES_BLOCK_SIZE ); +CCP_CMD_SRC_LO (desc) = ((uint32_t )digest_dest_addr); +CCP_CMD_SRC_HI (desc) =high32_value (digest_dest_addr);CCP_CMD_SRC_MEM (desc) =CCP_MEMTYPE_SYSTEM ; -CCP_CMD_DST_LO (desc) = ((uint32_t )digest_dest_addr); -CCP_CMD_DST_HI (desc) =high32_value (digest_dest_addr); +CCP_CMD_DST_LO (desc) = ((uint32_t )digest_dest_addr +AES_BLOCK_SIZE ); +CCP_CMD_DST_HI (desc) =high32_value (digest_dest_addr + +AES_BLOCK_SIZE );CCP_CMD_SRC_MEM (desc) =CCP_MEMTYPE_SYSTEM ;CCP_CMD_KEY_LO (desc) = ((uint32_t )key_addr); --2.17.1
Quoted 6 lines
Looks good to me.
Acked-by Ravi Kumar <[email protected]>
Quoted 10 lines
Regards,
RaviQuoted 4 lines
fixes ccp crypto driver to make aes-gcm output match with openssl/NIST
output
Quoted 3 lines
Signed-off-by Selwin Sebastian <[email protected]>---
Please mention commit id for the original patch for which this fix is submitted. "Fixes: <12 digits of commit id> ("patch title")"
Title should be in format "crypto/ccp: fix ....."
Also explain the issue briefly in description and cc [email protected]