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

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

Hi All,

> -----Original Message-----
> From: Akhil Goyal <gakhil@marvell.com>
> Sent: Friday, October 4, 2024 9:31 PM
> To: David Marchand <david.marchand@redhat.com>; Gagandeep Singh
> <G.Singh@nxp.com>
> Cc: dev@dpdk.org; Hemant Agrawal <hemant.agrawal@nxp.com>; Jun Yang
> <jun.yang@nxp.com>; Thomas Monjalon <thomas@monjalon.net>
> Subject: RE: [EXTERNAL] Re: [v2 7/7] crypto/dpaa2_sec: rework debug code
> 
> > Hello guys,
> >
> > On Tue, Aug 6, 2024 at 12:28 PM Gagandeep Singh <g.singh@nxp.com> wrote:
> > >
> > > From: Jun Yang <jun.yang@nxp.com>
> > >
> > > Output debug information according to various modes.
> > >
> > > Signed-off-by: Jun Yang <jun.yang@nxp.com>
> > > ---
> > >  drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 87
> > > +++++++++++++++------
> > >  1 file changed, 63 insertions(+), 24 deletions(-)
> > >
> > > diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> > b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> > > index 1e28c71b53..a293a21881 100644
> > > --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> > > +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> > > @@ -1095,7 +1095,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; @@ -1105,6
> > > +1105,10 @@ build_cipher_sg_fd(dpaa2_sec_session *sess, struct
> > rte_crypto_op *op,
> > >         struct rte_mbuf *mbuf;
> > >         uint8_t *iv_ptr = rte_crypto_op_ctod_offset(op, uint8_t *,
> > >                         sess->iv.offset);
> > > +#if (RTE_LOG_DEBUG <= RTE_LOG_DP_LEVEL)
> > > +       char debug_str[1024];
> > > +       int offset;
> > > +#endif
> > >
> > >         data_len = sym_op->cipher.data.length;
> > >         data_offset = sym_op->cipher.data.offset; @@ -1210,14
> > > +1214,26 @@ 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\n",
> > > +#if (RTE_LOG_DEBUG <= RTE_LOG_DP_LEVEL)
> > > +       offset = sprintf(debug_str,
> > > +               "CIPHER SG: fdaddr =%" PRIx64 ", from %s pool ",
> > >                 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));
> > > +               bpid < MAX_BPID ? "SW" : "BMAN");
> > > +       if (bpid < MAX_BPID) {
> > > +               offset += sprintf(&debug_str[offset],
> > > +                       "bpid = %d ", bpid);
> > > +       }
> > > +       offset += sprintf(&debug_str[offset],
> > > +               "private size = %d ",
> > > +               mbuf->pool->private_data_size);
> > > +       offset += sprintf(&debug_str[offset],
> > > +               "off =%d, len =%d\n",
> >
> > DPAA2_SEC_DP_DEBUG already appends a \n, don't add a new one.
> >
> > > +               DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_LEN(fd));
> > > +               DPAA2_SEC_DP_DEBUG("%s", debug_str);
> >
> > Indentation is wrong.
> >
> > > +#else
> > > +       RTE_SET_USED(bpid);
> > > +#endif
> > > +
> > >         return 0;
> > >  }
> > >
> > > @@ -1233,6 +1249,10 @@ build_cipher_fd(dpaa2_sec_session *sess,
> > > struct
> > rte_crypto_op *op,
> > >         uint8_t *iv_ptr = rte_crypto_op_ctod_offset(op, uint8_t *,
> > >                         sess->iv.offset);
> > >         struct rte_mbuf *dst;
> > > +#if (RTE_LOG_DEBUG <= RTE_LOG_DP_LEVEL)
> > > +       char debug_str[1024];
> > > +       int offset;
> > > +#endif
> > >
> > >         data_len = sym_op->cipher.data.length;
> > >         data_offset = sym_op->cipher.data.offset; @@ -1324,14
> > > +1344,23 @@ 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\n",
> > > +#if (RTE_LOG_DEBUG <= RTE_LOG_DP_LEVEL)
> > > +       offset = sprintf(debug_str,
> > > +               "CIPHER: fdaddr =%" PRIx64 ", from %s pool ",
> > >                 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));
> > > +               bpid < MAX_BPID ? "SW" : "BMAN");
> > > +       if (bpid < MAX_BPID) {
> > > +               offset += sprintf(&debug_str[offset],
> > > +                       "bpid = %d ", bpid);
> > > +       }
> > > +       offset += sprintf(&debug_str[offset],
> > > +                       "private size = %d ",
> > > +                       dst->pool->private_data_size);
> > > +       offset += sprintf(&debug_str[offset],
> > > +                       "off =%d, len =%d\n",
> >
> > Idem.
> >
> >
> > > +                       DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_LEN(fd));
> > > +       DPAA2_SEC_DP_DEBUG("%s", debug_str); #endif
> > >
> > >         return 0;
> > >  }
> > > @@ -1564,6 +1593,10 @@ sec_fd_to_mbuf(const struct qbman_fd *fd,
> > > struct
> > dpaa2_sec_qp *qp)
> > >         struct qbman_fle *fle;
> > >         struct rte_crypto_op *op;
> > >         struct rte_mbuf *dst, *src;
> > > +#if (RTE_LOG_DEBUG <= RTE_LOG_DP_LEVEL)
> > > +       char debug_str[1024];
> > > +       int offset;
> > > +#endif
> > >
> > >         if (DPAA2_FD_GET_FORMAT(fd) == qbman_fd_single)
> > >                 return sec_simple_fd_to_mbuf(fd); @@ -1602,15
> > > +1635,21 @@ 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\n",
> > > -               (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));
> > > +#if (RTE_LOG_DEBUG <= RTE_LOG_DP_LEVEL)
> > > +       offset = sprintf(debug_str, "Mbuf %p from %s pool ",
> > > +                       dst, 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 ", dst->pool->private_data_size);
> > > +       offset += sprintf(&debug_str[offset],
> > > +                       "addr %p, fdaddr =%" PRIx64 ", off =%d, len
> > > +=%d\n",
> >
> > Idem.
> >
> >
> > > +                       dst->buf_addr, DPAA2_GET_FD_ADDR(fd),
> > > +                       DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_LEN(fd));
> > > +       DPAA2_SEC_DP_DEBUG("%s", debug_str); #endif
> > >
> > >         /* free the fle memory */
> > >         if (likely(rte_pktmbuf_is_contiguous(src))) {
> >
> > I see this patch is already merged in next-crypto.
> > Please, can this be fixed before reaching main?
> >
> Gagan,
> This patch is removed from the crypto tree for now.
> 
> Please rework and send as separate patch.

I have Submitted the updated patch: https://patchwork.dpdk.org/project/dpdk/patch/20241007084354.852733-1-g.singh@nxp.com/

Regards,
Gagan