diff mbox

[dpdk-dev,02/11] bnx2x: implement dynamic logging

Message ID 20171219063840.18981-3-stephen@networkplumber.org (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers

Checks

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

Commit Message

Stephen Hemminger Dec. 19, 2017, 6:38 a.m. UTC 
  Replace compile time option for init and driver log with
dynamic value.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 config/common_base               |  2 --
 doc/guides/nics/bnx2x.rst        |  8 --------
 drivers/net/bnx2x/bnx2x_ethdev.c | 15 +++++++++++++++
 drivers/net/bnx2x/bnx2x_logs.h   | 17 ++++++-----------
 4 files changed, 21 insertions(+), 21 deletions(-)

Comments

Ferruh Yigit Dec. 20, 2017, 1:51 a.m. UTC | #1 
On 12/18/2017 10:38 PM, Stephen Hemminger wrote:
> Replace compile time option for init and driver log with
> dynamic value.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>  config/common_base               |  2 --
>  doc/guides/nics/bnx2x.rst        |  8 --------
>  drivers/net/bnx2x/bnx2x_ethdev.c | 15 +++++++++++++++
>  drivers/net/bnx2x/bnx2x_logs.h   | 17 ++++++-----------
>  4 files changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/config/common_base b/config/common_base
> index f775ec96184c..82d1f9ac47ef 100644
> --- a/config/common_base
> +++ b/config/common_base
> @@ -244,8 +244,6 @@ CONFIG_RTE_LIBRTE_MLX5_TX_MP_CACHE=8
>  # Compile burst-oriented Broadcom PMD driver
>  #
>  CONFIG_RTE_LIBRTE_BNX2X_PMD=n
> -CONFIG_RTE_LIBRTE_BNX2X_DEBUG=n

There are a few "#ifdef RTE_LIBRTE_BNX2X_DEBUG" usage remains in the code which
is causing build error.
Stephen Hemminger Dec. 20, 2017, 6:58 p.m. UTC | #2 
On Tue, 19 Dec 2017 17:51:46 -0800
Ferruh Yigit <ferruh.yigit@intel.com> wrote:

> On 12/18/2017 10:38 PM, Stephen Hemminger wrote:
> > Replace compile time option for init and driver log with
> > dynamic value.
> > 
> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> > ---
> >  config/common_base               |  2 --
> >  doc/guides/nics/bnx2x.rst        |  8 --------
> >  drivers/net/bnx2x/bnx2x_ethdev.c | 15 +++++++++++++++
> >  drivers/net/bnx2x/bnx2x_logs.h   | 17 ++++++-----------
> >  4 files changed, 21 insertions(+), 21 deletions(-)
> > 
> > diff --git a/config/common_base b/config/common_base
> > index f775ec96184c..82d1f9ac47ef 100644
> > --- a/config/common_base
> > +++ b/config/common_base
> > @@ -244,8 +244,6 @@ CONFIG_RTE_LIBRTE_MLX5_TX_MP_CACHE=8
> >  # Compile burst-oriented Broadcom PMD driver
> >  #
> >  CONFIG_RTE_LIBRTE_BNX2X_PMD=n
> > -CONFIG_RTE_LIBRTE_BNX2X_DEBUG=n  
> 
> There are a few "#ifdef RTE_LIBRTE_BNX2X_DEBUG" usage remains in the code which
> is causing build error.

Ok, I didn't see that. Will remove the ifdefs
diff mbox

Patch

diff --git a/config/common_base b/config/common_base
index f775ec96184c..82d1f9ac47ef 100644
--- a/config/common_base
+++ b/config/common_base
@@ -244,8 +244,6 @@  CONFIG_RTE_LIBRTE_MLX5_TX_MP_CACHE=8
 # Compile burst-oriented Broadcom PMD driver
 #
 CONFIG_RTE_LIBRTE_BNX2X_PMD=n
-CONFIG_RTE_LIBRTE_BNX2X_DEBUG=n
-CONFIG_RTE_LIBRTE_BNX2X_DEBUG_INIT=n
 CONFIG_RTE_LIBRTE_BNX2X_DEBUG_RX=n
 CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX=n
 CONFIG_RTE_LIBRTE_BNX2X_MF_SUPPORT=n
diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst
index fbfc048e04a0..b1fec8a365b0 100644
--- a/doc/guides/nics/bnx2x.rst
+++ b/doc/guides/nics/bnx2x.rst
@@ -102,14 +102,6 @@  enabling debugging options may affect system performance.
   to 'y'. Also, in order for firmware binary to load user will need zlib devel
   package installed.
 
-- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG`` (default **n**)
-
-  Toggle display of generic debugging messages.
-
-- ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_INIT`` (default **n**)
-
-  Toggle display of initialization related messages.
-
 - ``CONFIG_RTE_LIBRTE_BNX2X_DEBUG_TX`` (default **n**)
 
   Toggle display of transmit fast path run-time messages.
diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 95861a06e565..483d5a17cd5d 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -14,6 +14,9 @@ 
 #include <rte_dev.h>
 #include <rte_ethdev_pci.h>
 
+int bnx2x_logtype_init;
+int bnx2x_logtype_driver;
+
 /*
  * The set of PCI devices this driver supports
  */
@@ -687,3 +690,15 @@  RTE_PMD_REGISTER_KMOD_DEP(net_bnx2x, "* igb_uio | uio_pci_generic | vfio-pci");
 RTE_PMD_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_bnx2xvf, "* igb_uio | vfio-pci");
