diff mbox series

crypto/snow3g: add dynamic logging

Message ID 20180703043722.18978-1-pablo.de.lara.guarch@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Pablo de Lara Guarch
Headers show
Series crypto/snow3g: add dynamic logging | expand

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation success Compilation OK

Commit Message

De Lara Guarch, Pablo July 3, 2018, 4:37 a.m. UTC
Registered new dynamic logtype for driver and
replaced SNOW3G_LOG_ERR and CDEV_LOG_ERR
with the new SNOW3G_LOG macro, which uses the new logtype.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/crypto/snow3g/rte_snow3g_pmd.c         | 25 ++++++++++++++---------
 drivers/crypto/snow3g/rte_snow3g_pmd_ops.c     | 10 ++++-----
 drivers/crypto/snow3g/rte_snow3g_pmd_private.h | 28 ++++++++------------------
 3 files changed, 29 insertions(+), 34 deletions(-)

Comments

Pattan, Reshma July 4, 2018, 9:32 a.m. UTC | #1
Hi Pablo,

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Pablo de Lara
> Sent: Tuesday, July 3, 2018 5:37 AM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> Subject: [dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging
> diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c
> b/drivers/crypto/snow3g/rte_snow3g_pmd.c
> index 72751e35e..bb990a07e 100644
> --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c

> +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
> b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c

Update year in license header, otherwise

Acked-by: Reshma Pattan <reshma.pattan@intel.com>
Pattan, Reshma July 4, 2018, 9:53 a.m. UTC | #2
Hi Pablo,

Also need to remove  CONFIG_RTE_LIBRTE_PMD_SNOW3G_DEBUG flag.

Thanks,
Reshma

> -----Original Message-----
> From: Pattan, Reshma
> Sent: Wednesday, July 4, 2018 10:32 AM
> To: 'Pablo de Lara' <pablo.de.lara.guarch@intel.com>; dev@dpdk.org
> Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> Subject: RE: [dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging
> 
> Hi Pablo,
> 
> > -----Original Message-----
> > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Pablo de Lara
> > Sent: Tuesday, July 3, 2018 5:37 AM
> > To: dev@dpdk.org
> > Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> > Subject: [dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging diff
> > --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c
> > b/drivers/crypto/snow3g/rte_snow3g_pmd.c
> > index 72751e35e..bb990a07e 100644
> > --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
> 
> > +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
> > b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
> 
> Update year in license header, otherwise
> 
> Acked-by: Reshma Pattan <reshma.pattan@intel.com>
De Lara Guarch, Pablo July 4, 2018, 10:01 a.m. UTC | #3
Hi Reshma,

> -----Original Message-----
> From: Pattan, Reshma
> Sent: Wednesday, July 4, 2018 10:54 AM
> To: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; dev@dpdk.org
> Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> Subject: RE: [dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging
> 
> Hi Pablo,
> 
> Also need to remove  CONFIG_RTE_LIBRTE_PMD_SNOW3G_DEBUG flag.

I haven't removed it, because it is still used in the data path, so it wasn't used just for logging.

Thanks for the review.
Pablo

> 
> Thanks,
> Reshma
> 
> > -----Original Message-----
> > From: Pattan, Reshma
> > Sent: Wednesday, July 4, 2018 10:32 AM
> > To: 'Pablo de Lara' <pablo.de.lara.guarch@intel.com>; dev@dpdk.org
> > Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> > Subject: RE: [dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging
> >
> > Hi Pablo,
> >
> > > -----Original Message-----
> > > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Pablo de Lara
> > > Sent: Tuesday, July 3, 2018 5:37 AM
> > > To: dev@dpdk.org
> > > Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> > > Subject: [dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging diff
> > > --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c
> > > b/drivers/crypto/snow3g/rte_snow3g_pmd.c
> > > index 72751e35e..bb990a07e 100644
> > > --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
> >
> > > +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
> > > b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
> >
> > Update year in license header, otherwise
> >
> > Acked-by: Reshma Pattan <reshma.pattan@intel.com>
Pattan, Reshma July 4, 2018, 10:03 a.m. UTC | #4
> -----Original Message-----
> From: De Lara Guarch, Pablo
> Sent: Wednesday, July 4, 2018 11:02 AM
> To: Pattan, Reshma <reshma.pattan@intel.com>; dev@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging
> 
> >
> > Also need to remove  CONFIG_RTE_LIBRTE_PMD_SNOW3G_DEBUG flag.
> 
> I haven't removed it, because it is still used in the data path, so it wasn't used
> just for logging.
> 

Yes, I noticed that.  Fine.

> Thanks for the review.
> Pablo
De Lara Guarch, Pablo July 5, 2018, 4:12 p.m. UTC | #5
> -----Original Message-----
> From: Pattan, Reshma
> Sent: Wednesday, July 4, 2018 10:54 AM
> To: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; dev@dpdk.org
> Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> Subject: RE: [dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging
> 
> Hi Pablo,
> 
> Also need to remove  CONFIG_RTE_LIBRTE_PMD_SNOW3G_DEBUG flag.
> 
> Thanks,
> Reshma
> 
> > -----Original Message-----
> > From: Pattan, Reshma
> > Sent: Wednesday, July 4, 2018 10:32 AM
> > To: 'Pablo de Lara' <pablo.de.lara.guarch@intel.com>; dev@dpdk.org
> > Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> > Subject: RE: [dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging
> >
> > Hi Pablo,
> >
> > > -----Original Message-----
> > > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Pablo de Lara
> > > Sent: Tuesday, July 3, 2018 5:37 AM
> > > To: dev@dpdk.org
> > > Cc: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>
> > > Subject: [dpdk-dev] [PATCH] crypto/snow3g: add dynamic logging diff
> > > --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c
> > > b/drivers/crypto/snow3g/rte_snow3g_pmd.c
> > > index 72751e35e..bb990a07e 100644
> > > --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
> >
> > > +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
> > > b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
> >
> > Update year in license header, otherwise
> >
> > Acked-by: Reshma Pattan <reshma.pattan@intel.com>

Applied to dpdk-next-crypto with date changed.
Thanks,

Pablo
diff mbox series

Patch

diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c
index 72751e35e..bb990a07e 100644
--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
@@ -79,7 +79,7 @@  snow3g_set_session_parameters(struct snow3g_session *sess,
 		break;
 	case SNOW3G_OP_NOT_SUPPORTED:
 	default:
-		SNOW3G_LOG_ERR("Unsupported operation chain order parameter");
+		SNOW3G_LOG(ERR, "Unsupported operation chain order parameter");
 		return -ENOTSUP;
 	}
 
@@ -89,7 +89,7 @@  snow3g_set_session_parameters(struct snow3g_session *sess,
 			return -ENOTSUP;
 
 		if (cipher_xform->cipher.iv.length != SNOW3G_IV_LENGTH) {
-			SNOW3G_LOG_ERR("Wrong IV length");
+			SNOW3G_LOG(ERR, "Wrong IV length");
 			return -EINVAL;
 		}
 		sess->cipher_iv_offset = cipher_xform->cipher.iv.offset;
@@ -105,14 +105,14 @@  snow3g_set_session_parameters(struct snow3g_session *sess,
 			return -ENOTSUP;
 
 		if (auth_xform->auth.digest_length != SNOW3G_DIGEST_LENGTH) {
-			SNOW3G_LOG_ERR("Wrong digest length");
+			SNOW3G_LOG(ERR, "Wrong digest length");
 			return -EINVAL;
 		}
 
 		sess->auth_op = auth_xform->auth.op;
 
 		if (auth_xform->auth.iv.length != SNOW3G_IV_LENGTH) {
-			SNOW3G_LOG_ERR("Wrong IV length");
+			SNOW3G_LOG(ERR, "Wrong IV length");
 			return -EINVAL;
 		}
 		sess->auth_iv_offset = auth_xform->auth.iv.offset;
@@ -216,7 +216,7 @@  process_snow3g_cipher_op_bit(struct rte_crypto_op *op,
 	src = rte_pktmbuf_mtod(op->sym->m_src, uint8_t *);
 	if (op->sym->m_dst == NULL) {
 		op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
-		SNOW3G_LOG_ERR("bit-level in-place not supported\n");
+		SNOW3G_LOG(ERR, "bit-level in-place not supported\n");
 		return 0;
 	}
 	dst = rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *);
@@ -246,7 +246,7 @@  process_snow3g_hash_op(struct snow3g_qp *qp, struct rte_crypto_op **ops,
 		/* Data must be byte aligned */
 		if ((ops[i]->sym->auth.data.offset % BYTE_LEN) != 0) {
 			ops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
-			SNOW3G_LOG_ERR("Offset");
+			SNOW3G_LOG(ERR, "Offset");
 			break;
 		}
 
@@ -295,7 +295,7 @@  process_ops(struct rte_crypto_op **ops, struct snow3g_session *session,
 				(ops[i]->sym->m_dst != NULL &&
 				!rte_pktmbuf_is_contiguous(
 						ops[i]->sym->m_dst))) {
-			SNOW3G_LOG_ERR("PMD supports only contiguous mbufs, "
+			SNOW3G_LOG(ERR, "PMD supports only contiguous mbufs, "
 				"op (%p) provides noncontiguous mbuf as "
 				"source/destination buffer.\n", ops[i]);
 			ops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
@@ -537,7 +537,7 @@  cryptodev_snow3g_create(const char *name,
 
 	dev = rte_cryptodev_pmd_create(name, &vdev->device, init_params);
 	if (dev == NULL) {
-		SNOW3G_LOG_ERR("failed to create cryptodev vdev");
+		SNOW3G_LOG(ERR, "failed to create cryptodev vdev");
 		goto init_error;
 	}
 
@@ -559,7 +559,7 @@  cryptodev_snow3g_create(const char *name,
 
 	return 0;
 init_error:
-	SNOW3G_LOG_ERR("driver %s: cryptodev_snow3g_create failed",
+	SNOW3G_LOG(ERR, "driver %s: cryptodev_snow3g_create failed",
 			init_params->name);
 
 	cryptodev_snow3g_remove(vdev);
@@ -621,3 +621,10 @@  RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_SNOW3G_PMD,
 	"socket_id=<int>");
 RTE_PMD_REGISTER_CRYPTO_DRIVER(snow3g_crypto_drv,
 		cryptodev_snow3g_pmd_drv.driver, cryptodev_driver_id);
+
+RTE_INIT(snow3g_init_log);
+static void
+snow3g_init_log(void)
+{
+	snow3g_logtype_driver = rte_log_register("pmd.crypto.snow3g");
+}
diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
index f60b47598..ca9b8635b 100644
--- a/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd_ops.c
@@ -172,13 +172,13 @@  snow3g_pmd_qp_create_processed_ops_ring(struct snow3g_qp *qp,
 	r = rte_ring_lookup(qp->name);
 	if (r) {
 		if (rte_ring_get_size(r) >= ring_size) {
-			SNOW3G_LOG_INFO("Reusing existing ring %s"
+			SNOW3G_LOG(INFO, "Reusing existing ring %s"
 					" for processed packets",
 					 qp->name);
 			return r;
 		}
 
-		SNOW3G_LOG_ERR("Unable to reuse existing ring %s"
+		SNOW3G_LOG(ERR, "Unable to reuse existing ring %s"
 				" for processed packets",
 				 qp->name);
 		return NULL;
@@ -271,19 +271,19 @@  snow3g_pmd_session_configure(struct rte_cryptodev *dev __rte_unused,
 	int ret;
 
 	if (unlikely(sess == NULL)) {
-		SNOW3G_LOG_ERR("invalid session struct");
+		SNOW3G_LOG(ERR, "invalid session struct");
 		return -EINVAL;
 	}
 
 	if (rte_mempool_get(mempool, &sess_private_data)) {
-		CDEV_LOG_ERR(
+		SNOW3G_LOG(ERR,
 			"Couldn't get object from session mempool");
 		return -ENOMEM;
 	}
 
 	ret = snow3g_set_session_parameters(sess_private_data, xform);
 	if (ret != 0) {
-		SNOW3G_LOG_ERR("failed configure session parameters");
+		SNOW3G_LOG(ERR, "failed configure session parameters");
 
 		/* Return session to mempool */
 		rte_mempool_put(mempool, sess_private_data);
diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
index eea900e0a..f0cc60d3b 100644
--- a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
@@ -1,5 +1,5 @@ 
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2016-2017 Intel Corporation
+ * Copyright(c) 2016-2018 Intel Corporation
  */
 
 #ifndef _RTE_SNOW3G_PMD_PRIVATE_H_
@@ -10,25 +10,13 @@ 
 #define CRYPTODEV_NAME_SNOW3G_PMD	crypto_snow3g
 /**< SNOW 3G PMD device name */
 
-#define SNOW3G_LOG_ERR(fmt, args...) \
-	RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
-			RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), \
-			__func__, __LINE__, ## args)
-
-#ifdef RTE_LIBRTE_SNOW3G_DEBUG
-#define SNOW3G_LOG_INFO(fmt, args...) \
-	RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
-			RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), \
-			__func__, __LINE__, ## args)
-
-#define SNOW3G_LOG_DBG(fmt, args...) \
-	RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
-			RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), \
-			__func__, __LINE__, ## args)
-#else
-#define SNOW3G_LOG_INFO(fmt, args...)
-#define SNOW3G_LOG_DBG(fmt, args...)
-#endif
+/** SNOW 3G PMD LOGTYPE DRIVER */
+int snow3g_logtype_driver;
+
+#define SNOW3G_LOG(level, fmt, ...)  \
+	rte_log(RTE_LOG_ ## level, snow3g_logtype_driver,  \
+			"%s() line %u: " fmt "\n", __func__, __LINE__,  \
+					## __VA_ARGS__)
 
 #define SNOW3G_DIGEST_LENGTH 4