From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH 11/11] lio: implement dynamic logging
Date: Mon, 18 Dec 2017 22:38:40 -0800 [thread overview]
Message-ID: <20171219063840.18981-12-stephen@networkplumber.org> (raw)
In-Reply-To: <20171219063840.18981-1-stephen@networkplumber.org>
This driver mostly uses the common pattern. Convert this to the
dynamic logging.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
config/common_base | 2 --
drivers/net/liquidio/lio_ethdev.c | 15 +++++++++++++++
drivers/net/liquidio/lio_logs.h | 20 ++++++++------------
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/config/common_base b/config/common_base
index 1718f6a14449..ee716adc4e0f 100644
--- a/config/common_base
+++ b/config/common_base
@@ -312,8 +312,6 @@ CONFIG_RTE_LIBRTE_THUNDERX_NICVF_DEBUG_MBOX=n
# Compile burst-oriented Cavium LiquidIO PMD driver
#
CONFIG_RTE_LIBRTE_LIO_PMD=y
-CONFIG_RTE_LIBRTE_LIO_DEBUG_DRIVER=n
-CONFIG_RTE_LIBRTE_LIO_DEBUG_INIT=n
CONFIG_RTE_LIBRTE_LIO_DEBUG_RX=n
CONFIG_RTE_LIBRTE_LIO_DEBUG_TX=n
CONFIG_RTE_LIBRTE_LIO_DEBUG_MBOX=n
diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c
index 84b8a3288d12..5ad7c9902af4 100644
--- a/drivers/net/liquidio/lio_ethdev.c
+++ b/drivers/net/liquidio/lio_ethdev.c
@@ -43,6 +43,9 @@
#include "lio_ethdev.h"
#include "lio_rxtx.h"
+int lio_logtype_init;
+int lio_logtype_driver;
+
/* Default RSS key in use */
static uint8_t lio_rss_key[40] = {
0x6D, 0x5A, 0x56, 0xDA, 0x25, 0x5B, 0x0E, 0xC2,
@@ -2180,3 +2183,15 @@ static struct rte_pci_driver rte_liovf_pmd = {
RTE_PMD_REGISTER_PCI(net_liovf, rte_liovf_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_liovf, pci_id_liovf_map);
RTE_PMD_REGISTER_KMOD_DEP(net_liovf, "* igb_uio | vfio-pci");
+
+RTE_INIT(lio_init_log);
+static void
+lio_init_log(void)
+{
+ lio_logtype_init = rte_log_register("pmd.lio.init");
+ if (lio_logtype_init >= 0)
+ rte_log_set_level(lio_logtype_init, RTE_LOG_NOTICE);
+ lio_logtype_driver = rte_log_register("pmd.lio.driver");
+ if (lio_logtype_driver >= 0)
+ rte_log_set_level(lio_logtype_driver, RTE_LOG_NOTICE);
+}
diff --git a/drivers/net/liquidio/lio_logs.h b/drivers/net/liquidio/lio_logs.h
index a4c9ca4db291..c6f9bd15bd79 100644
--- a/drivers/net/liquidio/lio_logs.h
+++ b/drivers/net/liquidio/lio_logs.h
@@ -34,8 +34,10 @@
#ifndef _LIO_LOGS_H_
#define _LIO_LOGS_H_
-#define lio_dev_printf(lio_dev, level, fmt, args...) \
- RTE_LOG(level, PMD, "%s" fmt, (lio_dev)->dev_string, ##args)
+extern int lio_logtype_driver;
+#define lio_dev_printf(lio_dev, level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, lio_logtype_driver, \
+ "%s" fmt, (lio_dev)->dev_string, ##args)
#define lio_dev_info(lio_dev, fmt, args...) \
lio_dev_printf(lio_dev, INFO, "INFO: " fmt, ##args)
@@ -43,22 +45,16 @@
#define lio_dev_err(lio_dev, fmt, args...) \
lio_dev_printf(lio_dev, ERR, "ERROR: %s() " fmt, __func__, ##args)
-#define PMD_INIT_LOG(level, fmt, args...) RTE_LOG(level, PMD, fmt, ## args)
+extern int lio_logtype_init;
+#define PMD_INIT_LOG(level, fmt, args...) \
+ rte_log(RTE_LOG_ ## level, lio_logtype_init, \
+ fmt, ## args)
/* Enable these through config options */
-
-#ifdef RTE_LIBRTE_LIO_DEBUG_INIT
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, "%s() >>\n", __func__)
-#else /* !RTE_LIBRTE_LIO_DEBUG_INIT */
-#define PMD_INIT_FUNC_TRACE() do { } while (0)
-#endif /* RTE_LIBRTE_LIO_DEBUG_INIT */
-#ifdef RTE_LIBRTE_LIO_DEBUG_DRIVER
#define lio_dev_dbg(lio_dev, fmt, args...) \
lio_dev_printf(lio_dev, DEBUG, "DEBUG: %s() " fmt, __func__, ##args)
-#else /* !RTE_LIBRTE_LIO_DEBUG_DRIVER */
-#define lio_dev_dbg(lio_dev, fmt, args...) do { } while (0)
-#endif /* RTE_LIBRTE_LIO_DEBUG_DRIVER */
#ifdef RTE_LIBRTE_LIO_DEBUG_RX
#define PMD_RX_LOG(lio_dev, level, 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 ` [dpdk-dev] [PATCH 10/11] qede: " Stephen Hemminger
2017-12-19 6:38 ` Stephen Hemminger [this message]
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-12-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).