+
+RTE_INIT(bnx2x_init_log);
+static void
+bnx2x_init_log(void)
+{
+	bnx2x_logtype_init = rte_log_register("pmd.bnx2x.init");
+	if (bnx2x_logtype_init >= 0)
+		rte_log_set_level(bnx2x_logtype_init, RTE_LOG_NOTICE);
+	bnx2x_logtype_driver = rte_log_register("pmd.bnx2x.driver");
+	if (bnx2x_logtype_driver >= 0)
+		rte_log_set_level(bnx2x_logtype_driver, RTE_LOG_NOTICE);
+}
diff --git a/drivers/net/bnx2x/bnx2x_logs.h b/drivers/net/bnx2x/bnx2x_logs.h
index dff014d7e122..08c1b764f028 100644
--- a/drivers/net/bnx2x/bnx2x_logs.h
+++ b/drivers/net/bnx2x/bnx2x_logs.h
@@ -11,14 +11,12 @@ 
 #ifndef _PMD_LOGS_H_
 #define _PMD_LOGS_H_
 
+extern int bnx2x_logtype_init;
 #define PMD_INIT_LOG(level, fmt, args...) \
-	RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ##args)
+	rte_log(RTE_LOG_ ## level, bnx2x_logtype_init, \
+		"%s(): " fmt "\n", __func__, ##args)
 
-#ifdef RTE_LIBRTE_BNX2X_DEBUG_INIT
 #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
-#else
-#define PMD_INIT_FUNC_TRACE() do { } while(0)
-#endif
 
 #ifdef RTE_LIBRTE_BNX2X_DEBUG_RX
 #define PMD_RX_LOG(level, fmt, args...) \
@@ -41,12 +39,10 @@ 
 #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0)
 #endif
 
-#ifdef RTE_LIBRTE_BNX2X_DEBUG
+extern int bnx2x_logtype_driver;
 #define PMD_DRV_LOG_RAW(level, fmt, args...) \
-	RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args)
-#else
-#define PMD_DRV_LOG_RAW(level, fmt, args...) do { } while (0)
-#endif
+	rte_log(RTE_LOG_ ## level, bnx2x_logtype_driver, \
+		"%s(): " fmt, __func__, ## args)
 
 #define PMD_DRV_LOG(level, fmt, args...) \
 	PMD_DRV_LOG_RAW(level, fmt "\n", ## args)
@@ -58,5 +54,4 @@ 
 #define PMD_DEBUG_PERIODIC_LOG(level, fmt, args...) do { } while(0)
 #endif
 
-
 #endif /* _PMD_LOGS_H_ */