diff mbox series

[v2,02/18] net/r8169: add logging structure

Message ID	20241017063200.26101-3-howard_wang@realsil.com.cn (mailing list archive)
State	Changes Requested, archived
Delegated to:	Ferruh Yigit
Headers	code: ctloc85258 From: Howard Wang <howard_wang@realsil.com.cn> To: <dev@dpdk.org> CC: <pro_nic_dpdk@realtek.com>, Howard Wang <howard_wang@realsil.com.cn> Subject: [PATCH v2 02/18] net/r8169: add logging structure Date: Thu, 17 Oct 2024 14:31:44 +0800 Message-ID: <20241017063200.26101-3-howard_wang@realsil.com.cn> In-Reply-To: <20241017063200.26101-1-howard_wang@realsil.com.cn> References: <20241017063200.26101-1-howard_wang@realsil.com.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	net/r8169: add r8169 pmd to dpdk \| [v2,00/18] net/r8169: add r8169 pmd to dpdk [v2,01/18] net/r8169: add PMD driver skeleton [v2,02/18] net/r8169: add logging structure [v2,03/18] net/r8169: add hardware registers access routines [v2,04/18] net/r8169: implement core logic for Tx/Rx [v2,05/18] net/r8169: add support for hw config [v2,06/18] net/r8169: add phy registers access routines [v2,07/18] net/r8169: add support for hardware operations [v2,08/18] net/r8169: add support for phy configuration [v2,09/18] net/r8169: add support for hw initialization [v2,10/18] net/r8169: add link status and interrupt management [v2,11/18] net/r8169: implement Rx path [v2,12/18] net/r8169: implement Tx path [v2,13/18] net/r8169: implement device statistics [v2,14/18] net/r8169: implement promisc and allmulti modes [v2,15/18] net/r8169: impelment MTU configuration [v2,16/18] net/r8169: add support for getting fw version [v2,17/18] net/r8169: add driver_start and driver_stop [v2,18/18] doc/guides/nics: add documents for r8169 pmd

Checks

Context	Check	Description
ci/checkpatch	warning	coding style issues

Commit Message

Howard Wang Oct. 17, 2024, 6:31 a.m. UTC

Implement logging macros for debug purposes.

Signed-off-by: Howard Wang <howard_wang@realsil.com.cn>
---
 drivers/net/r8169/r8169_ethdev.c | 40 ++++++++++++++++++++++++
 drivers/net/r8169/r8169_logs.h   | 53 ++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 drivers/net/r8169/r8169_logs.h

Comments

Stephen Hemminger Oct. 17, 2024, 4:32 p.m. UTC | #1

On Thu, 17 Oct 2024 14:31:44 +0800
Howard Wang <howard_wang@realsil.com.cn> wrote:

