From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH 10/11] qede: implement dynamic logging
Date: Mon, 18 Dec 2017 22:38:39 -0800 [thread overview]
Message-ID: <20171219063840.18981-11-stephen@networkplumber.org> (raw)
In-Reply-To: <20171219063840.18981-1-stephen@networkplumber.org>
This driver is mostly like others with slightly different logging
macros. The semantics were retained, with some minor reformatting.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
config/common_base | 2 --
drivers/net/qede/qede_ethdev.c | 15 ++++++++++++
drivers/net/qede/qede_logs.h | 53 +++++++++++++++++++-----------------------
3 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/config/common_base b/config/common_base
index 61ed718189ec..1718f6a14449 100644
--- a/config/common_base
+++ b/config/common_base
@@ -398,9 +398,7 @@ CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB_L1=n
# QLogic 10G/25G/40G/50G/100G PMD
#
CONFIG_RTE_LIBRTE_QEDE_PMD=y
-CONFIG_RTE_LIBRTE_QEDE_DEBUG_INIT=n
CONFIG_RTE_LIBRTE_QEDE_DEBUG_INFO=n
-CONFIG_RTE_LIBRTE_QEDE_DEBUG_DRIVER=n
CONFIG_RTE_LIBRTE_QEDE_DEBUG_TX=n
CONFIG_RTE_LIBRTE_QEDE_DEBUG_RX=n
CONFIG_RTE_LIBRTE_QEDE_VF_TX_SWITCH=y
diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 6f5ba2a9270c..cd8dd9c2a676 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -11,6 +11,9 @@
#include <rte_version.h>
/* Globals */
+int qede_logtype_init;
+int qede_logtype_driver;
+
static const struct qed_eth_ops *qed_ops;
static int64_t timer_period = 1;
@@ -2961,3 +2964,15 @@ RTE_PMD_REGISTER_KMOD_DEP(net_qede, "* igb_uio | uio_pci_generic | vfio-pci");
RTE_PMD_REGISTER_PCI(net_qede_vf, rte_qedevf_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_qede_vf, pci_id_qedevf_map);
RTE_PMD_REGISTER_KMOD_DEP(net_qede_vf, "* igb_uio | vfio-pci");
+
+RTE_INIT(qede_init_log);
+static void
+qede_init_log(void)
+{
+ qede_logtype_init = rte_log_register("pmd.qede.init");
+ if (qede_logtype_init >= 0)
+ rte_log_set_level(qede_logtype_init, RTE_LOG_NOTICE);
+ qede_logtype_driver = rte_log_register("pmd.qede.driver");
+ if (qede_logtype_driver >= 0)
+ rte_log_set_level(qede_logtype_driver, RTE_LOG_NOTICE);
+}
diff --git a/drivers/net/qede/qede_logs.h b/drivers/net/qede/qede_logs.h
index 15821151cf8a..b7ecf1c276b0 100644
--- a/drivers/net/qede/qede_logs.h
+++ b/drivers/net/qede/qede_logs.h
@@ -9,23 +9,25 @@
#ifndef _QEDE_LOGS_H_
#define _QEDE_LOGS_H_
-#define DP_ERR(p_dev, fmt, ...) \
- rte_log(RTE_LOG_ERR, RTE_LOGTYPE_PMD, \
- "[%s:%d(%s)]" fmt, \
- __func__, __LINE__, \
- (p_dev)->name ? (p_dev)->name : "", \
+extern int qede_logtype_driver;
+
+#define DP_ERR(p_dev, fmt, ...) \
+ rte_log(RTE_LOG_ERR, qede_logtype_driver, \
+ "[%s:%d(%s)]" fmt, \
+ __func__, __LINE__, \
+ (p_dev)->name ? (p_dev)->name : "", \
##__VA_ARGS__)
#define DP_NOTICE(p_dev, is_assert, fmt, ...) \
do { \
if (is_assert) \
- rte_log(RTE_LOG_ERR, RTE_LOGTYPE_PMD,\
+ rte_log(RTE_LOG_ERR, qede_logtype_driver,\
"[QEDE PMD: (%s)]%s:" fmt, \
(p_dev)->name ? (p_dev)->name : "", \
__func__, \
##__VA_ARGS__); \
else \
- rte_log(RTE_LOG_NOTICE, RTE_LOGTYPE_PMD,\
+ rte_log(RTE_LOG_NOTICE, qede_logtype_driver,\
"[QEDE PMD: (%s)]%s:" fmt, \
(p_dev)->name ? (p_dev)->name : "", \
__func__, \
@@ -34,7 +36,7 @@ do { \
#ifdef RTE_LIBRTE_QEDE_DEBUG_INFO
#define DP_INFO(p_dev, fmt, ...) \
- rte_log(RTE_LOG_INFO, RTE_LOGTYPE_PMD, \
+ rte_log(RTE_LOG_INFO, qede_logtype_driver, \
"[%s:%d(%s)]" fmt, \
__func__, __LINE__, \
(p_dev)->name ? (p_dev)->name : "", \
@@ -43,30 +45,23 @@ do { \
#define DP_INFO(p_dev, fmt, ...) do { } while (0)
#endif
-#ifdef RTE_LIBRTE_QEDE_DEBUG_DRIVER
-#define DP_VERBOSE(p_dev, module, fmt, ...) \
-do { \
- if ((p_dev)->dp_module & module) \
- rte_log(RTE_LOG_DEBUG, RTE_LOGTYPE_PMD, \
- "[%s:%d(%s)]" fmt, \
- __func__, __LINE__, \
- (p_dev)->name ? (p_dev)->name : "", \
- ##__VA_ARGS__); \
-} while (0)
-#else
-#define DP_VERBOSE(p_dev, fmt, ...) do { } while (0)
-#endif
+#define DP_VERBOSE(p_dev, module, fmt, ...) \
+ do { \
+ if ((p_dev)->dp_module & module) \
+ rte_log(RTE_LOG_DEBUG, qede_logtype_driver, \
+ "[%s:%d(%s)]" fmt, \
+ __func__, __LINE__, \
+ (p_dev)->name ? (p_dev)->name : "", \
+ ##__VA_ARGS__); \
+ } while (0)
-#define PMD_INIT_LOG(level, edev, fmt, args...) \
- rte_log(RTE_LOG_ ## level, RTE_LOGTYPE_PMD, \
- "[qede_pmd: %s] %s() " fmt "\n", \
- (edev)->name, __func__, ##args)
+extern int qede_logtype_init;
+#define PMD_INIT_LOG(level, edev, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, qede_logtype_init, \
+ "[qede_pmd: %s] %s() " fmt "\n", \
+ (edev)->name, __func__, ##args)
-#ifdef RTE_LIBRTE_QEDE_DEBUG_INIT
#define PMD_INIT_FUNC_TRACE(edev) PMD_INIT_LOG(DEBUG, edev, " >>")
-#else
-#define PMD_INIT_FUNC_TRACE(edev) do { } while (0)
-#endif
#ifdef RTE_LIBRTE_QEDE_DEBUG_TX
#define PMD_TX_LOG(level, q, fmt, args...) \
--
2.11.0
next prev parent reply other threads:[~2017-12-19 6:38 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-19 6:38 [dpdk-dev] [PATCH 00/11] Dynamic logging (just do it) Stephen Hemminger
2017-12-19 6:38 ` [dpdk-dev] [PATCH 01/11] avp: implement dynamic logging Stephen Hemminger
2017-12-20 1:53 ` Ferruh Yigit
2017-12-20 18:58 ` Stephen Hemminger
2017-12-21 18:02 ` Ferruh Yigit
2017-12-22 13:45 ` Olivier MATZ
2017-12-19 6:38 ` [dpdk-dev] [PATCH 02/11] bnx2x: " Stephen Hemminger
2017-12-20 1:51 ` Ferruh Yigit
2017-12-20 18:58 ` Stephen Hemminger
2017-12-19 6:38 ` [dpdk-dev] [PATCH 03/11] vmxnet3: " Stephen Hemminger
2017-12-19 6:38 ` [dpdk-dev] [PATCH 04/11] ixgbe: " Stephen Hemminger
2017-12-19 6:38 ` [dpdk-dev] [PATCH 05/11] e1000: " Stephen Hemminger
2017-12-19 6:38 ` [dpdk-dev] [PATCH 06/11] virtio: " Stephen Hemminger
2018-01-09 9:18 ` Maxime Coquelin
2017-12-19 6:38 ` [dpdk-dev] [PATCH 07/11] nfp: " Stephen Hemminger
2017-12-20 1:52 ` Ferruh Yigit
2017-12-19 6:38 ` [dpdk-dev] [PATCH 08/11] fm10k: " Stephen Hemminger
2017-12-19 6:38 ` [dpdk-dev] [PATCH 09/11] ena: " Stephen Hemminger
2017-12-19 6:38 ` Stephen Hemminger [this message]
2017-12-19 6:38 ` [dpdk-dev] [PATCH 11/11] lio: " Stephen Hemminger
2017-12-20 1:51 ` [dpdk-dev] [PATCH 00/11] Dynamic logging (just do it) Ferruh Yigit
2017-12-20 18:59 ` Stephen Hemminger
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 01/12] net/avp: implement dynamic logging Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 02/12] net/bnx2x: " Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 03/12] net/vmxnet3: " Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 04/12] net/ixgbe: " Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 05/12] net/e1000: " Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 06/12] net/virtio: " Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 07/12] net/nfp: fix build when debug enabled Ferruh Yigit
2018-01-10 12:09 ` Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 08/12] net/nfp: implement dynamic logging Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 09/12] net/fm10k: " Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 10/12] net/ena: " Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 11/12] net/qede: " Ferruh Yigit
2018-01-09 12:10 ` [dpdk-dev] [PATCH v2 12/12] net/liquidio: " Ferruh Yigit
2018-01-09 12:23 ` [dpdk-dev] [PATCH v2 01/12] net/avp: " Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171219063840.18981-11-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).