[v2] crypto/octeontx2: fix lookaside IPsec IV pointer

Message ID 20210716104447.5313-1-ktejasree@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series [v2] crypto/octeontx2: fix lookaside IPsec IV pointer |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/github-robot success github build: passed
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS

Commit Message

Tejasree Kondoj July 16, 2021, 10:44 a.m. UTC
  Fixing IV pointer population in lookaside IPsec
outbound instruction.

Fixes: fab634eb87ca ("crypto/octeontx2: support security session data path")

Signed-off-by: Tejasree Kondoj <ktejasree@marvell.com>
---
v2:
* Fixed unused variable warning

 drivers/crypto/octeontx2/otx2_ipsec_po_ops.h | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
  

Comments

Akhil Goyal July 18, 2021, 8:57 a.m. UTC | #1
> Fixing IV pointer population in lookaside IPsec
> outbound instruction.
> 
> Fixes: fab634eb87ca ("crypto/octeontx2: support security session data path")
> 
> Signed-off-by: Tejasree Kondoj <ktejasree@marvell.com>
> ---
> v2:
> * Fixed unused variable warning
Acked-by: Akhil Goyal <gakhil@marvell.com>

Applied to dpdk-next-crypto

Thanks.
  
Akhil Goyal July 18, 2021, 9:01 a.m. UTC | #2
> > Fixing IV pointer population in lookaside IPsec
> > outbound instruction.
> >
> > Fixes: fab634eb87ca ("crypto/octeontx2: support security session data
> path")
> >
> > Signed-off-by: Tejasree Kondoj <ktejasree@marvell.com>
> > ---
> > v2:
> > * Fixed unused variable warning
> Acked-by: Akhil Goyal <gakhil@marvell.com>
> 
> Applied to dpdk-next-crypto
> 
Cc:stable@dpdk.org
  

Patch

diff --git a/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h b/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h
index 58b199f4f3..25ee10f342 100644
--- a/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h
+++ b/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h
@@ -61,7 +61,6 @@  process_outb_sa(struct rte_crypto_op *cop,
 	uint32_t dlen, rlen, extend_head, extend_tail;
 	struct rte_crypto_sym_op *sym_op = cop->sym;
 	struct rte_mbuf *m_src = sym_op->m_src;
-	struct otx2_ipsec_po_sa_ctl *ctl_wrd;
 	struct cpt_request_info *req = NULL;
 	struct otx2_ipsec_po_out_hdr *hdr;
 	struct otx2_ipsec_po_out_sa *sa;
@@ -70,7 +69,6 @@  process_outb_sa(struct rte_crypto_op *cop,
 	char *mdata, *data;
 
 	sa = &sess->out_sa;
-	ctl_wrd = &sa->ctl;
 	hdr_len = sizeof(*hdr);
 
 	dlen = rte_pktmbuf_pkt_len(m_src) + hdr_len;
@@ -107,14 +105,8 @@  process_outb_sa(struct rte_crypto_op *cop,
 	hdr = (struct otx2_ipsec_po_out_hdr *)rte_pktmbuf_adj(m_src,
 							RTE_ETHER_HDR_LEN);
 
-	if (ctl_wrd->enc_type == OTX2_IPSEC_FP_SA_ENC_AES_GCM) {
-		memcpy(&hdr->iv[0], &sa->iv.gcm.nonce, 4);
-		memcpy(&hdr->iv[4], rte_crypto_op_ctod_offset(cop, uint8_t *,
-			sess->iv_offset), sess->iv_length);
-	} else if (ctl_wrd->auth_type == OTX2_IPSEC_PO_SA_AUTH_SHA1) {
-		memcpy(&hdr->iv[0], rte_crypto_op_ctod_offset(cop, uint8_t *,
-			sess->iv_offset), sess->iv_length);
-	}
+	memcpy(&hdr->iv[0], rte_crypto_op_ctod_offset(cop, uint8_t *,
+		sess->iv_offset), sess->iv_length);
 
 	/* Prepare CPT instruction */
 	word0.u64 = sess->ucmd_w0;