> Implement logging macros for debug purposes.
> 
> Signed-off-by: Howard Wang <howard_wang@realsil.com.cn>
> ---
>  drivers/net/r8169/r8169_ethdev.c | 40 ++++++++++++++++++++++++
>  drivers/net/r8169/r8169_logs.h   | 53 ++++++++++++++++++++++++++++++++
>  2 files changed, 93 insertions(+)
>  create mode 100644 drivers/net/r8169/r8169_logs.h
> 
> diff --git a/drivers/net/r8169/r8169_ethdev.c b/drivers/net/r8169/r8169_ethdev.c
> index e5f8857304..09e12fb56d 100644
> --- a/drivers/net/r8169/r8169_ethdev.c
> +++ b/drivers/net/r8169/r8169_ethdev.c
> @@ -177,3 +177,43 @@ RTE_PMD_REGISTER_PCI(net_r8169, rte_r8169_pmd);
>  RTE_PMD_REGISTER_PCI_TABLE(net_r8169, pci_id_r8169_map);
>  RTE_PMD_REGISTER_KMOD_DEP(net_r8169, "* igb_uio | uio_pci_generic | vfio-pci");
>  
> +int r8169_logtype_init;
> +int r8169_logtype_driver;
> +
> +#ifdef RTE_LIBRTE_R8169_DEBUG_RX
> +int r8169_logtype_rx;
> +#endif
> +#ifdef RTE_LIBRTE_R8169_DEBUG_TX
> +int r8169_logtype_tx;
> +#endif
> +#ifdef RTE_LIBRTE_R8169_DEBUG_TX_FREE
> +int r8169_logtype_tx_free;
> +#endif
> +
> +RTE_INIT(r8169_init_log)
> +{
> +	r8169_logtype_init = rte_log_register("pmd.net.r8169.init");
> +	if (r8169_logtype_init >= 0)
> +		rte_log_set_level(r8169_logtype_init, RTE_LOG_NOTICE);
> +	r8169_logtype_driver = rte_log_register("pmd.net.r8169.driver");
> +	if (r8169_logtype_driver >= 0)
> +		rte_log_set_level(r8169_logtype_driver, RTE_LOG_NOTICE);
> +#ifdef RTE_LIBRTE_R8169_DEBUG_RX
> +	r8169_logtype_rx = rte_log_register("pmd.net.r8169.rx");
> +	if (r8169_logtype_rx >= 0)
> +		rte_log_set_level(r8169_logtype_rx, RTE_LOG_DEBUG);
> +#endif
> +
> +#ifdef RTE_LIBRTE_R8169_DEBUG_TX
> +	r8169_logtype_tx = rte_log_register("pmd.net.r8169.tx");
> +	if (r8169_logtype_tx >= 0)
> +		rte_log_set_level(r8169_logtype_tx, RTE_LOG_DEBUG);
> +#endif
> +
> +#ifdef RTE_LIBRTE_R8169_DEBUG_TX_FREE
> +	r8169_logtype_tx_free = rte_log_register("pmd.net.r8169.tx_free");
> +	if (r8169_logtype_tx_free >= 0)
> +		rte_log_set_level(r8169_logtype_tx_free, RTE_LOG_DEBUG);
> +#endif
> +}
> +
> diff --git a/drivers/net/r8169/r8169_logs.h b/drivers/net/r8169/r8169_logs.h
> new file mode 100644
> index 0000000000..6ce5b4b5ac
> --- /dev/null
> +++ b/drivers/net/r8169/r8169_logs.h
> @@ -0,0 +1,53 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2024 Realtek Corporation. All rights reserved
> + */
> +
> +#ifndef _R8169_LOGS_H_
> +#define _R8169_LOGS_H_
> +
> +#include <rte_log.h>
> +
> +extern int r8169_logtype_init;
> +#define PMD_INIT_LOG(level, fmt, args...) \
> +	rte_log(RTE_LOG_ ## level, r8169_logtype_init, \
> +		"%s(): " fmt "\n", __func__, ##args)
> +
> +#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
> +
> +#ifdef RTE_LIBRTE_R8169_DEBUG_RX
> +extern int r8169_logtype_rx;
> +#define PMD_RX_LOG(level, fmt, args...)			\
> +	rte_log(RTE_LOG_ ## level, r8169_logtype_rx,	\
> +		"%s(): " fmt "\n", __func__, ## args)
> +#else
> +#define PMD_RX_LOG(level, fmt, args...) do { } while (0)
> +#endif
> +
> +#ifdef RTE_LIBRTE_R8169_DEBUG_TX
> +extern int r8169_logtype_tx;
> +#define PMD_TX_LOG(level, fmt, args...)			\
> +	rte_log(RTE_LOG_ ## level, r8169_logtype_tx,	\
> +		"%s(): " fmt "\n", __func__, ## args)
> +#else
> +#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
> +#endif
> +
> +#ifdef RTE_LIBRTE_R8169_DEBUG_TX_FREE
> +extern int r8169_logtype_tx_free;
> +#define PMD_TX_FREE_LOG(level, fmt, args...)			\
> +	rte_log(RTE_LOG_ ## level, r8169_logtype_tx_free,	\
> +		"%s(): " fmt "\n", __func__, ## args)
> +#else
> +#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0)
> +#endif
> +
> +extern int r8169_logtype_driver;
> +#define PMD_DRV_LOG_RAW(level, fmt, args...) \
> +	rte_log(RTE_LOG_ ## level, r8169_logtype_driver, "%s(): " fmt, \
> +		__func__, ## args)
> +
> +#define PMD_DRV_LOG(level, fmt, args...) \
> +	PMD_DRV_LOG_RAW(level, fmt "\n", ## args)
> +
> +#endif /* _R8169_LOGS_H_ */

Latest DPDK has different better macros for this which you could use.

_coding style issues_


Warning in drivers/net/r8169/r8169_logs.h:
Prefer RTE_LOG_LINE/RTE_LOG_DP_LINE
Warning in drivers/net/r8169/r8169_logs.h:
Do not use variadic argument pack in macros

diff mbox series

Patch

diff --git a/drivers/net/r8169/r8169_ethdev.c b/drivers/net/r8169/r8169_ethdev.c
index e5f8857304..09e12fb56d 100644
--- a/drivers/net/r8169/r8169_ethdev.c
+++ b/drivers/net/r8169/r8169_ethdev.c
@@ -177,3 +177,43 @@  RTE_PMD_REGISTER_PCI(net_r8169, rte_r8169_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_r8169, pci_id_r8169_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_r8169, "* igb_uio | uio_pci_generic | vfio-pci");
 
+int r8169_logtype_init;
+int r8169_logtype_driver;
+
+#ifdef RTE_LIBRTE_R8169_DEBUG_RX
+int r8169_logtype_rx;
+#endif
+#ifdef RTE_LIBRTE_R8169_DEBUG_TX
+int r8169_logtype_tx;
+#endif
+#ifdef RTE_LIBRTE_R8169_DEBUG_TX_FREE
+int r8169_logtype_tx_free;
+#endif
+
+RTE_INIT(r8169_init_log)
+{
+	r8169_logtype_init = rte_log_register("pmd.net.r8169.init");
+	if (r8169_logtype_init >= 0)
+		rte_log_set_level(r8169_logtype_init, RTE_LOG_NOTICE);
+	r8169_logtype_driver = rte_log_register("pmd.net.r8169.driver");
+	if (r8169_logtype_driver >= 0)
+		rte_log_set_level(r8169_logtype_driver, RTE_LOG_NOTICE);
+#ifdef RTE_LIBRTE_R8169_DEBUG_RX
+	r8169_logtype_rx = rte_log_register("pmd.net.r8169.rx");
+	if (r8169_logtype_rx >= 0)
+		rte_log_set_level(r8169_logtype_rx, RTE_LOG_DEBUG);
+#endif
+
+#ifdef RTE_LIBRTE_R8169_DEBUG_TX
+	r8169_logtype_tx = rte_log_register("pmd.net.r8169.tx");
+	if (r8169_logtype_tx >= 0)
+		rte_log_set_level(r8169_logtype_tx, RTE_LOG_DEBUG);
+#endif
+
+#ifdef RTE_LIBRTE_R8169_DEBUG_TX_FREE
+	r8169_logtype_tx_free = rte_log_register("pmd.net.r8169.tx_free");
+	if (r8169_logtype_tx_free >= 0)
+		rte_log_set_level(r8169_logtype_tx_free, RTE_LOG_DEBUG);
+#endif
+}
+
diff --git a/drivers/net/r8169/r8169_logs.h b/drivers/net/r8169/r8169_logs.h
new file mode 100644
index 0000000000..6ce5b4b5ac
--- /dev/null
+++ b/drivers/net/r8169/r8169_logs.h
@@ -0,0 +1,53 @@ 
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 Realtek Corporation. All rights reserved
+ */
+
+#ifndef _R8169_LOGS_H_
+#define _R8169_LOGS_H_
+
+#include <rte_log.h>
+
+extern int r8169_logtype_init;
+#define PMD_INIT_LOG(level, fmt, args...) \
+	rte_log(RTE_LOG_ ## level, r8169_logtype_init, \
+		"%s(): " fmt "\n", __func__, ##args)
+
+#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
+
+#ifdef RTE_LIBRTE_R8169_DEBUG_RX
+extern int r8169_logtype_rx;
+#define PMD_RX_LOG(level, fmt, args...)			\
+	rte_log(RTE_LOG_ ## level, r8169_logtype_rx,	\
+		"%s(): " fmt "\n", __func__, ## args)
+#else
+#define PMD_RX_LOG(level, fmt, args...) do { } while (0)
+#endif
+
+#ifdef RTE_LIBRTE_R8169_DEBUG_TX
+extern int r8169_logtype_tx;
+#define PMD_TX_LOG(level, fmt, args...)			\
+	rte_log(RTE_LOG_ ## level, r8169_logtype_tx,	\
+		"%s(): " fmt "\n", __func__, ## args)
+#else
+#define PMD_TX_LOG(level, fmt, args...) do { } while (0)
+#endif
+
+#ifdef RTE_LIBRTE_R8169_DEBUG_TX_FREE
+extern int r8169_logtype_tx_free;
+#define PMD_TX_FREE_LOG(level, fmt, args...)			\
+	rte_log(RTE_LOG_ ## level, r8169_logtype_tx_free,	\
+		"%s(): " fmt "\n", __func__, ## args)
+#else
+#define PMD_TX_FREE_LOG(level, fmt, args...) do { } while (0)
+#endif
+
+extern int r8169_logtype_driver;
+#define PMD_DRV_LOG_RAW(level, fmt, args...) \
+	rte_log(RTE_LOG_ ## level, r8169_logtype_driver, "%s(): " fmt, \
+		__func__, ## args)
+
+#define PMD_DRV_LOG(level, fmt, args...) \
+	PMD_DRV_LOG_RAW(level, fmt "\n", ## args)
+
+#endif /* _R8169_LOGS_H_ */
+