From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH 06/11] virtio: implement dynamic logging
Date: Mon, 18 Dec 2017 22:38:35 -0800 [thread overview]
Message-ID: <20171219063840.18981-7-stephen@networkplumber.org> (raw)
In-Reply-To: <20171219063840.18981-1-stephen@networkplumber.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
config/common_base | 2 --
drivers/net/virtio/virtio_ethdev.c | 15 +++++++++++++++
drivers/net/virtio/virtio_logs.h | 19 +++++++------------
3 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/config/common_base b/config/common_base
index d2564075706d..3695fbe5de27 100644
--- a/config/common_base
+++ b/config/common_base
@@ -361,10 +361,8 @@ CONFIG_RTE_LIBRTE_DPAA2_DEBUG_TX_FREE=n
# Compile burst-oriented VIRTIO PMD driver
#
CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
-CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_INIT=n
CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n
CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n
-CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DRIVER=n
CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_DUMP=n
#
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index e0328f61d138..e13481774f73 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -106,6 +106,9 @@ static int virtio_dev_queue_stats_mapping_set(
uint8_t stat_idx,
uint8_t is_rx);
+int virtio_logtype_init;
+int virtio_logtype_driver;
+
/*
* The set of PCI devices this driver supports
*/
@@ -2072,3 +2075,15 @@ __rte_unused uint8_t is_rx)
RTE_PMD_EXPORT_NAME(net_virtio, __COUNTER__);
RTE_PMD_REGISTER_PCI_TABLE(net_virtio, pci_id_virtio_map);
RTE_PMD_REGISTER_KMOD_DEP(net_virtio, "* igb_uio | uio_pci_generic | vfio-pci");
+
+RTE_INIT(virtio_init_log);
+static void
+virtio_init_log(void)
+{
+ virtio_logtype_init = rte_log_register("pmd.virtio.init");
+ if (virtio_logtype_init >= 0)
+ rte_log_set_level(virtio_logtype_init, RTE_LOG_NOTICE);
+ virtio_logtype_driver = rte_log_register("pmd.virtio.driver");
+ if (virtio_logtype_driver >= 0)
+ rte_log_set_level(virtio_logtype_driver, RTE_LOG_NOTICE);
+}
diff --git a/drivers/net/virtio/virtio_logs.h b/drivers/net/virtio/virtio_logs.h
index 90a79eaa5b42..1d287c1a72ec 100644
--- a/drivers/net/virtio/virtio_logs.h
+++ b/drivers/net/virtio/virtio_logs.h
@@ -36,14 +36,12 @@
#include <rte_log.h>
-#ifdef RTE_LIBRTE_VIRTIO_DEBUG_INIT
+extern int virtio_logtype_init;
#define PMD_INIT_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+ rte_log(RTE_LOG_ ## level, virtio_logtype_init, \
+ "%s(): " fmt "\n", __func__, ##args)
+
#define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>")
-#else
-#define PMD_INIT_LOG(level, fmt, args...) do { } while(0)
-#define PMD_INIT_FUNC_TRACE() do { } while(0)
-#endif
#ifdef RTE_LIBRTE_VIRTIO_DEBUG_RX
#define PMD_RX_LOG(level, fmt, args...) \
@@ -59,12 +57,9 @@
#define PMD_TX_LOG(level, fmt, args...) do { } while(0)
#endif
-
-#ifdef RTE_LIBRTE_VIRTIO_DEBUG_DRIVER
+extern int virtio_logtype_driver;
#define PMD_DRV_LOG(level, fmt, args...) \
- RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
-#else
-#define PMD_DRV_LOG(level, fmt, args...) do { } while(0)
-#endif
+ rte_log(RTE_LOG_ ## level, virtio_logtype_driver, \
+ "%s(): " fmt "\n", __func__, ## args)
#endif /* _VIRTIO_LOGS_H_ */
--
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 [PATCH 00/11] Dynamic logging (just do it) Stephen Hemminger
2017-12-19 6:38 ` [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 ` [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 ` [PATCH 03/11] vmxnet3: " Stephen Hemminger
2017-12-19 6:38 ` [PATCH 04/11] ixgbe: " Stephen Hemminger
2017-12-19 6:38 ` [PATCH 05/11] e1000: " Stephen Hemminger
2017-12-19 6:38 ` Stephen Hemminger [this message]
2018-01-09 9:18 ` [PATCH 06/11] virtio: " Maxime Coquelin
2017-12-19 6:38 ` [PATCH 07/11] nfp: " Stephen Hemminger
2017-12-20 1:52 ` Ferruh Yigit
2017-12-19 6:38 ` [PATCH 08/11] fm10k: " Stephen Hemminger
2017-12-19 6:38 ` [PATCH 09/11] ena: " Stephen Hemminger
2017-12-19 6:38 ` [PATCH 10/11] qede: " Stephen Hemminger
2017-12-19 6:38 ` [PATCH 11/11] lio: " Stephen Hemminger
2017-12-20 1:51 ` [PATCH 00/11] Dynamic logging (just do it) Ferruh Yigit
2017-12-20 18:59 ` Stephen Hemminger
2018-01-09 12:10 ` [PATCH v2 01/12] net/avp: implement dynamic logging Ferruh Yigit
2018-01-09 12:10 ` [PATCH v2 02/12] net/bnx2x: " Ferruh Yigit
2018-01-09 12:10 ` [PATCH v2 03/12] net/vmxnet3: " Ferruh Yigit
2018-01-09 12:10 ` [PATCH v2 04/12] net/ixgbe: " Ferruh Yigit
2018-01-09 12:10 ` [PATCH v2 05/12] net/e1000: " Ferruh Yigit
2018-01-09 12:10 ` [PATCH v2 06/12] net/virtio: " Ferruh Yigit
2018-01-09 12:10 ` [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 ` [PATCH v2 08/12] net/nfp: implement dynamic logging Ferruh Yigit
2018-01-09 12:10 ` [PATCH v2 09/12] net/fm10k: " Ferruh Yigit
2018-01-09 12:10 ` [PATCH v2 10/12] net/ena: " Ferruh Yigit
2018-01-09 12:10 ` [PATCH v2 11/12] net/qede: " Ferruh Yigit
2018-01-09 12:10 ` [PATCH v2 12/12] net/liquidio: " Ferruh Yigit
2018-01-09 12:23 ` [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-7-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.