RE: [EXTERNAL] [v2] crypto/dpaa2_sec: rework debug code

[Gagandeep Singh <G.Singh@nxp.com>]

Hi,

Sure, I will submit the rebased patch soon.

> -----Original Message-----
> From: Akhil Goyal <gakhil@marvell.com>
> Sent: Thursday, October 10, 2024 2:32 AM
> To: Gagandeep Singh <G.Singh@nxp.com>; dev@dpdk.org; Hemant Agrawal
> <hemant.agrawal@nxp.com>
> Cc: Jun Yang <jun.yang@nxp.com>
> Subject: RE: [EXTERNAL] [v2] crypto/dpaa2_sec: rework debug code
> 
> Hi Gagan,
> 
> > Output debug information according to various modes.
> >
> > Signed-off-by: Jun Yang <jun.yang@nxp.com>
> > Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
> 
> It seems the base patch was merged in main branch.
> Can you rebase this patch on current top of tree?
> 
> > ---
> >  drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 72
> > +++++++++++++--------
> >  1 file changed, 46 insertions(+), 26 deletions(-)
> >
> > diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> > b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> > index 2cdf9308f8..0c96ca0023 100644
> > --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> > +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> > @@ -65,6 +65,47 @@ enum dpaa2_sec_dump_levels {  uint8_t
> > cryptodev_driver_id;  uint8_t dpaa2_sec_dp_dump =
> > DPAA2_SEC_DP_ERR_DUMP;
> >
> > +static inline void
> > +dpaa2_sec_dp_fd_dump(const struct qbman_fd *fd, uint16_t bpid,
> > +		     struct rte_mbuf *mbuf, bool tx) { #if (RTE_LOG_DEBUG <=
> > +RTE_LOG_DP_LEVEL)
> > +	char debug_str[1024];
> > +	int offset;
> > +
> > +	if (tx) {
> > +		offset = sprintf(debug_str,
> > +			"CIPHER SG: fdaddr =%" PRIx64 ", from %s pool ",
> > +			DPAA2_GET_FD_ADDR(fd),
> > +			bpid < MAX_BPID ? "SW" : "BMAN");
> > +		if (bpid < MAX_BPID) {
> > +			offset += sprintf(&debug_str[offset],
> > +				"bpid = %d ", bpid);
> > +		}
> > +	} else {
> > +		offset = sprintf(debug_str, "Mbuf %p from %s pool ",
> > +				 mbuf, DPAA2_GET_FD_IVP(fd) ? "SW" :
> > "BMAN");
> > +		if (!DPAA2_GET_FD_IVP(fd)) {
> > +			offset += sprintf(&debug_str[offset], "bpid = %d ",
> > +					  DPAA2_GET_FD_BPID(fd));
> > +		}
> > +	}
> > +	offset += sprintf(&debug_str[offset],
> > +		"private size = %d ",
> > +		mbuf->pool->private_data_size);
> > +	offset += sprintf(&debug_str[offset],
> > +		"addr %p, fdaddr =%" PRIx64 ", off =%d, len =%d",
> > +		mbuf->buf_addr, DPAA2_GET_FD_ADDR(fd),
> > +		DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_LEN(fd));
> > +	DPAA2_SEC_DP_DEBUG("%s", debug_str); #else
> > +	RTE_SET_USED(bpid);
> > +	RTE_SET_USED(tx);
> > +	RTE_SET_USED(mbuf);
> > +	RTE_SET_USED(fd);
> > +#endif
> > +}
> > +
> >  static inline void
> >  free_fle(const struct qbman_fd *fd, struct dpaa2_sec_qp *qp)  { @@
> > -1097,7 +1138,7 @@ build_auth_fd(dpaa2_sec_session *sess, struct
> > rte_crypto_op *op,
> >
> >  static int
> >  build_cipher_sg_fd(dpaa2_sec_session *sess, struct rte_crypto_op *op,
> > -		struct qbman_fd *fd, __rte_unused uint16_t bpid)
> > +		struct qbman_fd *fd, uint16_t bpid)
> >  {
> >  	struct rte_crypto_sym_op *sym_op = op->sym;
> >  	struct qbman_fle *ip_fle, *op_fle, *sge, *fle; @@ -1212,14 +1253,8
> > @@ build_cipher_sg_fd(dpaa2_sec_session *sess, struct rte_crypto_op
> > *op,
> >  	DPAA2_SET_FD_COMPOUND_FMT(fd);
> >  	DPAA2_SET_FD_FLC(fd, DPAA2_VADDR_TO_IOVA(flc));
> >
> > -	DPAA2_SEC_DP_DEBUG(
> > -		"CIPHER SG: fdaddr =%" PRIx64 " bpid =%d meta =%d"
> > -		" off =%d, len =%d",
> > -		DPAA2_GET_FD_ADDR(fd),
> > -		DPAA2_GET_FD_BPID(fd),
> > -		rte_dpaa2_bpid_info[bpid].meta_data_size,
> > -		DPAA2_GET_FD_OFFSET(fd),
> > -		DPAA2_GET_FD_LEN(fd));
> > +	dpaa2_sec_dp_fd_dump(fd, bpid, mbuf, true);
> > +
> >  	return 0;
> >  }
> >
> > @@ -1326,14 +1361,7 @@ build_cipher_fd(dpaa2_sec_session *sess, struct
> > rte_crypto_op *op,
> >  	DPAA2_SET_FLE_FIN(sge);
> >  	DPAA2_SET_FLE_FIN(fle);
> >
> > -	DPAA2_SEC_DP_DEBUG(
> > -		"CIPHER: fdaddr =%" PRIx64 " bpid =%d meta =%d"
> > -		" off =%d, len =%d",
> > -		DPAA2_GET_FD_ADDR(fd),
> > -		DPAA2_GET_FD_BPID(fd),
> > -		rte_dpaa2_bpid_info[bpid].meta_data_size,
> > -		DPAA2_GET_FD_OFFSET(fd),
> > -		DPAA2_GET_FD_LEN(fd));
> > +	dpaa2_sec_dp_fd_dump(fd, bpid, dst, true);
> >
> >  	return 0;
> >  }
> > @@ -1604,15 +1632,7 @@ sec_fd_to_mbuf(const struct qbman_fd *fd,
> > struct dpaa2_sec_qp *qp)
> >  		dst->data_len = len;
> >  	}
> >
> > -	DPAA2_SEC_DP_DEBUG("mbuf %p BMAN buf addr %p,"
> > -		" fdaddr =%" PRIx64 " bpid =%d meta =%d off =%d, len =%d",
> > -		(void *)dst,
> > -		dst->buf_addr,
> > -		DPAA2_GET_FD_ADDR(fd),
> > -		DPAA2_GET_FD_BPID(fd),
> > -
> > 	rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size,
> > -		DPAA2_GET_FD_OFFSET(fd),
> > -		DPAA2_GET_FD_LEN(fd));
> > +	dpaa2_sec_dp_fd_dump(fd, 0, dst, false);
> >
> >  	/* free the fle memory */
> >  	if (likely(rte_pktmbuf_is_contiguous(src))) {
> > --
> > 2.25.1